[arch-commits] CVS update of extra/system/mkbootcd (5 files)
Tobias Powalowski
tpowa at archlinux.org
Thu Mar 27 18:49:38 UTC 2008
Date: Thursday, March 27, 2008 @ 14:49:38
Author: tpowa
Path: /home/cvs-extra/extra/system/mkbootcd
Added: options.msg (1.1)
Modified: PKGBUILD (1.15 -> 1.16) boot.msg (1.2 -> 1.3)
mkbootcd (1.11 -> 1.12) mkbootcd.conf (1.3 -> 1.4)
'upgpkg: update to new version'
---------------+
PKGBUILD | 16 +++++++++-------
boot.msg | 1 +
mkbootcd | 26 +++++++++++++++++++++-----
mkbootcd.conf | 5 +++--
options.msg | 6 ++++++
5 files changed, 40 insertions(+), 14 deletions(-)
Index: extra/system/mkbootcd/PKGBUILD
diff -u extra/system/mkbootcd/PKGBUILD:1.15 extra/system/mkbootcd/PKGBUILD:1.16
--- extra/system/mkbootcd/PKGBUILD:1.15 Wed Oct 3 09:34:48 2007
+++ extra/system/mkbootcd/PKGBUILD Thu Mar 27 14:49:37 2008
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD,v 1.15 2007/10/03 13:34:48 tpowa Exp $
+# $Id: PKGBUILD,v 1.16 2008/03/27 18:49:37 tpowa Exp $
# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
pkgname=mkbootcd
-pkgver=0.4
-pkgrel=3
+pkgver=2008.03
+pkgrel=1
pkgdesc="Advanced, modular isolinux bootcd image creation utility"
arch=(i686 x86_64)
license=('GPL')
url="http://www.archlinux.org/"
depends=('mkinitcpio' 'cdrkit' 'syslinux')
-source=('boot.msg' 'mkbootcd' 'mkbootcd.conf')
+source=('boot.msg' 'mkbootcd' 'mkbootcd.conf' 'options.msg')
backup=(etc/mkbootcd.conf)
build()
@@ -18,7 +18,9 @@
install -D -m755 mkbootcd $startdir/pkg/usr/sbin/mkbootcd
install -D -m644 mkbootcd.conf $startdir/pkg/etc/mkbootcd.conf
install -D -m644 boot.msg $startdir/pkg/usr/share/mkbootcd/boot.msg
+ install -D -m644 options.msg $startdir/pkg/usr/share/mkbootcd/options.msg
}
-md5sums=('b0faa0f3076dae815c022c44d9e74812'
- '7b15e2f937226edd996b9d9549c4b478'
- '210865b958a68cae57b39828469ef992')
+md5sums=('d02e111f81204044644f728ff85e2284'
+ 'c2b957d5431ba10f01c708e2b7b15d74'
+ 'e08b9b952b5e468feb16e3f20ee3faf2'
+ 'fa078942b8adf261e4d925e080dc3018')
Index: extra/system/mkbootcd/boot.msg
diff -u extra/system/mkbootcd/boot.msg:1.2 extra/system/mkbootcd/boot.msg:1.3
--- extra/system/mkbootcd/boot.msg:1.2 Sat May 13 08:41:12 2006
+++ extra/system/mkbootcd/boot.msg Thu Mar 27 14:49:38 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/mkbootcd/mkbootcd
diff -u extra/system/mkbootcd/mkbootcd:1.11 extra/system/mkbootcd/mkbootcd:1.12
--- extra/system/mkbootcd/mkbootcd:1.11 Wed Oct 3 09:34:49 2007
+++ extra/system/mkbootcd/mkbootcd Thu Mar 27 14:49:38 2008
@@ -53,6 +53,7 @@
[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE
[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX
[ -n "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && export APPENDBOOTMESSAGE_SYSLINUX_LOWMEM
+[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE
if [ "$GRUB" = "1" ]; then
export RUNPROGRAM="${APPNAME}-grub"
@@ -62,6 +63,7 @@
export BOOTDIRNAME="isolinux"
fi
[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX)
+[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX)
[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX)
export USEKERNEL=${VERSION}
# begin script
@@ -82,10 +84,22 @@
> ${TEMPDIR}/${BOOTDIRNAME}/grub/menu.lst
else
echo ":: Creating isolinux.cfg ..."
- [ ! -e "${ISOLINUXCFG}" ] && echo "No isolinux.cfg found" && exit 1
+ if [ "${ISOLINUXCFG}" = "" ]; then
+ [ -e ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ echo "default arch" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ echo "label arch" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ echo "kernel vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ else
sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \
- ${ISOLINUXCFG} \
- > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg
+ fi
+ [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1
fi
echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..."
# generate initramdisk
@@ -93,8 +107,10 @@
mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img
echo ":: Using ${KERNEL} as image kernel ..."
install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/vmlinuz
-install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
-[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
+ install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg
+ install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg
+ [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
+ [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
# create image
if ! [ "${TARNAME}" = "" ]; then
echo ":: Creating tar.bz2 image ..."
Index: extra/system/mkbootcd/mkbootcd.conf
diff -u extra/system/mkbootcd/mkbootcd.conf:1.3 extra/system/mkbootcd/mkbootcd.conf:1.4
--- extra/system/mkbootcd/mkbootcd.conf:1.3 Mon Dec 18 20:30:02 2006
+++ extra/system/mkbootcd/mkbootcd.conf Thu Mar 27 14:49:38 2008
@@ -15,10 +15,11 @@
# kernel image, defaulted to stock arch kernel
KERNEL="/boot/vmlinuz26"
-# boot message file
+# boot message files
BOOTMESSAGE="/usr/share/mkbootcd/boot.msg"
+OPTIONSBOOTMESSAGE="/usr/share/mkbootcd/options.msg"
-# menu.lst or isolinux.cfg files to use
+# menu.lst or isolinux.cfg file to use
ISOLINUXCFG=""
MENULST=""
Index: extra/system/mkbootcd/options.msg
diff -u /dev/null extra/system/mkbootcd/options.msg:1.1
--- /dev/null Thu Mar 27 14:49:38 2008
+++ extra/system/mkbootcd/options.msg Thu Mar 27 14:49:38 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