[kernel] r10005 - dists/trunk/redhat-cluster/redhat-cluster/debian

[Frederik Schüler]

Author: fs
Date: Sun Dec 23 17:32:39 2007
New Revision: 10005

Log:
Fix maintianer cman scripts: bug user on upgrade from etch version


Removed:
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.config
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postinst
Modified:
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
   dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.postrm	Sun Dec 23 17:32:39 2007
@@ -8,16 +8,9 @@
 			. /usr/share/debconf/confmodule
 			db_purge
 		fi
-		;;
-	
-	*)
-		echo "prerm called with unknown argument \`$1'" >&2
-		exit 1
-		;;
-
+	;;
 esac
 
-
 #DEBHELPER#
 
 exit 0

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.preinst	Sun Dec 23 17:32:39 2007
@@ -7,10 +7,15 @@
 		. /usr/share/debconf/confmodule
 		db_version 2.0
 		if dpkg --compare-versions "$2" lt 2.0 ; then
-			db_fset cman/upgrade-warning seen_in_2.0_upgrade false
+			db_fset cman/upgrade-warning seen false
+			db_input critical cman/upgrade-warning || true
+			db_go
+			
 			db_get cman/upgrade-warning
 			if [ "$RET" = "false" ] ; then
-				echo "aborting cman installation."
+				echo "Aborting cman installation."
+				echo " For upgrade instructions, please refer to" 
+				echo "http://wiki.debian.org/UpgradeRHCSV1toV2"
 				exit 1
 			fi
 		fi

Modified: dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates
==============================================================================
--- dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates	(original)
+++ dists/trunk/redhat-cluster/redhat-cluster/debian/cman.templates	Sun Dec 23 17:32:39 2007
@@ -1,17 +1,14 @@
 Template: cman/upgrade-warning
 Type: boolean
 Default: false
-_Description: Really upgrade the Red Hat Cluster Suite?
- An older version of the Red Hat Cluster Suite is installed on the
- system.
+Description: Do you want to abort now?
+ The new version 2.0 of the Red Hat Cluster Suite is not compatible with 
+ the currently installed one. Upgrading these packages without stopping 
+ the complete cluster can cause filesystem corruption on shared storage 
+ devices.
  .
- WARNING: The version of cman that is going to be installed is not 
- compatible with the currently installed one, upgrading single nodes 
- without stopping the complete cluster will cause data loss.
- .
- In order to upgrade the cluster suite, you need to follow the
- instructions found on the following Page: 
+ For instructions on how to safely upgrade the Red Hat Cluster Suite to
+ version 2.0, please refer to the following document:
  .
  http://wiki.debian.org/UpgradeRHCSV1toV2
  .
- Select OK if you still wish to continue with the upgrade.