Sun Mar 4 00:01:47 UTC 2012

3 files changed, 21 insertions, 15 deletions

diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD
index 53eb06d0b..adf769587 100644
--- a/core/syslinux/PKGBUILD
+++ b/core/syslinux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 144967 2011-12-12 09:45:24Z thomas $
+# $Id: PKGBUILD 151789 2012-03-02 23:26:36Z pierre $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=syslinux
 pkgver=4.05
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE"
 url="http://syslinux.zytor.com/"
@@ -12,7 +12,7 @@ license=('GPL2')
 depends=('perl' 'glibc')
 optdepends=('perl-passwd-md5:  For md5pass'
             'perl-digest-sha1: For sha1pass'
-            'mtools:           For mkdiskimage and syslinux'
+            'mtools:           For mkdiskimage and fat support'
            )
 makedepends=('nasm')
 backup=('boot/syslinux/syslinux.cfg')
@@ -23,8 +23,8 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t
         syslinux-install_update)
 md5sums=('82299242418385da1274c9479a778cb2'
          '1528c376e43f0eaccaa80d8ad1bc13b4'
-         '4dc27d8ab3802f8e50f3dda28168ce6d'
-         'b5b4953c0a5a01cd16441402f6321765')
+         '832595501944fbcabcdc1207f4724fe7'
+         '680750f73dc2e587ac567d057d485813')
 
 build() {
   # Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -46,4 +46,6 @@ package() {
   # Install the installation and update script
   # This script is maintained at git://gist.github.com/772138.git
   install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update
+  # move extlinux binary to /usr/sbin
+  mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux
 }
diff --git a/core/syslinux/syslinux-install_update b/core/syslinux/syslinux-install_update
index f7cd123e1..cd1baa572 100644
--- a/core/syslinux/syslinux-install_update
+++ b/core/syslinux/syslinux-install_update
@@ -28,7 +28,7 @@ shopt -s nullglob
 
 libpath="/usr/lib/syslinux"
 bootpath="/boot/syslinux"
-extlinux="/sbin/extlinux"
+extlinux="/usr/sbin/extlinux"
 
 autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
 com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
@@ -357,12 +357,6 @@ update() {
     fi
 }
 
-# Make sure only root can run our script
-if (( $(id -u) != 0 )); then
-    echo "This script must be run as root" 1>&2
-    exit 1
-fi
-
 if (( $# == 0 )); then
     usage
     exit 1
@@ -378,8 +372,7 @@ while getopts "c:uihmas" opt; do
             fi
             ;;
         h)
-            usage
-            exit 0
+            USAGE="True"
             ;;
         i)
             INSTALL="True"
@@ -408,6 +401,17 @@ while getopts "c:uihmas" opt; do
     esac
 done
 
+if [[ $USAGE ]]; then
+    usage
+    exit 0
+fi
+
+# Make sure only root can run our script
+if (( $(id -u) != 0 )); then
+    echo "This script must be run as root" 1>&2
+    exit 1
+fi
+
 # Display Usage Information if both Install and Update are passed
 if [[ $INSTALL && $UPDATE ]]; then
     usage
diff --git a/core/syslinux/syslinux.cfg b/core/syslinux/syslinux.cfg
index 02127d21d..5a588f58c 100644
--- a/core/syslinux/syslinux.cfg
+++ b/core/syslinux/syslinux.cfg
@@ -20,7 +20,7 @@
 # The wiki provides further configuration examples
 
 DEFAULT arch
-PROMPT 0        # Change to 1 if you do not want to use a menu
+PROMPT 0        # Set to 1 if you always want to display the boot: prompt 
 TIMEOUT 50
 # You can create syslinux keymaps with the keytab-lilo tool
 #KBDMAP de.ktl