diff options
Diffstat (limited to 'data')
4 files changed, 23 insertions, 7 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index 4cae2b6d..5b90ffbd 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current" vyos_branch = "current" release_train = "current" -kernel_version = "6.1.55" +kernel_version = "6.1.66" bootloaders = "syslinux,grub-efi" squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery" diff --git a/data/live-build-config/bootloaders/grub-pc/grub.cfg b/data/live-build-config/bootloaders/grub-pc/grub.cfg index 8837b8a2..4c46c89f 100644 --- a/data/live-build-config/bootloaders/grub-pc/grub.cfg +++ b/data/live-build-config/bootloaders/grub-pc/grub.cfg @@ -4,6 +4,7 @@ set timeout=10 insmod serial serial --unit=0 --speed=115200 +insmod gzio insmod part_msdos insmod ext2 insmod efi_gop diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot index 1bea51b1..4dc880ca 100755 --- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot +++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot @@ -1,6 +1,7 @@ #!/bin/sh echo I: Disabling services +systemctl disable arpwatch.service systemctl disable smartd.service systemctl disable kea-ctrl-agent.service systemctl disable kea-dhcp4-server.service @@ -80,6 +81,7 @@ systemctl enable vyos-hostsd.service systemctl enable acpid.service systemctl enable vyos-router.service systemctl enable vyos-configd.service +systemctl enable vyos-grub-update.service echo I: Masking services systemctl mask systemd-journald-audit.socket diff --git a/data/live-build-config/hooks/live/99-strip-symbols.chroot b/data/live-build-config/hooks/live/99-strip-symbols.chroot index ba3356ca..704f9cb3 100755 --- a/data/live-build-config/hooks/live/99-strip-symbols.chroot +++ b/data/live-build-config/hooks/live/99-strip-symbols.chroot @@ -27,16 +27,23 @@ STRIPDIR_UNNEEDED=" /usr/libx32 /usr/sbin " +STRIP_EXCLUDE=`dpkg-query -L libbinutils | grep '.so'` # Perform stuff. echo "Stripping symbols..." +# List excluded files. +echo "Exclude files: ${STRIP_EXCLUDE}" + # CMD: strip for DIR in ${STRIPDIR_REGULAR}; do echo "Parse dir (strip): ${DIR}" find ${DIR} -type f -exec file {} \; | grep 'not stripped' | cut -d ":" -f 1 | while read FILE; do - echo "Strip file (strip): ${FILE}" - ${STRIPCMD_REGULAR} ${FILE} + echo "${STRIP_EXCLUDE}" | grep -F -q -w "${FILE}" + if [ $? -ne 0 ]; then + echo "Strip file (strip): ${FILE}" + ${STRIPCMD_REGULAR} ${FILE} + fi done done @@ -44,8 +51,11 @@ done for DIR in ${STRIPDIR_DEBUG}; do echo "Parse dir (strip-debug): ${DIR}" find ${DIR} -type f -exec file {} \; | grep 'not stripped' | cut -d ":" -f 1 | while read FILE; do - echo "Strip file (strip-debug): ${FILE}" - ${STRIPCMD_DEBUG} ${FILE} + echo "${STRIP_EXCLUDE}" | grep -F -q -w "${FILE}" + if [ $? -ne 0 ]; then + echo "Strip file (strip-debug): ${FILE}" + ${STRIPCMD_DEBUG} ${FILE} + fi done done @@ -53,8 +63,11 @@ done for DIR in ${STRIPDIR_UNNEEDED}; do echo "Parse dir (strip-unneeded: ${DIR}" find ${DIR} -type f -exec file {} \; | grep 'not stripped' | cut -d ":" -f 1 | while read FILE; do - echo "Strip file (strip-unneeded): ${FILE}" - ${STRIPCMD_UNNEEDED} ${FILE} + echo "${STRIP_EXCLUDE}" | grep -F -q -w "${FILE}" + if [ $? -ne 0 ]; then + echo "Strip file (strip-unneeded): ${FILE}" + ${STRIPCMD_UNNEEDED} ${FILE} + fi done done |