[arch-commits] Commit in syslinux/trunk (3 files)

[Tobias Powalowski]

    Date: Friday, March 2, 2012 @ 07:51:50
  Author: tpowa
Revision: 151767

upgpkg: syslinux 4.05-2

fix #22972 #25783 #27319 #28737

Modified:
  syslinux/trunk/PKGBUILD
  syslinux/trunk/syslinux-install_update
  syslinux/trunk/syslinux.cfg

-------------------------+
 PKGBUILD                |   10 ++++++----
 syslinux-install_update |   20 ++++++++++++--------
 syslinux.cfg            |    2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-02 11:44:52 UTC (rev 151766)
+++ PKGBUILD	2012-03-02 12:51:50 UTC (rev 151767)
@@ -4,7 +4,7 @@
 
 pkgname=syslinux
 pkgver=4.05
-pkgrel=1
+pkgrel=2
 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 @@
 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 @@
         syslinux-install_update)
 md5sums=('82299242418385da1274c9479a778cb2'
          '1528c376e43f0eaccaa80d8ad1bc13b4'
-         '4dc27d8ab3802f8e50f3dda28168ce6d'
-         'b5b4953c0a5a01cd16441402f6321765')
+         '832595501944fbcabcdc1207f4724fe7'
+         'dd8a6a2104e64d8e4fee4f2d59ae223a')
 
 build() {
   # Do not try to build syslinux with our default LDFLAGS, it will fail
@@ -46,4 +46,6 @@
   # 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
 }

Modified: syslinux-install_update
===================================================================
--- syslinux-install_update	2012-03-02 11:44:52 UTC (rev 151766)
+++ syslinux-install_update	2012-03-02 12:51:50 UTC (rev 151767)
@@ -357,12 +357,6 @@
     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 @@
             fi
             ;;
         h)
-            usage
-            exit 0
+            USAGE="True"
             ;;
         i)
             INSTALL="True"
@@ -408,6 +401,17 @@
     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

Modified: syslinux.cfg
===================================================================
--- syslinux.cfg	2012-03-02 11:44:52 UTC (rev 151766)
+++ syslinux.cfg	2012-03-02 12:51:50 UTC (rev 151767)
@@ -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