Renumbering hooks.

17 files changed, 17 insertions, 38 deletions

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 07b8e0590..12b719fd2 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -621,44 +621,23 @@ Set_defaults ()
 	LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM:-aufs}"
 
 	# Setting distribution hooks
-	case "${LB_MODE}" in
-		*)
-			LB_CHROOT_HOOKS="${LB_CHROOT_HOOKS:-update-apt-file-cache \
-				update-apt-xapian-index \
-				update-mlocate-database \
-				remove-dbus-machine-id \
-				remove-openssh-server-host-keys \
-				remove-python-py \
-				remove-udev-persistent-rules \
-				remove-mdadm-configuration \
-				remote-adjtime-configuration \
-				disable-kexec-tools \
-				remove-backup-files \
-				remove-temporary-files \
-				remove-log-files \
-				update-nvidia-alternative \
-				update-glx-alternative}"
-			;;
-
-		kubuntu)
-			LB_CHROOT_HOOKS="${LB_CHROOT_HOOKS:-update-apt-file-cache \
-				update-apt-xapian-index \
-				update-mlocate-database \
-				remove-dbus-machine-id \
-				remove-gnome-icon-cache \
-				remove-openssh-server-host-keys \
-				remove-python-py \
-				remove-udev-persistent-rules \
-				remove-mdadm-configuration \
-				remove-adjtime-configuration \
-				disable-kexec-tools \
-				remove-backup-files \
-				remove-temporary-files \
-				remove-log-files \
-				update-nvidia-alternative \
-				update-glx-alternative}"
-			;;
-	esac
+	LB_CHROOT_HOOKS="${LB_CHROOT_HOOKS:-disable-kexec-tools \
+		remove-adjtime-configuration \
+		remove-apt-sources-lists \
+		remove-backup-files \
+		remove-dbus-machine-id \
+		remove-gnome-icon-cache \
+		remove-log-files \
+		remove-mdadm-configuration \
+		remove-openssh-server-host-keys \
+		remove-python-py \
+		remove-temporary-files \
+		remove-udev-persistent-rules \
+		update-apt-file-cache \
+		update-apt-xapian-index \
+		update-glx-alternative \
+		update-mlocate-database \
+		update-nvidia-alternative}"
 
 	# Setting interactive shell/X11/Xnest
 	LB_INTERACTIVE="${LB_INTERACTIVE:-false}"
diff --git a/share/hooks/0130-disable-kexec-tools.chroot b/share/hooks/0010-disable-kexec-tools.chroot
index 403d1d413..403d1d413 100755
--- a/share/hooks/0130-disable-kexec-tools.chroot
+++ b/share/hooks/0010-disable-kexec-tools.chroot
diff --git a/share/hooks/0120-remove-adjtime-configuration.chroot b/share/hooks/0110-remove-adjtime-configuration.chroot
index 5625effb8..5625effb8 100755
--- a/share/hooks/0120-remove-adjtime-configuration.chroot
+++ b/share/hooks/0110-remove-adjtime-configuration.chroot
diff --git a/share/hooks/0090-remove-apt-sources-lists.chroot b/share/hooks/0120-remove-apt-sources-lists.chroot
index 074b551a1..074b551a1 100755
--- a/share/hooks/0090-remove-apt-sources-lists.chroot
+++ b/share/hooks/0120-remove-apt-sources-lists.chroot
diff --git a/share/hooks/0140-remove-backup-files.chroot b/share/hooks/0130-remove-backup-files.chroot
index 6e0a69055..6e0a69055 100755
--- a/share/hooks/0140-remove-backup-files.chroot
+++ b/share/hooks/0130-remove-backup-files.chroot
diff --git a/share/hooks/0040-remove-dbus-machine-id.chroot b/share/hooks/0140-remove-dbus-machine-id.chroot
index 230099e46..230099e46 100755
--- a/share/hooks/0040-remove-dbus-machine-id.chroot
+++ b/share/hooks/0140-remove-dbus-machine-id.chroot
diff --git a/share/hooks/0050-remove-gnome-icon-cache.chroot b/share/hooks/0150-remove-gnome-icon-cache.chroot
index f562fd939..f562fd939 100755
--- a/share/hooks/0050-remove-gnome-icon-cache.chroot
+++ b/share/hooks/0150-remove-gnome-icon-cache.chroot
diff --git a/share/hooks/0110-remove-mdadm-configuration.chroot b/share/hooks/0170-remove-mdadm-configuration.chroot
index 206b494da..206b494da 100755
--- a/share/hooks/0110-remove-mdadm-configuration.chroot
+++ b/share/hooks/0170-remove-mdadm-configuration.chroot
diff --git a/share/hooks/0060-remove-openssh-server-host-keys.chroot b/share/hooks/0180-remove-openssh-server-host-keys.chroot
index 862704981..862704981 100755
--- a/share/hooks/0060-remove-openssh-server-host-keys.chroot
+++ b/share/hooks/0180-remove-openssh-server-host-keys.chroot
diff --git a/share/hooks/0070-remove-python-py.chroot b/share/hooks/0190-remove-python-py.chroot
index ff705838f..ff705838f 100755
--- a/share/hooks/0070-remove-python-py.chroot
+++ b/share/hooks/0190-remove-python-py.chroot
diff --git a/share/hooks/0150-remove-temporary-files.chroot b/share/hooks/0200-remove-temporary-files.chroot
index fd220e030..fd220e030 100755
--- a/share/hooks/0150-remove-temporary-files.chroot
+++ b/share/hooks/0200-remove-temporary-files.chroot
diff --git a/share/hooks/0080-remove-udev-persistent-rules.chroot b/share/hooks/0210-remove-udev-persistent-rules.chroot
index 148ba30d1..148ba30d1 100755
--- a/share/hooks/0080-remove-udev-persistent-rules.chroot
+++ b/share/hooks/0210-remove-udev-persistent-rules.chroot
diff --git a/share/hooks/0010-update-apt-file-cache.chroot b/share/hooks/0300-update-apt-file-cache.chroot
index 60a00b39c..60a00b39c 100755
--- a/share/hooks/0010-update-apt-file-cache.chroot
+++ b/share/hooks/0300-update-apt-file-cache.chroot
diff --git a/share/hooks/0020-update-apt-xapian-index.chroot b/share/hooks/0310-update-apt-xapian-index.chroot
index dcb39b261..dcb39b261 100755
--- a/share/hooks/0020-update-apt-xapian-index.chroot
+++ b/share/hooks/0310-update-apt-xapian-index.chroot
diff --git a/share/hooks/0180-update-glx-alternative.chroot b/share/hooks/0320-update-glx-alternative.chroot
index 8c36c43f9..8c36c43f9 100755
--- a/share/hooks/0180-update-glx-alternative.chroot
+++ b/share/hooks/0320-update-glx-alternative.chroot
diff --git a/share/hooks/0030-update-mlocate-database.chroot b/share/hooks/0330-update-mlocate-database.chroot
index 6bfdb3d4f..6bfdb3d4f 100755
--- a/share/hooks/0030-update-mlocate-database.chroot
+++ b/share/hooks/0330-update-mlocate-database.chroot
diff --git a/share/hooks/0170-update-nvidia-alternative.chroot b/share/hooks/0340-update-nvidia-alternative.chroot
index e73b9678b..e73b9678b 100755
--- a/share/hooks/0170-update-nvidia-alternative.chroot
+++ b/share/hooks/0340-update-nvidia-alternative.chroot