aboutsummaryrefslogtreecommitdiffstats
path: root/main/syslinux
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-05-29 12:19:06 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-05-29 12:19:06 +0000
commit1a9a0430790d7829d9ee53e0fbc17dbe6c7a6b69 (patch)
treee7b155bdba1fbd6cc32c6b2613b439fa4aa44049 /main/syslinux
parent6ef416d04da9be0960a3de87bcb2613d9046e689 (diff)
main/syslinux: add support for serial console in update-extlinux
fixes #2761
Diffstat (limited to 'main/syslinux')
-rw-r--r--main/syslinux/APKBUILD14
-rwxr-xr-xmain/syslinux/update-extlinux3
-rw-r--r--main/syslinux/update-extlinux.conf8
3 files changed, 18 insertions, 7 deletions
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD
index 191ae4915be..6d8aab34adc 100644
--- a/main/syslinux/APKBUILD
+++ b/main/syslinux/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=syslinux
pkgver=6.02
-pkgrel=0
+pkgrel=1
_ver=${pkgver/_/-}
pkgdesc="Boot loader for the Linux operating system"
url="http://syslinux.org"
@@ -55,11 +55,11 @@ package() {
}
md5sums="6f275813a1b08cf852e55c0a3f8fbc78 syslinux-6.02.tar.xz
-603c7e3745c2cdded5332c7acb390fa0 update-extlinux.conf
-89fb72c4dd47516402bc91a3cdf2b4d5 update-extlinux"
+38d206b75b1096ba5df6cfabf455ab06 update-extlinux.conf
+320f3d2b57293ecf7d578fa53c087dde update-extlinux"
sha256sums="afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478 syslinux-6.02.tar.xz
-99c8864958daf6f7bb2460082ceb809e0ce49aec3f0b847c7644565da14595e3 update-extlinux.conf
-0dce3d534ab4288872c7654d7408d35896f508d486ad7d02cdaaf5fee37f6ae5 update-extlinux"
+d0b7b869489d0ac1529dd742d8d88844ea4e0a5d893de5218b250b97f68e55f2 update-extlinux.conf
+031563308b02b148a2db2c66922feb1b0e5ec8dd92fcf79de93d0e581df8da0f update-extlinux"
sha512sums="919d165e9cba2b964cec8b015f0a4281a5f90e908f247441d6edefe289170e697b933554d12fa90e698b6d2e8b5b40fdb3b7a95d746a41c580e3a44f8859818f syslinux-6.02.tar.xz
-6e01a8c181812218eef38f183475d5b96079cbefe635b57b23cb2322fed552ff4d0c3e974a7defa7ea84b015659725b35aee247bc1ab9dc5903ffd124ae7ff25 update-extlinux.conf
-848940244b9547c8d5d721b494cda199ea5785e306e8ac2124640f89ba7837d4a6e3a9a09fd2c5cd662d3ba66c5f81fcb1ec1f52fae9fade45b1ff10d7fc2b61 update-extlinux"
+f304068ee174e531890fed20b05d962e6c076160c470ed9cf0d822ff56917793ecabec8c0495b045a740f1f63412a55fbb1fa4b4231b18f76c8584b55f51306d update-extlinux.conf
+64c664e61deea6e128e6ffd55d6c92e5a7c73ecc7058ba2f8201b38a79a388d74833653ce4da87e8a977659257f7b17830f490a0800f205d9525ae1a0771b3c4 update-extlinux"
diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux
index 26eb4c70b7c..b3c387baee5 100755
--- a/main/syslinux/update-extlinux
+++ b/main/syslinux/update-extlinux
@@ -73,6 +73,9 @@ fi
umask 0022
rm -f $conf.new
echo "# Generated by update-extlinux $version" > $conf.new
+if [ -n "$serial_port" ]; then
+ echo "SERIAL $serial_port ${serial_baud:-115200}" >> $conf.new
+fi
echo "DEFAULT $syslinux_menu" >> $conf.new
echo "PROMPT 0" >> $conf.new
echo "MENU TITLE Alpine/$(uname -s) Boot Menu" >> $conf.new
diff --git a/main/syslinux/update-extlinux.conf b/main/syslinux/update-extlinux.conf
index a34d5a96244..b6ca40f0b07 100644
--- a/main/syslinux/update-extlinux.conf
+++ b/main/syslinux/update-extlinux.conf
@@ -38,6 +38,14 @@ timeout=3
# default kernel to boot
default=grsec
+# serial_port
+# serial port number - if not specified, serial console will be disabled
+serial_port=
+
+# serial_baud
+# the baudrate for the serial port. Will use 115200 if unset
+serial_baud=115200
+
# xen_opts
# options to hand to xen hypervisor, useful ones are:
# dom0_mem=256M (give domain-0 environment 256M ram)