webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2016-03-04 07:09:02 +01:00
parent 64835e022c 75ad2e4e88
commit 4a6cfe51a1
16 changed files with 126 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/rootfiles/oldcore/98/update.sh
View File

@@ -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