Fix missing rw/ro mount parameter on ct'server update

[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 48afaa9bdcfe5894b2514e02b8778a90371d9053..87cc51923687537259e1513e39fb3c5f7fd60bb6 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
@@ -54,7 +57,8 @@ rm -rf /boot/System.map-*
 rm -rf /boot/config-*
 rm -rf /boot/ipfirerd-*
 rm -rf /boot/vmlinuz-*
-rm -rf /lib/modules/
+# Don't remove old xen modules. Kernel may stored outside.
+rm -rf /lib/modules/*-ipfire
 #
 # Backup grub.conf
 #
@@ -115,7 +119,7 @@ grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck
 #
 # Rebuild Language
 #
-#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 #
 # Add some entries to openvpn config
 #
@@ -125,13 +129,13 @@ if [ ! -x "/var/ipfire/ovpn/server.conf" ]; then
 fi
 
 if [ ! -x "/var/ipfire/ovpn/server.conf" ]; then
-       grep -q "ipp-persist" /var/ipfire/ovpn/server.conf \
-       || echo "ipp-persist /var/ipfire/ovpn/ovpn-leases.db" >> /var/ipfire/ovpn/server.conf
+       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
 
 if [ ! -x "/var/ipfire/ovpn/ovpn-leases.db" ]; then
        touch /var/ipfire/ovpn/ovpn-leases.db
-       chmod 700 /var/ipfire/ovpn/ovpn-leases.db
+       chmod 600 /var/ipfire/ovpn/ovpn-leases.db
        chown nobody:nobody /var/ipfire/ovpn/ovpn-leases.db
 fi
 #