Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / tmpfs

diff --git a/src/initscripts/init.d/tmpfs b/src/initscripts/init.d/tmpfs
index d274176286b4717a42f972a63ad4d6e753765fe7..2ee2ffb72f783bbe223127b80a7dc548b24534ba 100644 (file)
--- a/src/initscripts/init.d/tmpfs
+++ b/src/initscripts/init.d/tmpfs
@@ -15,7 +15,48 @@ case "$1" in
                $0 restore
                if [ ! -e $RRDLOG.bak/vnstat ]; then
                        mkdir -p $RRDLOG.bak/vnstat
+               fi
+               if [ ! -e $RRDLOG/vnstat ]; then
+                       mkdir -p $RRDLOG/vnstat
+               fi
+               #
+               # create some folders
+               #
+               if [ ! -e /var/lock/subsys ]; then
+                       mkdir -p /var/lock/subsys
                fi
+               if [ ! -e /var/lock/time ]; then
+                       mkdir -p /var/lock/time
+                       chown nobody.root /var/lock/time
+               fi
+               if [ ! -e /var/run/clamav ]; then
+                       mkdir -p /var/run/clamav
+                       chown clamav:clamav /var/run/clamav
+               fi
+               if [ ! -e /var/run/cups ]; then
+                       mkdir -p /var/run/cups
+               fi
+               if [ ! -e /var/run/dbus ]; then
+                       mkdir -p /var/run/dbus
+               fi
+               if [ ! -e /var/run/mysql ]; then
+                       mkdir -p /var/run/mysql
+                       chown mysql:mysql /var/run/mysql
+               fi
+               if [ ! -e /var/run/saslauthd ]; then
+                       mkdir -p /var/run/saslauthd
+               fi
+
+               #
+               # Move /var/spool/cron to ramdisk and make a symlink
+               #
+               if [ ! -L /var/spool/cron ]; then
+                       cp -pR /var/spool/cron /var/log/rrd.bak/cron
+                       mv /var/spool/cron /var/log/rrd/cron
+                       ln -s /var/log/rrd/cron /var/spool/cron
+               fi
+
+               echo_ok
                ;;
        stop)
                $0 backup
@@ -27,6 +68,15 @@ case "$1" in
                evaluate_retval
                ;;
        restore)
+               if ! mountpoint $RRDLOG &>/dev/null; then
+                       mount -t tmpfs -o size=64M none "$RRDLOG"
+               fi
+
+               if [ -e $RRDLOG.bak/cron/new.root ]; then
+                       if [ -e $RRDLOG.bak/cron/root ]; then
+                               rm -f $RRDLOG.bak/cron/new.root
+                       fi
+               fi
                if [ -e $RRDLOG.bak ];then
                        boot_mesg "Restore ramdisk..."
                        cp -pR $RRDLOG.bak/* $RRDLOG/