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

[Tobias Powalowski]

    Date: Wednesday, November 13, 2013 @ 14:24:51
  Author: tpowa
Revision: 199487

upgpkg: syslinux 6.02-5

fix install message, don't recommend symlinking anymore

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

-------------------------+
 PKGBUILD                |    4 ++--
 syslinux-install_update |    2 +-
 syslinux.install        |   42 +++++++++++++++++-------------------------
 3 files changed, 20 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-13 12:47:52 UTC (rev 199486)
+++ PKGBUILD	2013-11-13 13:24:51 UTC (rev 199487)
@@ -4,7 +4,7 @@
 
 pkgname="syslinux"
 pkgver="6.02"
-pkgrel="4"
+pkgrel="5"
 arch=('x86_64' 'i686')
 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/"
@@ -27,7 +27,7 @@
         'syslinux-6.02-fix-chainloading.patch')
 md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
          '46ca150f53322ff8f1597d9a342f7e40'
-         '8e2bf1235b00e8cdba92b3cfa6b99482'
+         '9376f18fa3e42fc36cffa4cff0a84c09'
          '9dbede6b71a4de9e46aac4aad65334d7')
 
 _build_syslinux_bios() {

Modified: syslinux-install_update
===================================================================
--- syslinux-install_update	2013-11-13 12:47:52 UTC (rev 199486)
+++ syslinux-install_update	2013-11-13 13:24:51 UTC (rev 199487)
@@ -333,7 +333,7 @@
     install_modules
 
     if device_is_raid "$bootpart" ; then
-        echo "Detected RAID on /boot - installing Syslinux with --raid"
+        echo "Detected RAID on /boot - updating Syslinux with --raid"
         "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null
     else
         "$EXTLINUX" --update "$bios_bootpath" &> /dev/null

Modified: syslinux.install
===================================================================
--- syslinux.install	2013-11-13 12:47:52 UTC (rev 199486)
+++ syslinux.install	2013-11-13 13:24:51 UTC (rev 199487)
@@ -1,36 +1,28 @@
 post_install() {
-  echo "==> If you want to use syslinux as your BIOS bootloader"
-  echo "==> edit /boot/syslinux/syslinux.cfg and run"
-  echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
-  echo "==> to install it."
-  
   cat << EOF
-Syslinux efi64 and efi32 files have been installed at
-/usr/lib/syslinux/{efi64,efi32}/ respectively.
 
-To install, copy /usr/lib/syslinux/efi64 to (ESP)/EFI/syslinux and
-syslinux.cfg to (ESP)/EFI/syslinux/syslinux.cfg and add a boot entry
-using efibootmgr for (ESP)/EFI/syslinux/syslinux.efi
+==> For setting up Syslinux BIOS using the install script follow 
+    https://wiki.archlinux.org/index.php/Syslinux#Automatic_Install
+
+==> If you are upgrading from Syslinux 4.xx or 5.xx, please re-install
+    (not update) Syslinux BIOS manually (not using the install script) once
+    by following https://wiki.archlinux.org/index.php/Syslinux#Manual_install
+
+==> The install script may not properly upgrade Syslinux to 6.xx version
+  
+==> For setting up Syslinux EFI follow
+    https://wiki.archlinux.org/index.php/Syslinux#UEFI_Systems
+
+==> The install script does not currently support Syslinux EFI installation
+
 EOF
-
 }
 
 post_upgrade() {
-  # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
+  ## auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
   /usr/bin/syslinux-install_update -s
-  # update to 5.01 message
-  if [ "$(vercmp $2 5.01)" -lt 0 ]; then
-      echo "If you used syslinux-install_update to install syslinux:"
-      echo "==> If you want to use syslinux with menu and all modules please rerun" 
-      echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
-      echo ""
-      echo "If you manually installed syslinux:"
-      echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
-      echo "==> If (/ and /boot on separate fs):"
-      echo "==>   # cp /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
-      echo "==> If (/ and /boot on same fs):"
-      echo "==>   # ln -s /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
-  fi
+  
+  post_install
 }
 
 # vim:set ts=2 sw=2 et: