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 /main/syslinux/update-extlinux | |
| parent | 293a3358836efe6f732bbcede8068c6966c62b97 (diff) | |
| download | aports-28eebaa5b0e64bdf8238c36a1ae9d95517242d90.tar.bz2 aports-28eebaa5b0e64bdf8238c36a1ae9d95517242d90.tar.xz | |
main/syslinux: intel-ucode simplify
Diffstat (limited to 'main/syslinux/update-extlinux')
| -rwxr-xr-x | main/syslinux/update-extlinux | 17 |
1 files changed, 6 insertions, 11 deletions
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)) |