[arch-commits] Commit in mkpxelinux/trunk (4 files)
Tobias Powalowski
tpowa at archlinux.org
Sat Dec 6 17:59:22 UTC 2008
Date: Saturday, December 6, 2008 @ 12:59:22
Author: tpowa
Revision: 20778
upgpkg: mkpxelinux 2008.12-1
Added:
mkpxelinux/trunk/options.msg
Modified:
mkpxelinux/trunk/PKGBUILD
mkpxelinux/trunk/mkpxelinux
mkpxelinux/trunk/mkpxelinux.conf
-----------------+
PKGBUILD | 8 ++++----
mkpxelinux | 4 ----
mkpxelinux.conf | 7 ++++---
options.msg | 6 ++++++
4 files changed, 14 insertions(+), 11 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-12-06 17:57:57 UTC (rev 20777)
+++ PKGBUILD 2008-12-06 17:59:22 UTC (rev 20778)
@@ -2,7 +2,7 @@
# Maintainer : Tobias Powalowski <tpowa at archlinux.org>
pkgname=mkpxelinux
-pkgver=2008.03
+pkgver=2008.12
pkgrel=1
pkgdesc="Advanced, modular network pxe boot image creation utility"
arch=(i686 x86_64)
@@ -20,6 +20,6 @@
install -D -m644 options.msg $startdir/pkg/usr/share/mkpxelinux/options.msg
}
md5sums=('f4a30ab94fdc1974f4fbdfd7235ca512'
- '82fe26ac9a6ab16bf6b04aa1efc9f910'
- 'f1e8fd8c8e2d0b75a33356823ca17d90'
- 'fa078942b8adf261e4d925e080dc3018')
+ '2c98ea6e377e68f4427dca55ce509e73'
+ 'd8b5646c12526fdd34dbd59fca480a77'
+ 'b211c5f7e30d2ee36cde20f71aa3f2b8')
Modified: mkpxelinux
===================================================================
--- mkpxelinux 2008-12-06 17:57:57 UTC (rev 20777)
+++ mkpxelinux 2008-12-06 17:59:22 UTC (rev 20778)
@@ -8,7 +8,6 @@
{
echo "${APPNAME}: usage"
echo""
- echo " -a run script"
echo " -d=INSTALLDIR Your INSTALLDIR overwrites config default"
echo " -c=CONFIG Use CONFIG file. default: /etc/mkpxelinux.conf"
echo " -h This message."
@@ -19,7 +18,6 @@
while [ $# -gt 0 ]; do
case $1 in
- -a|--a) echo "Running $APPNAME ..." ;;
-c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;;
-d=*|--d=*) INSTALLDIR="$(echo $1 | awk -F= '{print $2;}')" ;;
-h|--h|?) usage ;;
@@ -36,8 +34,6 @@
. "${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
if [ "${INSTALLDIR}" = "" ]; then
Modified: mkpxelinux.conf
===================================================================
--- mkpxelinux.conf 2008-12-06 17:57:57 UTC (rev 20777)
+++ mkpxelinux.conf 2008-12-06 17:59:22 UTC (rev 20778)
@@ -22,11 +22,12 @@
pxelinux default config file to use
PXELINUX_DEFAULT=""
-# Prompt on boot, defaulted to yes, 1=yes 0=no
+# Prompt on boot, 1=yes 0=no
PROMPT="1"
-# Timeout in seconds on boot, defaulted to 0, because we prompt by default
-TIMEOUT="0"
+# Timeout, 30 seconds to fix usb keyboard issues
+# 0 means wait for prompt
+TIMEOUT="300"
# Installdir of tftp, default location
INSTALLDIR="/var/tftpboot"
Added: options.msg
===================================================================
--- options.msg (rev 0)
+++ options.msg 2008-12-06 17:59:22 UTC (rev 20778)
@@ -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 nomsi may be useful.
+------------------------------------------------------------------------------
\ No newline at end of file
More information about the arch-commits
mailing list