Merge remote-tracking branch 'ms/axel-fixperms' into next

[people/teissler/ipfire-2.x.git] / config / rootfiles / core / 66 / update.sh

diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh
index 97fcf8f3bdfd35f8596f61425f9c7a5631f8fa68..d764c4322b46ed081909e1c6a791bfc439bb33b0 100644 (file)
--- a/config/rootfiles/core/66/update.sh
+++ b/config/rootfiles/core/66/update.sh
@@ -111,6 +111,7 @@ add_to_backup usr/share/terminfo
 add_to_backup etc/sysconfig/lm_sensors
 add_to_backup etc/sysconfig/rc.local
 add_to_backup usr/local/bin/vpn-watch
+add_to_backup usr/local/bin/updxsetperms
 add_to_backup usr/libexec/ipsec
 
 # Backup the files
@@ -126,6 +127,9 @@ if [ $ROOTSPACE -lt 70000 ]; then
        exit 2
 fi
 
+# Add user nobody to group squid.
+usermod -a -G squid nobody
+
 echo
 echo Update Kernel to $KVER ...
 #
@@ -184,6 +188,9 @@ rm -rf /lib/libncurses*
 rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack}
 rm -f /usr/local/bin/vpn-watch
 
+# Remove update accelerator permissions script.
+rm -f /usr/local/bin/updxsetperms
+
 #
 #Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
@@ -287,6 +294,7 @@ case $(uname -m) in
                #
                # ReInstall grub
                #
+                       echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map
                        grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
        ;;
 esac
@@ -329,7 +337,7 @@ fi
 if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
        echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
        echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen
-       echo "Release: 23"     >> /opt/pakfire/db/installed/meta-linux-xen
+       echo "Release: 24"     >> /opt/pakfire/db/installed/meta-linux-xen
        # Add xvc0 to /etc/securetty
        echo "xvc0" >> /etc/securetty
 fi