diff options
| -rwxr-xr-x | functions/defaults.sh | 6 | ||||
| -rwxr-xr-x | scripts/build/chroot_hacks | 14 | ||||
| -rwxr-xr-x | share/hooks/0130-disable-kexec-tools.chroot | 16 |
3 files changed, 20 insertions, 16 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 70fdadaf5..f93938b8b 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -632,7 +632,8 @@ Set_defaults () remove-udev-persistent-rules \ remove-linux-image-backups \ remove-mdadm-configuration \ - remote-adjtime-configuration}" + remote-adjtime-configuration \ + disable-kexec-tools}" ;; kubuntu) @@ -646,7 +647,8 @@ Set_defaults () remove-udev-persistent-rules \ remove-linux-image-backups \ remove-mdadm-configuration \ - remove-adjtime-configuration}" + remove-adjtime-configuration \ + disable-kexec-tools}" ;; esac diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks index 58f8e7064..1e7bce918 100755 --- a/scripts/build/chroot_hacks +++ b/scripts/build/chroot_hacks @@ -38,20 +38,6 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -# Handling default desktop configuration -case "${LB_MODE}" in - debian*) - # disable kexec-tools - if [ -e chroot/sbin/kexec ] - then - echo "kexec-tools kexec-tools/load_kexec boolean false" > chroot/root/preseed - Chroot chroot "debconf-set-selections /root/preseed" - rm -f chroot/root/preseed - Chroot chroot "dpkg-reconfigure kexec-tools" - fi - ;; -esac - case "${LB_BINARY_IMAGES}" in netboot) if [ ! -f chroot/sbin/mount.cifs ] diff --git a/share/hooks/0130-disable-kexec-tools.chroot b/share/hooks/0130-disable-kexec-tools.chroot new file mode 100755 index 000000000..403d1d413 --- /dev/null +++ b/share/hooks/0130-disable-kexec-tools.chroot @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +# Disable kexec-tools + +if [ -e /sbin/kexec ] +then + echo "kexec-tools kexec-tools/load_kexec boolean false" > /root/preseed + + debconf-set-selections /root/preseed + + rm -f /root/preseed + + dpkg-reconfigure kexec-tools +fi |