diff options
| -rwxr-xr-x | scripts/build/binary_hooks | 4 | ||||
| -rwxr-xr-x | scripts/build/chroot_hooks | 4 | ||||
| -rwxr-xr-x | scripts/build/config | 8 | ||||
| -rwxr-xr-x | scripts/build/source_hooks | 4 | ||||
| -rwxr-xr-x | share/hooks/live/0010-disable-kexec-tools.hook.chroot (renamed from share/hooks/0010-disable-kexec-tools.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0020-create-mtab-symlink.hook.chroot (renamed from share/hooks/0020-create-mtab-symlink.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0030-enable-cryptsetup.hook.chroot (renamed from share/hooks/0030-enable-cryptsetup.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0040-create-locales-files.hook.chroot (renamed from share/hooks/0040-create-locales-files.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot (renamed from share/hooks/0050-disable-sysvinit-tmpfs.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0100-remove-adjtime-configuration.hook.chroot (renamed from share/hooks/0100-remove-adjtime-configuration.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0110-remove-backup-files.hook.chroot (renamed from share/hooks/0110-remove-backup-files.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0120-remove-dbus-machine-id.hook.chroot (renamed from share/hooks/0120-remove-dbus-machine-id.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0130-remove-gnome-icon-cache.hook.chroot (renamed from share/hooks/0130-remove-gnome-icon-cache.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0140-remove-log-files.hook.chroot (renamed from share/hooks/0140-remove-log-files.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0150-remove-mdadm-configuration.hook.chroot (renamed from share/hooks/0150-remove-mdadm-configuration.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0160-remove-openssh-server-host-keys.hook.chroot (renamed from share/hooks/0160-remove-openssh-server-host-keys.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0170-remove-python-py.hook.chroot (renamed from share/hooks/0170-remove-python-py.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0180-remove-systemd-machine-id.hook.chroot (renamed from share/hooks/0180-remove-systemd-machine-id.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0190-remove-temporary-files.hook.chroot (renamed from share/hooks/0190-remove-temporary-files.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0195-remove-ssl-cert-snakeoil.hook.chroot (renamed from share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0200-remove-udev-persistent-cd-rules.hook.chroot (renamed from share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0300-remove-udev-persistent-net-rules.hook.chroot (renamed from share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0400-update-apt-file-cache.hook.chroot (renamed from share/hooks/0400-update-apt-file-cache.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0410-update-apt-xapian-index.hook.chroot (renamed from share/hooks/0410-update-apt-xapian-index.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0420-update-glx-alternative.hook.chroot (renamed from share/hooks/0420-update-glx-alternative.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0430-update-mlocate-database.hook.chroot (renamed from share/hooks/0430-update-mlocate-database.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0440-update-nvidia-alternative.hook.chroot (renamed from share/hooks/0440-update-nvidia-alternative.hook.chroot) | 0 | ||||
| -rwxr-xr-x | share/hooks/live/0910-remove-apt-sources-lists (renamed from share/hooks/0910-remove-apt-sources-lists) | 0 |
28 files changed, 10 insertions, 10 deletions
diff --git a/scripts/build/binary_hooks b/scripts/build/binary_hooks index 9cf2f92cf..bdad671cc 100755 --- a/scripts/build/binary_hooks +++ b/scripts/build/binary_hooks @@ -59,9 +59,9 @@ done ## Processing local hooks -if Find_files config/hooks/*.binary +if Find_files config/hooks/live/*.binary then - for HOOK in config/hooks/*.binary + for HOOK in config/hooks/live/*.binary do # Making hook executable if [ ! -x "${HOOK}" ] diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks index f9ca5ee81..e25f3b7fd 100755 --- a/scripts/build/chroot_hooks +++ b/scripts/build/chroot_hooks @@ -79,12 +79,12 @@ fi ## Processing local hooks -if Find_files config/hooks/*.chroot +if Find_files config/hooks/live/*.chroot then # Restoring cache Restore_cache cache/packages.chroot - for _HOOK in config/hooks/*.chroot + for _HOOK in config/hooks/live/*.chroot do # Copying hook cp "${_HOOK}" chroot/root diff --git a/scripts/build/config b/scripts/build/config index 5c0c92dd3..d713314ac 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1312,16 +1312,16 @@ then rmdir --ignore-fail-on-non-empty local > /dev/null 2>&1 || true fi -mkdir -p config/hooks +mkdir -p config/hooks/live mkdir -p config/includes config/includes.bootstrap config/includes.chroot config/includes.binary config/includes.source Echo_message "Symlinking hooks..." -for _HOOK in "${LIVE_BUILD}"/share/hooks/*.hook* /usr/share/live/build/hooks/*.hook* +for _HOOK in "${LIVE_BUILD}"/share/hooks/live/*.hook* /usr/share/live/build/hooks/live/*.hook* do - if [ -e "${_HOOK}" ] && [ ! -e "config/hooks/$(basename ${_HOOK})" ] + if [ -e "${_HOOK}" ] && [ ! -e "config/hooks/live/$(basename ${_HOOK})" ] then - ln -s "${_HOOK}" "config/hooks/$(basename ${_HOOK})" + ln -s "${_HOOK}" "config/hooks/live/$(basename ${_HOOK})" fi done diff --git a/scripts/build/source_hooks b/scripts/build/source_hooks index 6a98300cc..6f3e08dcd 100755 --- a/scripts/build/source_hooks +++ b/scripts/build/source_hooks @@ -59,9 +59,9 @@ done ## Processing local hooks -if Find_files config/hooks/*.source +if Find_files config/hooks/live/*.source then - for HOOK in config/hooks/*.source + for HOOK in config/hooks/live/*.source do # Making hook executable if [ ! -x "${HOOK}" ] diff --git a/share/hooks/0010-disable-kexec-tools.hook.chroot b/share/hooks/live/0010-disable-kexec-tools.hook.chroot index 403d1d413..403d1d413 100755 --- a/share/hooks/0010-disable-kexec-tools.hook.chroot +++ b/share/hooks/live/0010-disable-kexec-tools.hook.chroot diff --git a/share/hooks/0020-create-mtab-symlink.hook.chroot b/share/hooks/live/0020-create-mtab-symlink.hook.chroot index 5c2fa64ae..5c2fa64ae 100755 --- a/share/hooks/0020-create-mtab-symlink.hook.chroot +++ b/share/hooks/live/0020-create-mtab-symlink.hook.chroot diff --git a/share/hooks/0030-enable-cryptsetup.hook.chroot b/share/hooks/live/0030-enable-cryptsetup.hook.chroot index 54c2978d2..54c2978d2 100755 --- a/share/hooks/0030-enable-cryptsetup.hook.chroot +++ b/share/hooks/live/0030-enable-cryptsetup.hook.chroot diff --git a/share/hooks/0040-create-locales-files.hook.chroot b/share/hooks/live/0040-create-locales-files.hook.chroot index 8a5a8677c..8a5a8677c 100755 --- a/share/hooks/0040-create-locales-files.hook.chroot +++ b/share/hooks/live/0040-create-locales-files.hook.chroot diff --git a/share/hooks/0050-disable-sysvinit-tmpfs.hook.chroot b/share/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot index 37750b36d..37750b36d 100755 --- a/share/hooks/0050-disable-sysvinit-tmpfs.hook.chroot +++ b/share/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot diff --git a/share/hooks/0100-remove-adjtime-configuration.hook.chroot b/share/hooks/live/0100-remove-adjtime-configuration.hook.chroot index 7fe5bbd15..7fe5bbd15 100755 --- a/share/hooks/0100-remove-adjtime-configuration.hook.chroot +++ b/share/hooks/live/0100-remove-adjtime-configuration.hook.chroot diff --git a/share/hooks/0110-remove-backup-files.hook.chroot b/share/hooks/live/0110-remove-backup-files.hook.chroot index 55a6b75af..55a6b75af 100755 --- a/share/hooks/0110-remove-backup-files.hook.chroot +++ b/share/hooks/live/0110-remove-backup-files.hook.chroot diff --git a/share/hooks/0120-remove-dbus-machine-id.hook.chroot b/share/hooks/live/0120-remove-dbus-machine-id.hook.chroot index 230099e46..230099e46 100755 --- a/share/hooks/0120-remove-dbus-machine-id.hook.chroot +++ b/share/hooks/live/0120-remove-dbus-machine-id.hook.chroot diff --git a/share/hooks/0130-remove-gnome-icon-cache.hook.chroot b/share/hooks/live/0130-remove-gnome-icon-cache.hook.chroot index ab35a1d68..ab35a1d68 100755 --- a/share/hooks/0130-remove-gnome-icon-cache.hook.chroot +++ b/share/hooks/live/0130-remove-gnome-icon-cache.hook.chroot diff --git a/share/hooks/0140-remove-log-files.hook.chroot b/share/hooks/live/0140-remove-log-files.hook.chroot index f95e54686..f95e54686 100755 --- a/share/hooks/0140-remove-log-files.hook.chroot +++ b/share/hooks/live/0140-remove-log-files.hook.chroot diff --git a/share/hooks/0150-remove-mdadm-configuration.hook.chroot b/share/hooks/live/0150-remove-mdadm-configuration.hook.chroot index 206b494da..206b494da 100755 --- a/share/hooks/0150-remove-mdadm-configuration.hook.chroot +++ b/share/hooks/live/0150-remove-mdadm-configuration.hook.chroot diff --git a/share/hooks/0160-remove-openssh-server-host-keys.hook.chroot b/share/hooks/live/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/live/0160-remove-openssh-server-host-keys.hook.chroot diff --git a/share/hooks/0170-remove-python-py.hook.chroot b/share/hooks/live/0170-remove-python-py.hook.chroot index ff705838f..ff705838f 100755 --- a/share/hooks/0170-remove-python-py.hook.chroot +++ b/share/hooks/live/0170-remove-python-py.hook.chroot diff --git a/share/hooks/0180-remove-systemd-machine-id.hook.chroot b/share/hooks/live/0180-remove-systemd-machine-id.hook.chroot index ed5d6bf6a..ed5d6bf6a 100755 --- a/share/hooks/0180-remove-systemd-machine-id.hook.chroot +++ b/share/hooks/live/0180-remove-systemd-machine-id.hook.chroot diff --git a/share/hooks/0190-remove-temporary-files.hook.chroot b/share/hooks/live/0190-remove-temporary-files.hook.chroot index fd220e030..fd220e030 100755 --- a/share/hooks/0190-remove-temporary-files.hook.chroot +++ b/share/hooks/live/0190-remove-temporary-files.hook.chroot diff --git a/share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot b/share/hooks/live/0195-remove-ssl-cert-snakeoil.hook.chroot index cdfe39d24..cdfe39d24 100755 --- a/share/hooks/0195-remove-ssl-cert-snakeoil.hook.chroot +++ b/share/hooks/live/0195-remove-ssl-cert-snakeoil.hook.chroot diff --git a/share/hooks/0200-remove-udev-persistent-cd-rules.hook.chroot b/share/hooks/live/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/live/0200-remove-udev-persistent-cd-rules.hook.chroot diff --git a/share/hooks/0300-remove-udev-persistent-net-rules.hook.chroot b/share/hooks/live/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/live/0300-remove-udev-persistent-net-rules.hook.chroot diff --git a/share/hooks/0400-update-apt-file-cache.hook.chroot b/share/hooks/live/0400-update-apt-file-cache.hook.chroot index 771e9032a..771e9032a 100755 --- a/share/hooks/0400-update-apt-file-cache.hook.chroot +++ b/share/hooks/live/0400-update-apt-file-cache.hook.chroot diff --git a/share/hooks/0410-update-apt-xapian-index.hook.chroot b/share/hooks/live/0410-update-apt-xapian-index.hook.chroot index dcb39b261..dcb39b261 100755 --- a/share/hooks/0410-update-apt-xapian-index.hook.chroot +++ b/share/hooks/live/0410-update-apt-xapian-index.hook.chroot diff --git a/share/hooks/0420-update-glx-alternative.hook.chroot b/share/hooks/live/0420-update-glx-alternative.hook.chroot index 8c36c43f9..8c36c43f9 100755 --- a/share/hooks/0420-update-glx-alternative.hook.chroot +++ b/share/hooks/live/0420-update-glx-alternative.hook.chroot diff --git a/share/hooks/0430-update-mlocate-database.hook.chroot b/share/hooks/live/0430-update-mlocate-database.hook.chroot index 6bfdb3d4f..6bfdb3d4f 100755 --- a/share/hooks/0430-update-mlocate-database.hook.chroot +++ b/share/hooks/live/0430-update-mlocate-database.hook.chroot diff --git a/share/hooks/0440-update-nvidia-alternative.hook.chroot b/share/hooks/live/0440-update-nvidia-alternative.hook.chroot index e73b9678b..e73b9678b 100755 --- a/share/hooks/0440-update-nvidia-alternative.hook.chroot +++ b/share/hooks/live/0440-update-nvidia-alternative.hook.chroot diff --git a/share/hooks/0910-remove-apt-sources-lists b/share/hooks/live/0910-remove-apt-sources-lists index 1c8ca2d22..1c8ca2d22 100755 --- a/share/hooks/0910-remove-apt-sources-lists +++ b/share/hooks/live/0910-remove-apt-sources-lists |