Fix filesystem tools installation in 91-install-fs-tools

Was broken since 4.3rc1.

Merged 91-install-fs-tools back into 90-make-fstab. Added support for
RPM-based distributions, too, so it's more generic now.

debian/changelog

@@ -32,6 +32,9 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low
       update the menu.list automatically.
     - hooks/common.sh: Rename installCentOS4Package to installRPMPackage.
       Add installCentOS4Package wrapper for backward compatibility.
+    - Fix filesystem tools installation in 91-install-fs-tools (which was
+      broken since 4.3~rc1-1) by merging 91-install-fs-tools back into
+      90-make-fstab. Also supports RPM-based distributions now.
   * Add debian/gbp.conf to be able to to build xen-tools with
     git-buildpackage.
   * Clean up debian/rules:

hooks/common/90-make-fstab

@@ -100,6 +100,34 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
 done
 
 
+logMessage Checking for filesystem tools to install
+
+#
+#  Install any required packages for the given root filesystem
+#
+if [ "$has_xfs" -eq 1 ]; then
+    installPackage ${prefix} xfsprogs
+fi
+if [ "$has_reiserfs" -eq 1 ]; then
+    if isAPT; then
+        installDebianPackage reiserfsprogs
+    elif isYum; then
+        installRPMPackage reiserfs-utils
+    else
+        logMessage "Unable to install reiserfs tools; no package manager recognized"
+    fi
+fi
+if [ "$has_btrfs" -eq 1 ]; then
+    if isAPT; then
+        installDebianPackage btrfs-tools
+    elif isYum; then
+        installRPMPackage btrfs-progs
+    else
+        logMessage "Unable to install btrfs tools; no package manager recognized"
+    fi
+fi
+
+
 #
 #  Log our finish
 #

hooks/common/91-install-fs-tools

@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-#  Some root filesystems will require the installation of new packages
-#
-# Steve
-# --
-# http://www.steve.org.uk/
-
-
-prefix=$1
-
-#
-#  Source our common functions
-#
-if [ -e /usr/lib/xen-tools/common.sh ]; then
-    . /usr/lib/xen-tools/common.sh
-else
-    . ./hooks/common.sh
-fi
-
-
-#
-# Log our start
-#
-logMessage Script $0 starting
-
-
-#
-#  Install any required packages for the given root filesystem
-#
-if [ "$has_xfs" -eq 1 ]; then
-    installDebianPackage ${prefix} xfsprogs
-fi
-if [ "$has_reiserfs" -eq 1 ]; then
-    installDebianPackage ${prefix} reiserfsprogs
-fi
-if [ "$has_btrfs" -eq 1 ]; then
-    installDebianPackage ${prefix} btrfs-tools
-fi
-
-
-#
-#  Log our finish
-#
-logMessage Script $0 finished

hooks/dapper/91-install-fs-tools

@@ -1 +0,0 @@
-../common/91-install-fs-tools

hooks/debian/91-install-fs-tools

@@ -1 +0,0 @@
-../common/91-install-fs-tools

hooks/edgy/91-install-fs-tools

@@ -1 +0,0 @@
-../common/91-install-fs-tools

hooks/intrepid/91-install-fs-tools

@@ -1 +0,0 @@
-../common/91-install-fs-tools

hooks/karmic/91-install-fs-tools

@@ -1 +0,0 @@
-../common/91-install-fs-tools