[arch-commits] Commit in mkpxelinux/repos (5 files)

[Tobias Powalowski]

    Date: Saturday, December 6, 2008 @ 13:00:15
  Author: tpowa
Revision: 20779

Merged revisions 356,20778 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/mkpxelinux/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sa, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r20778 | tpowa | 2008-12-06 18:59:22 +0100 (Sa, 06 Dez 2008) | 1 line
  
  upgpkg: mkpxelinux 2008.12-1
........

Added:
  mkpxelinux/repos/extra-x86_64/options.msg
    (from rev 20778, mkpxelinux/trunk/options.msg)
Modified:
  mkpxelinux/repos/extra-x86_64/	(properties)
  mkpxelinux/repos/extra-x86_64/PKGBUILD
  mkpxelinux/repos/extra-x86_64/mkpxelinux
  mkpxelinux/repos/extra-x86_64/mkpxelinux.conf

-----------------+
 PKGBUILD        |    8 ++++----
 mkpxelinux      |    4 ----
 mkpxelinux.conf |    7 ++++---
 options.msg     |    6 ++++++
 4 files changed, 14 insertions(+), 11 deletions(-)


Property changes on: mkpxelinux/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /mkpxelinux/trunk:1
   + /mkpxelinux/trunk:1-20778

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-06 17:59:22 UTC (rev 20778)
+++ extra-x86_64/PKGBUILD	2008-12-06 18:00:15 UTC (rev 20779)
@@ -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: extra-x86_64/mkpxelinux
===================================================================
--- extra-x86_64/mkpxelinux	2008-12-06 17:59:22 UTC (rev 20778)
+++ extra-x86_64/mkpxelinux	2008-12-06 18:00:15 UTC (rev 20779)
@@ -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: extra-x86_64/mkpxelinux.conf
===================================================================
--- extra-x86_64/mkpxelinux.conf	2008-12-06 17:59:22 UTC (rev 20778)
+++ extra-x86_64/mkpxelinux.conf	2008-12-06 18:00:15 UTC (rev 20779)
@@ -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"

Copied: mkpxelinux/repos/extra-x86_64/options.msg (from rev 20778, mkpxelinux/trunk/options.msg)
===================================================================
--- extra-x86_64/options.msg	                        (rev 0)
+++ extra-x86_64/options.msg	2008-12-06 18:00:15 UTC (rev 20779)
@@ -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