Merge branch 'testing'

1 files changed, 16 insertions, 27 deletions

diff --git a/abs/extra/syslinux/syslinux.install b/abs/extra/syslinux/syslinux.install
index 4bb7f85..cbc4e9e 100644
--- a/abs/extra/syslinux/syslinux.install
+++ b/abs/extra/syslinux/syslinux.install
@@ -1,43 +1,32 @@
-post_install() {
-  
+show_efi_msg() {
   cat << EOF
 
-==> For setting up Syslinux BIOS using the syslinux-install_update script follow 
-    https://wiki.archlinux.org/index.php/Syslinux#Automatic_Install
-EOF
-  
-  ## Message specific to Syslinux 4.xx (or 5.xx) to 6.xx upgrade
-  if [ "$(vercmp $2 6.00)" -lt 0 ]; then
-    
-    cat << EOF
+==> For setting up Syslinux EFI follow
+    https://wiki.archlinux.org/index.php/Syslinux#UEFI_Systems
 
-==> 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 syslinux-install_update script does not currently support EFI install
 
-==> The install script may not properly upgrade Syslinux to 6.xx version
 EOF
-    
-  fi
-  
+}
+
+show_bios_autoupdate_msg() {
   cat << EOF
 
-==> For setting up Syslinux EFI follow
-    https://wiki.archlinux.org/index.php/Syslinux#UEFI_Systems
+==> For setting up Syslinux BIOS using the syslinux-install_update script follow
+    https://wiki.archlinux.org/index.php/Syslinux#Automatic_Install
+EOF
+}
 
-==> The syslinux-install_update script does not currently support EFI install
+post_install() {
+  [ -f /boot/syslinux/SYSLINUX_AUTOUPDATE ] || show_bios_autoupdate_msg
+  [ -d /sys/firmware/efi ] && show_efi_msg
 
-EOF
-  
+  true
 }
 
 post_upgrade() {
-  
   ## auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
   /usr/bin/syslinux-install_update -s
-  
+
   post_install
-  
 }
-
-# vim:set ts=2 sw=2 et: