Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

This commit is contained in:
Christian Schmidt
2010-12-15 18:46:24 +01:00
13 changed files with 15177 additions and 666 deletions

View File

@@ -7,7 +7,9 @@ etc/rc.d/init.d/networking/dhcpcd.exe
etc/rc.d/init.d/networking/red
etc/rc.d/init.d/networking/red.up/99-fireinfo
srv/web/ipfire/cgi-bin/extrahd.cgi
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ipinfo.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
srv/web/ipfire/cgi-bin/proxy.cgi
srv/web/ipfire/cgi-bin/speed.cgi

View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
KVER="2.6.32.26"
KVER="2.6.32.27"
MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
# Nur den letzten Parameter verwenden
echo $MOUNT > /dev/null
@@ -101,6 +101,12 @@ echo Unpack the updated files ...
tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
--no-overwrite-dir
# Re-read crontab
fcrontab -z
# Remove old pakfire cronjob.
rm -f /etc/fcron.daily/pakfire-update
# Convert /etc/fstab entries to UUID ...
#
echo Convert fstab entries to UUID ...