[arch-commits] Commit in mksyslinux/repos (4 files)

Tobias Powalowski tpowa at archlinux.org
Sat Dec 6 18:04:45 UTC 2008


    Date: Saturday, December 6, 2008 @ 13:04:45
  Author: tpowa
Revision: 20781

Merged revisions 20780 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/mksyslinux/trunk

........
  r20780 | tpowa | 2008-12-06 19:03:36 +0100 (Sa, 06 Dez 2008) | 1 line
  
  upgpkg: mksyslinux 2008.12-1
........

Modified:
  mksyslinux/repos/extra-x86_64/	(properties)
  mksyslinux/repos/extra-x86_64/PKGBUILD
  mksyslinux/repos/extra-x86_64/mksyslinux.conf
  mksyslinux/repos/extra-x86_64/options.msg

-----------------+
 PKGBUILD        |   11 +++++------
 mksyslinux.conf |    7 ++++---
 options.msg     |    2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)


Property changes on: mksyslinux/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /mksyslinux/trunk:1-12662
   + /mksyslinux/trunk:1-20780

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-06 18:03:36 UTC (rev 20780)
+++ extra-x86_64/PKGBUILD	2008-12-06 18:04:45 UTC (rev 20781)
@@ -2,7 +2,7 @@
 # Maintainer : Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=mksyslinux
-pkgver=2008.09
+pkgver=2008.12
 pkgrel=1
 pkgdesc="Advanced, modular syslinux boot image creation utility"
 arch=(i686 x86_64)
@@ -11,10 +11,6 @@
 depends=('mkinitcpio' 'syslinux')
 source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')
 backup=(etc/mksyslinux.conf)
-md5sums=('6a269fc5b58c7bcc6688efeaa2075606'
-         '3eaa9d2699a4afd28731f52855ff2272'
-         'a393348c07bccabcd52b4d8c5d4d42a7'
-         'fa078942b8adf261e4d925e080dc3018')
 
 build()
 {
@@ -24,4 +20,7 @@
   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'
+         '3eaa9d2699a4afd28731f52855ff2272'
+         '498997ebe6bba351bdfbaa59f5d8e523'
+         'b211c5f7e30d2ee36cde20f71aa3f2b8')

Modified: extra-x86_64/mksyslinux.conf
===================================================================
--- extra-x86_64/mksyslinux.conf	2008-12-06 18:03:36 UTC (rev 20780)
+++ extra-x86_64/mksyslinux.conf	2008-12-06 18:04:45 UTC (rev 20781)
@@ -22,11 +22,12 @@
 syslinux.cfg file to use
 SYSLINUXCFG=""
 
-# 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"
 
 # default MBR
 MBR="/usr/lib/syslinux/mbr.bin"
\ No newline at end of file

Modified: extra-x86_64/options.msg
===================================================================
--- extra-x86_64/options.msg	2008-12-06 18:03:36 UTC (rev 20780)
+++ extra-x86_64/options.msg	2008-12-06 18:04:45 UTC (rev 20781)
@@ -2,5 +2,5 @@
 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.
+  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