Moving common hooks to subdirectory to allow system specific hooks.

22 files changed, 1 insertions, 1 deletions

diff --git a/components/init b/components/init
index c6eb21992..1cfa60fbe 100755
--- a/components/init
+++ b/components/init
@@ -133,7 +133,7 @@ def main():
 	# Configuring default hooks
 	os.makedirs('config/hooks', exist_ok=True)
 
-	for hook in glob.glob('/usr/share/live/build/hooks/*.hook*'):
+	for hook in glob.glob('/usr/share/live/build/hooks/all/*.hook*'):
 		os.symlink(hook, os.path.join('config/hooks/' + os.path.basename(hook)))
 
 	# Configuring default includes
diff --git a/share/hooks/0010-disable-kexec-tools.hook.chroot b/share/hooks/all/0010-disable-kexec-tools.hook.chroot
index 403d1d413..403d1d413 100755
--- a/share/hooks/0010-disable-kexec-tools.hook.chroot
+++ b/share/hooks/all/0010-disable-kexec-tools.hook.chroot
diff --git a/share/hooks/0020-create-mtab-symlink.hook.chroot b/share/hooks/all/0020-create-mtab-symlink.hook.chroot
index 5c2fa64ae..5c2fa64ae 100755
--- a/share/hooks/0020-create-mtab-symlink.hook.chroot
+++ b/share/hooks/all/0020-create-mtab-symlink.hook.chroot
diff --git a/share/hooks/0100-remove-adjtime-configuration.hook.chroot b/share/hooks/all/0100-remove-adjtime-configuration.hook.chroot
index 7fe5bbd15..7fe5bbd15 100755
--- a/share/hooks/0100-remove-adjtime-configuration.hook.chroot
+++ b/share/hooks/all/0100-remove-adjtime-configuration.hook.chroot
diff --git a/share/hooks/0110-remove-backup-files.hook.chroot b/share/hooks/all/0110-remove-backup-files.hook.chroot
index 55a6b75af..55a6b75af 100755
--- a/share/hooks/0110-remove-backup-files.hook.chroot
+++ b/share/hooks/all/0110-remove-backup-files.hook.chroot
diff --git a/share/hooks/0120-remove-dbus-machine-id.hook.chroot b/share/hooks/all/0120-remove-dbus-machine-id.hook.chroot
index 230099e46..230099e46 100755
--- a/share/hooks/0120-remove-dbus-machine-id.hook.chroot
+++ b/share/hooks/all/0120-remove-dbus-machine-id.hook.chroot
diff --git a/share/hooks/0130-remove-gnome-icon-cache.hook.chroot b/share/hooks/all/0130-remove-gnome-icon-cache.hook.chroot
index ab35a1d68..ab35a1d68 100755
--- a/share/hooks/0130-remove-gnome-icon-cache.hook.chroot
+++ b/share/hooks/all/0130-remove-gnome-icon-cache.hook.chroot
diff --git a/share/hooks/0140-remove-log-files.hook.chroot b/share/hooks/all/0140-remove-log-files.hook.chroot
index f95e54686..f95e54686 100755
--- a/share/hooks/0140-remove-log-files.hook.chroot
+++ b/share/hooks/all/0140-remove-log-files.hook.chroot
diff --git a/share/hooks/0150-remove-mdadm-configuration.hook.chroot b/share/hooks/all/0150-remove-mdadm-configuration.hook.chroot
index 206b494da..206b494da 100755
--- a/share/hooks/0150-remove-mdadm-configuration.hook.chroot
+++ b/share/hooks/all/0150-remove-mdadm-configuration.hook.chroot
diff --git a/share/hooks/0160-remove-openssh-server-host-keys.hook.chroot b/share/hooks/all/0160-remove-openssh-server-host-keys.hook.chroot
index 862704981..862704981 100755
--- a/share/hooks/0160-remove-openssh-server-host-keys.hook.chroot
+++ b/share/hooks/all/0160-remove-openssh-server-host-keys.hook.chroot
diff --git a/share/hooks/0170-remove-python-py.hook.chroot b/share/hooks/all/0170-remove-python-py.hook.chroot
index ff705838f..ff705838f 100755
--- a/share/hooks/0170-remove-python-py.hook.chroot
+++ b/share/hooks/all/0170-remove-python-py.hook.chroot
diff --git a/share/hooks/0180-remove-systemd-machine-id.hook.chroot b/share/hooks/all/0180-remove-systemd-machine-id.hook.chroot
index ed5d6bf6a..ed5d6bf6a 100755
--- a/share/hooks/0180-remove-systemd-machine-id.hook.chroot
+++ b/share/hooks/all/0180-remove-systemd-machine-id.hook.chroot
diff --git a/share/hooks/0190-remove-temporary-files.hook.chroot b/share/hooks/all/0190-remove-temporary-files.hook.chroot
index fd220e030..fd220e030 100755
--- a/share/hooks/0190-remove-temporary-files.hook.chroot
+++ b/share/hooks/all/0190-remove-temporary-files.hook.chroot
diff --git a/share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot b/share/hooks/all/0195-remove-ssl-cert-snakeoil.hook.chroot
index cdfe39d24..cdfe39d24 100755
--- a/share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot
+++ b/share/hooks/all/0195-remove-ssl-cert-snakeoil.hook.chroot
diff --git a/share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot b/share/hooks/all/0200-remove-udev-persistent-cd-rules.hook.chroot
index bdfe52d96..bdfe52d96 100755
--- a/share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot
+++ b/share/hooks/all/0200-remove-udev-persistent-cd-rules.hook.chroot
diff --git a/share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot b/share/hooks/all/0300-remove-udev-persistent-net-rules.hook.chroot
index 148ba30d1..148ba30d1 100755
--- a/share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot
+++ b/share/hooks/all/0300-remove-udev-persistent-net-rules.hook.chroot
diff --git a/share/hooks/0400-update-apt-file-cache.hook.chroot b/share/hooks/all/0400-update-apt-file-cache.hook.chroot
index 771e9032a..771e9032a 100755
--- a/share/hooks/0400-update-apt-file-cache.hook.chroot
+++ b/share/hooks/all/0400-update-apt-file-cache.hook.chroot
diff --git a/share/hooks/0410-update-apt-xapian-index.hook.chroot b/share/hooks/all/0410-update-apt-xapian-index.hook.chroot
index dcb39b261..dcb39b261 100755
--- a/share/hooks/0410-update-apt-xapian-index.hook.chroot
+++ b/share/hooks/all/0410-update-apt-xapian-index.hook.chroot
diff --git a/share/hooks/0420-update-glx-alternative.hook.chroot b/share/hooks/all/0420-update-glx-alternative.hook.chroot
index 8c36c43f9..8c36c43f9 100755
--- a/share/hooks/0420-update-glx-alternative.hook.chroot
+++ b/share/hooks/all/0420-update-glx-alternative.hook.chroot
diff --git a/share/hooks/0430-update-mlocate-database.hook.chroot b/share/hooks/all/0430-update-mlocate-database.hook.chroot
index 6bfdb3d4f..6bfdb3d4f 100755
--- a/share/hooks/0430-update-mlocate-database.hook.chroot
+++ b/share/hooks/all/0430-update-mlocate-database.hook.chroot
diff --git a/share/hooks/0440-update-nvidia-alternative.hook.chroot b/share/hooks/all/0440-update-nvidia-alternative.hook.chroot
index e73b9678b..e73b9678b 100755
--- a/share/hooks/0440-update-nvidia-alternative.hook.chroot
+++ b/share/hooks/all/0440-update-nvidia-alternative.hook.chroot
diff --git a/share/hooks/0910-remove-apt-sources-lists b/share/hooks/all/0910-remove-apt-sources-lists
index 1c8ca2d22..1c8ca2d22 100755
--- a/share/hooks/0910-remove-apt-sources-lists
+++ b/share/hooks/all/0910-remove-apt-sources-lists