Merge remote-tracking branch 'origin/master' into next

[people/pmueller/ipfire-2.x.git] / config / rootfiles / oldcore / 98 / update.sh

diff --git a/config/rootfiles/oldcore/98/update.sh b/config/rootfiles/oldcore/98/update.sh
index ec9c1aaa691fe8c6c8f92064c0754b590fc20f59..7e0cc2dc26bfd3be3874a0054355f7bce824c850 100644 (file)
--- a/config/rootfiles/oldcore/98/update.sh
+++ b/config/rootfiles/oldcore/98/update.sh
@@ -39,7 +39,10 @@ extract_files
 # Bugfixes for core96 updater bugs...
 if [ -e /boot/grub/grub.conf ]; then
        # legacy grub config on xen or citrix conflicts with grub2 config
-       rm /boot/grub/grub.cfg
+       # and core96 contains an empty file
+       if [ ! -s /boot/grub/grub.cfg ]; then
+               rm /boot/grub/grub.cfg
+       fi
 fi
 
 if [ -e /boot/grub/grub.cfg ]; then