From 996d82777216bcff8ce7e69c6f9f4e166a7df46c Mon Sep 17 00:00:00 2001 From: simono41 Date: Sat, 25 Aug 2018 21:42:10 +0200 Subject: [PATCH] fix --- make_mksquashfs-auto.sh | 5 +++-- pacman-hooks/systemd-bootloader-update.hook | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/make_mksquashfs-auto.sh b/make_mksquashfs-auto.sh index ba5a3c1..134ab01 100755 --- a/make_mksquashfs-auto.sh +++ b/make_mksquashfs-auto.sh @@ -22,6 +22,7 @@ iso_label="SPECTRE_OS" iso_version=$(date +%Y.%m.%d) out_dir=out install_dir=arch +kernel=4.14 version="$1" shift @@ -215,8 +216,8 @@ function BIOS() { cp -R ${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/* ${work_dir}/iso/${install_dir}/boot/syslinux/ if [ "${version}" == "manjaro" ]; then - cp $(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "initramfs*$(uname -m).img") | cut -d" " -f1 ) ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img - cp $(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "vmlinuz*$(uname -m)") | cut -d" " -f2 ) ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz + cp $(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "initramfs-${kernel}-$(uname -m).img") | cut -d" " -f1 ) ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img + cp $(echo $(find ${work_dir}/${arch}/airootfs/boot/ -name "vmlinuz-${kernel}-$(uname -m)") | cut -d" " -f1 ) ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz else cp ${work_dir}/${arch}/airootfs/boot/initramfs-linux${linuxparameter}.img ${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img cp ${work_dir}/${arch}/airootfs/boot/vmlinuz-linux${linuxparameter} ${work_dir}/iso/${install_dir}/boot/${arch}/vmlinuz diff --git a/pacman-hooks/systemd-bootloader-update.hook b/pacman-hooks/systemd-bootloader-update.hook index 5e8b848..369e656 100644 --- a/pacman-hooks/systemd-bootloader-update.hook +++ b/pacman-hooks/systemd-bootloader-update.hook @@ -3,6 +3,7 @@ Operation = Remove Operation = Upgrade Type = Package Target = linux +Target = linux414 Target = grub [Action]