Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / config / rootfiles / core / 31 / update.sh

diff --git a/config/rootfiles/core/31/update.sh b/config/rootfiles/core/31/update.sh
index 1780a1325cdd2c06f43976df251588913416f595..8267b615f763b1fa87c7f57945faf9e7c6ddafa1 100644 (file)
--- a/config/rootfiles/core/31/update.sh
+++ b/config/rootfiles/core/31/update.sh
@@ -30,6 +30,9 @@ MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $MOUNT > /dev/null
 MOUNT=$_
+if [ ! $MOUNT == "rw" ]; then
+       MOUNT="ro"
+fi
 #
 # check if we the backup file already exist
 if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
@@ -120,17 +123,19 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
 # Add some entries to openvpn config
 #
-if [ ! -x "/var/ipfire/ovpn/server.conf" ]; then
+if [ -e "/var/ipfire/ovpn/server.conf" ]; then
        grep -q "script-security" /var/ipfire/ovpn/server.conf \
        || echo "script-security 3 system" >> /var/ipfire/ovpn/server.conf
 fi
 
-if [ ! -x "/var/ipfire/ovpn/server.conf" ]; then
+if [ -e "/var/ipfire/ovpn/server.conf" ]; then
        grep -q "ifconfig-pool-persist" /var/ipfire/ovpn/server.conf \
        || echo "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600" >> /var/ipfire/ovpn/server.conf
 fi
+       chmod 644 /var/ipfire/ovpn/server.conf
+       chown nobody:nobody /var/ipfire/ovpn/server.conf
 
-if [ ! -x "/var/ipfire/ovpn/ovpn-leases.db" ]; then
+if [ ! -e "/var/ipfire/ovpn/ovpn-leases.db" ]; then
        touch /var/ipfire/ovpn/ovpn-leases.db
        chmod 600 /var/ipfire/ovpn/ovpn-leases.db
        chown nobody:nobody /var/ipfire/ovpn/ovpn-leases.db