From a46350d7b3a0e31d720cc3c3ac1345e012ceab2d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 17 Dec 2012 00:20:50 +0100 Subject: [PATCH] Renumbering hooks. --- functions/defaults.sh | 55 ++++++------------- ...chroot => 0010-disable-kexec-tools.chroot} | 0 ... 0110-remove-adjtime-configuration.chroot} | 0 ...t => 0120-remove-apt-sources-lists.chroot} | 0 ...chroot => 0130-remove-backup-files.chroot} | 0 ...oot => 0140-remove-dbus-machine-id.chroot} | 0 ...ot => 0150-remove-gnome-icon-cache.chroot} | 0 ...=> 0170-remove-mdadm-configuration.chroot} | 0 ...80-remove-openssh-server-host-keys.chroot} | 0 ...py.chroot => 0190-remove-python-py.chroot} | 0 ...oot => 0200-remove-temporary-files.chroot} | 0 ... 0210-remove-udev-persistent-rules.chroot} | 0 ...root => 0300-update-apt-file-cache.chroot} | 0 ...ot => 0310-update-apt-xapian-index.chroot} | 0 ...oot => 0320-update-glx-alternative.chroot} | 0 ...ot => 0330-update-mlocate-database.chroot} | 0 ... => 0340-update-nvidia-alternative.chroot} | 0 17 files changed, 17 insertions(+), 38 deletions(-) rename share/hooks/{0130-disable-kexec-tools.chroot => 0010-disable-kexec-tools.chroot} (100%) rename share/hooks/{0120-remove-adjtime-configuration.chroot => 0110-remove-adjtime-configuration.chroot} (100%) rename share/hooks/{0090-remove-apt-sources-lists.chroot => 0120-remove-apt-sources-lists.chroot} (100%) rename share/hooks/{0140-remove-backup-files.chroot => 0130-remove-backup-files.chroot} (100%) rename share/hooks/{0040-remove-dbus-machine-id.chroot => 0140-remove-dbus-machine-id.chroot} (100%) rename share/hooks/{0050-remove-gnome-icon-cache.chroot => 0150-remove-gnome-icon-cache.chroot} (100%) rename share/hooks/{0110-remove-mdadm-configuration.chroot => 0170-remove-mdadm-configuration.chroot} (100%) rename share/hooks/{0060-remove-openssh-server-host-keys.chroot => 0180-remove-openssh-server-host-keys.chroot} (100%) rename share/hooks/{0070-remove-python-py.chroot => 0190-remove-python-py.chroot} (100%) rename share/hooks/{0150-remove-temporary-files.chroot => 0200-remove-temporary-files.chroot} (100%) rename share/hooks/{0080-remove-udev-persistent-rules.chroot => 0210-remove-udev-persistent-rules.chroot} (100%) rename share/hooks/{0010-update-apt-file-cache.chroot => 0300-update-apt-file-cache.chroot} (100%) rename share/hooks/{0020-update-apt-xapian-index.chroot => 0310-update-apt-xapian-index.chroot} (100%) rename share/hooks/{0180-update-glx-alternative.chroot => 0320-update-glx-alternative.chroot} (100%) rename share/hooks/{0030-update-mlocate-database.chroot => 0330-update-mlocate-database.chroot} (100%) rename share/hooks/{0170-update-nvidia-alternative.chroot => 0340-update-nvidia-alternative.chroot} (100%) 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 similarity index 100% rename from share/hooks/0130-disable-kexec-tools.chroot rename to 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 similarity index 100% rename from share/hooks/0120-remove-adjtime-configuration.chroot rename to 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 similarity index 100% rename from share/hooks/0090-remove-apt-sources-lists.chroot rename to 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 similarity index 100% rename from share/hooks/0140-remove-backup-files.chroot rename to 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 similarity index 100% rename from share/hooks/0040-remove-dbus-machine-id.chroot rename to 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 similarity index 100% rename from share/hooks/0050-remove-gnome-icon-cache.chroot rename to 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 similarity index 100% rename from share/hooks/0110-remove-mdadm-configuration.chroot rename to 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 similarity index 100% rename from share/hooks/0060-remove-openssh-server-host-keys.chroot rename to 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 similarity index 100% rename from share/hooks/0070-remove-python-py.chroot rename to 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 similarity index 100% rename from share/hooks/0150-remove-temporary-files.chroot rename to 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 similarity index 100% rename from share/hooks/0080-remove-udev-persistent-rules.chroot rename to 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 similarity index 100% rename from share/hooks/0010-update-apt-file-cache.chroot rename to 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 similarity index 100% rename from share/hooks/0020-update-apt-xapian-index.chroot rename to 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 similarity index 100% rename from share/hooks/0180-update-glx-alternative.chroot rename to 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 similarity index 100% rename from share/hooks/0030-update-mlocate-database.chroot rename to 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 similarity index 100% rename from share/hooks/0170-update-nvidia-alternative.chroot rename to share/hooks/0340-update-nvidia-alternative.chroot