diff options
| author | Henrik Riomar <henrik.riomar@gmail.com> | 2018-10-25 22:41:51 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-26 12:21:45 +0000 |
| commit | 28eebaa5b0e64bdf8238c36a1ae9d95517242d90 (patch) | |
| tree | b7b1036f875061cecb1cfb5669ce0e4c94a3ee5f | |
| parent | 293a3358836efe6f732bbcede8068c6966c62b97 (diff) | |
| download | aports-28eebaa5b0e64bdf8238c36a1ae9d95517242d90.tar.bz2 aports-28eebaa5b0e64bdf8238c36a1ae9d95517242d90.tar.xz | |
main/syslinux: intel-ucode simplify
| -rw-r--r-- | main/syslinux/APKBUILD | 2 | ||||
| -rwxr-xr-x | main/syslinux/update-extlinux | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index d8f380492e..c6ada9b092 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -57,4 +57,4 @@ package() { sha512sums="7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98 syslinux-6.04-pre1.tar.xz c3ff809f9cd60aa8a837d9508e6fcd08204b03cd8a9df86ab42fc6a8fe68784416b359b46378fb0a8f4163bbcbe444957e0e5751c30ff4631d4677eaa94874f4 update-extlinux.conf -5b76e00b06f2f21732858f48beb98ea4e6f04c0ec6e4f12092bc7c574bef04b5e01f595f3e9cb710935736fb419a8d2805d7d0d8695ef1b4179c2196f258a3f5 update-extlinux" +bfeb911507c079c8b01027a7823e562d81100b1fcd0786c707ad33c5ce18fa0eb6d6db34bc7b6cbbc419248188970cebe8286345f4aa3662d16644c51f50b98c update-extlinux" diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux index 63c3fda27a..f82066f9e9 100755 --- a/main/syslinux/update-extlinux +++ b/main/syslinux/update-extlinux @@ -165,21 +165,16 @@ for kernel in $(find /boot -name "vmlinuz*" -type f); do fi echo " MENU LABEL Linux $tag" >> $conf.new echo " LINUX $(basename $kernel)" >> $conf.new + initrd= if [ -f "/boot/initramfs-$tag" ]; then everbose "Found initramfs: /boot/initramfs-$tag" initrd="initramfs-$tag" - if [ -f "/boot/intel-ucode.img" ]; then - everbose "Found microcode for Intel CPUs: /boot/intel-ucode.img" - initrd="intel-ucode.img,${initrd}" - fi - echo " INITRD ${initrd}" >> $conf.new - else - if [ -f "/boot/intel-ucode.img" ]; then - everbose "Found microcode for Intel CPUs: /boot/intel-ucode.img" - initrd="intel-ucode.img${initrd}" - echo " INITRD intel-ucode.img" >> $conf.new - fi fi + if [ -f "/boot/intel-ucode.img" ]; then + everbose "Found microcode for Intel CPUs: /boot/intel-ucode.img" + initrd="intel-ucode.img${initrd:+,}${initrd}" + fi + echo " INITRD ${initrd}" >> $conf.new echo " APPEND root=$root modules=${modules}${TYPE:+,$TYPE} $default_kernel_opts" >> $conf.new echo "" >> $conf.new lst=$(($lst + 1)) |