summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-10-22 12:55:16 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-10-22 12:58:15 +0000
commit934550384dbf3e9fe3502bd4dfa4ae06857a4912 (patch)
tree7400e0c5645ca3e05570921e8314d209b8022216
parentb69a9413143a4a960b07c8b798c677a52c0c0699 (diff)
downloadaports-934550384dbf3e9fe3502bd4dfa4ae06857a4912.tar.bz2
aports-934550384dbf3e9fe3502bd4dfa4ae06857a4912.tar.xz
main/syslinux: update-extlinux detect kernel labels as 'grsec'
-rw-r--r--main/syslinux/.update-extlinux.swpbin12288 -> 0 bytes
-rw-r--r--main/syslinux/APKBUILD6
-rwxr-xr-xmain/syslinux/update-extlinux13
-rw-r--r--main/syslinux/update-extlinux.conf8
4 files changed, 19 insertions, 8 deletions
diff --git a/main/syslinux/.update-extlinux.swp b/main/syslinux/.update-extlinux.swp
deleted file mode 100644
index 8f3a846c7..000000000
--- a/main/syslinux/.update-extlinux.swp
+++ /dev/null
Binary files differ
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD
index 6cf19fd4a..daf06fb52 100644
--- a/main/syslinux/APKBUILD
+++ b/main/syslinux/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=syslinux
pkgver=4.04
-pkgrel=8
+pkgrel=9
pkgdesc="Boot loader for the Linux operating system"
url="http://syslinux.org"
arch="x86 x86_64"
@@ -37,5 +37,5 @@ package() {
}
md5sums="a3936208767eb7ced65320abe2e33a10 syslinux-4.04.tar.bz2
-92ed1795cfda4bc2f06fca2da0dc977c update-extlinux.conf
-16ef4c8f2f8746f97f943c249b6bd4e5 update-extlinux"
+7ef73a7a858b8aa1ac6635d6391ac8e5 update-extlinux.conf
+2206105f11b92971abb768ac0aa2e7d8 update-extlinux"
diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux
index 8a26ffe6c..2de06e259 100755
--- a/main/syslinux/update-extlinux
+++ b/main/syslinux/update-extlinux
@@ -119,9 +119,12 @@ for kernel in $(find /boot -name vmlinuz-* -type f); do
everbose "Found initramfs: /boot/initramfs-$tag"
initramfs="initrd=initramfs-$tag"
fi
-
- echo "LABEL $lst" >> $conf.new
- if [ "$lst" = "$default" ]; then
+ label=$(grep -w -l $tag /usr/share/kernel/*/kernel.release | cut -d/ -f5)
+ if [ -z "$label" ]; then
+ label=$lst
+ fi
+ echo "LABEL $label" >> $conf.new
+ if [ "$label" = "$default" ]; then
echo " MENU DEFAULT" >> $conf.new
fi
echo " MENU LABEL Linux $tag" >> $conf.new
@@ -133,11 +136,11 @@ done
if [ -f "/boot/memtest" ]; then
everbose "Found memtest86+: /boot/memtest"
- echo "LABEL $lst" >> $conf.new
+ echo "LABEL memtest" >> $conf.new
echo " MENU LABEL Memtest86+" >> $conf.new
echo " KERNEL memtest" >> $conf.new
echo "" >> $conf.new
- lst=$(($lst + 1))
+ lst=$(($lst + 1))
fi
everbose "$lst entries found."
diff --git a/main/syslinux/update-extlinux.conf b/main/syslinux/update-extlinux.conf
index c64988b79..59f9e60c4 100644
--- a/main/syslinux/update-extlinux.conf
+++ b/main/syslinux/update-extlinux.conf
@@ -30,6 +30,14 @@ verbose=0
# if set to non-zero, the boot menu will be hidden by default.
hidden=1
+# timeout
+# number of seconds to wait before booting default
+timeout=3
+
+# default
+# default kernel to boot
+default=grsec
+
# xen_opts
# options to hand to xen hypervisor, useful ones are:
# dom0_mem=256M (give domain-0 environment 256M ram)