[arch-commits] CVS update of extra/system/mksyslinux (5 files)
Tobias Powalowski
tpowa at archlinux.org
Thu Mar 27 18:59:24 UTC 2008
Date: Thursday, March 27, 2008 @ 14:59:24
Author: tpowa
Path: /home/cvs-extra/extra/system/mksyslinux
Added: options.msg (1.1)
Modified: PKGBUILD (1.11 -> 1.12) boot.msg (1.2 -> 1.3)
mksyslinux (1.8 -> 1.9) mksyslinux.conf (1.3 -> 1.4)
'upgpkg: update to new version'
-----------------+
PKGBUILD | 14 ++++++++++----
boot.msg | 1 +
mksyslinux | 24 +++++++++++++++++++++---
mksyslinux.conf | 6 +++++-
options.msg | 6 ++++++
5 files changed, 43 insertions(+), 8 deletions(-)
Index: extra/system/mksyslinux/PKGBUILD
diff -u extra/system/mksyslinux/PKGBUILD:1.11 extra/system/mksyslinux/PKGBUILD:1.12
--- extra/system/mksyslinux/PKGBUILD:1.11 Sun Oct 7 16:01:57 2007
+++ extra/system/mksyslinux/PKGBUILD Thu Mar 27 14:59:24 2008
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD,v 1.11 2007/10/07 20:01:57 tpowa Exp $
+# $Id: PKGBUILD,v 1.12 2008/03/27 18:59:24 tpowa Exp $
# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
pkgname=mksyslinux
-pkgver=0.2
-pkgrel=2
+pkgver=2008.03
+pkgrel=1
pkgdesc="Advanced, modular syslinux boot image creation utility"
arch=(i686 x86_64)
+license=('GPL')
url="http://www.archlinux.org/"
depends=('mkinitcpio' 'syslinux')
-source=('boot.msg' 'mksyslinux' 'mksyslinux.conf')
+source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')
backup=(etc/mksyslinux.conf)
build()
@@ -17,4 +18,9 @@
install -D -m755 mksyslinux $startdir/pkg/usr/sbin/mksyslinux
install -D -m644 mksyslinux.conf $startdir/pkg/etc/mksyslinux.conf
install -D -m644 boot.msg $startdir/pkg/usr/share/mksyslinux/boot.msg
+ install -D -m644 options.msg $startdir/pkg/usr/share/mksyslinux/options.msg
}
+md5sums=('6a269fc5b58c7bcc6688efeaa2075606'
+ '748763a29e29cb0570d108f8700ebcd4'
+ 'a393348c07bccabcd52b4d8c5d4d42a7'
+ 'fa078942b8adf261e4d925e080dc3018')
Index: extra/system/mksyslinux/boot.msg
diff -u extra/system/mksyslinux/boot.msg:1.2 extra/system/mksyslinux/boot.msg:1.3
--- extra/system/mksyslinux/boot.msg:1.2 Sat May 13 08:41:12 2006
+++ extra/system/mksyslinux/boot.msg Thu Mar 27 14:59:24 2008
@@ -9,5 +9,6 @@
If you wish to change your defaults to boot into your existing system,
type 'vmlinuz initrd=initrd.img <any_other_boot_option>'
+Use the F2 key for troubleshooting and options.
------------------------------------------------------------------------------
Index: extra/system/mksyslinux/mksyslinux
diff -u extra/system/mksyslinux/mksyslinux:1.8 extra/system/mksyslinux/mksyslinux:1.9
--- extra/system/mksyslinux/mksyslinux:1.8 Sun Oct 7 16:01:57 2007
+++ extra/system/mksyslinux/mksyslinux Thu Mar 27 14:59:24 2008
@@ -46,10 +46,17 @@
fi
. "${CONFIG}"
+# export for mkinitcpio
+[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
+[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX
+[ -n "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && export APPENDBOOTMESSAGE_SYSLINUX_LOWMEM
+[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
+
MBRDEVICE="$(echo ${DEVICE} | sed -e 's/[0-9]//g')"
-export RUNPROGRAM="$(echo $0 | awk -F/ '{print $4}')"
+export RUNPROGRAM="${APPNAME}"
[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
+[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
export USEKERNEL=${VERSION}
# begin script
[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR}
@@ -58,21 +65,32 @@
mount ${DEVICE} ${TEMPDIR} || exit 1
# create syslinux.cfg
echo ":: Creating syslinux.cfg ..."
+if [ "${SYSLINUXCFG}" = "" ]; then
[ -e ${TEMPDIR}/syslinux.cfg ] && rm ${TEMPDIR}/syslinux.cfg
echo "prompt ${PROMPT}" >> ${TEMPDIR}/syslinux.cfg
echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/syslinux.cfg
echo "display boot.msg" >> ${TEMPDIR}/syslinux.cfg
+ echo "F1 boot.msg" >> ${TEMPDIR}/syslinux.cfg
+ echo "F2 options.msg" >> ${TEMPDIR}/syslinux.cfg
echo "default arch" >> ${TEMPDIR}/syslinux.cfg
echo "label arch" >> ${TEMPDIR}/syslinux.cfg
echo "kernel vmlinuz" >> ${TEMPDIR}/syslinux.cfg
echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/syslinux.cfg
- echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..."
+else
+ sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
+ ${SYSLINUXCFG} > ${TEMPDIR}/syslinux.cfg
+fi
+[ ! -s ${TEMPDIR}/syslinux.cfg ] && echo "No syslinux.cfg found" && exit 1
+echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..."
# generate initramdisk
echo ":: Creating initramdisk ..."
mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/initrd.img
echo ":: Using ${KERNEL} as image kernel ..."
install -m644 ${KERNEL} ${TEMPDIR}/vmlinuz
-install -m644 ${BOOTMESSAGE} ${TEMPDIR}/boot.msg
+ install -m644 ${BOOTMESSAGE} ${TEMPDIR}/boot.msg
+ install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/options.msg
+ [ ! -s ${TEMPDIR}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
+ [ ! -s ${TEMPDIR}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
echo ":: Unmounting ${DEVICE} ..."
umount ${TEMPDIR} || exit 1
echo ":: Installing MBR on ${MBRDEVICE} ..."
Index: extra/system/mksyslinux/mksyslinux.conf
diff -u extra/system/mksyslinux/mksyslinux.conf:1.3 extra/system/mksyslinux/mksyslinux.conf:1.4
--- extra/system/mksyslinux/mksyslinux.conf:1.3 Mon Oct 1 14:01:21 2007
+++ extra/system/mksyslinux/mksyslinux.conf Thu Mar 27 14:59:24 2008
@@ -15,8 +15,12 @@
# kernel image, defaulted to stock arch kernel
KERNEL="/boot/vmlinuz26"
-# boot message file
+# boot message files
BOOTMESSAGE="/usr/share/mksyslinux/boot.msg"
+OPTIONSBOOTMESSAGE="/usr/share/mksyslinux/options.msg"
+
+syslinux.cfg file to use
+SYSLINUXCFG=""
# Prompt on boot, defaulted to yes, 1=yes 0=no
PROMPT="1"
Index: extra/system/mksyslinux/options.msg
diff -u /dev/null extra/system/mksyslinux/options.msg:1.1
--- /dev/null Thu Mar 27 14:59:24 2008
+++ extra/system/mksyslinux/options.msg Thu Mar 27 14:59:24 2008
@@ -0,0 +1,6 @@
+------------------------------------------------------------------------------
+Arch Linux options and troubleshooting:
+
+- If your system hangs during the boot process, any combinations of the
+ boot options noapic acpi=off pci=routeirq nosmp may be useful.
+------------------------------------------------------------------------------
\ No newline at end of file
More information about the arch-commits
mailing list