Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Feb 2014 12:38:25 +0000 (13:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Feb 2014 12:38:25 +0000 (13:38 +0100)
config/backup/backup.pl
html/cgi-bin/shutdown.cgi
src/initscripts/init.d/partresize
src/initscripts/init.d/random

index 3172d6d..f4823fc 100644 (file)
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -124,7 +124,6 @@ elsif ($ARGV[0] eq 'restore') {
        rmtree("${General::swroot}/portfw");
   }
   system("/usr/local/bin/firewallctrl");
- }
 
   # Convert old OpenVPN CCD files (CN change, core 75).
   system("/usr/local/bin/convert-ovpn");
index dd6a03c..998f9f8 100644 (file)
@@ -73,7 +73,7 @@ END
 <div align='center'>
 <table width='100%' bgcolor='#ffffff'>
 <tr><td align='center'>
-<br /><br /><img src='/ipfire_big.gif' /><br /><br /><br />
+<br /><br /><img src='/images/IPFire.png' /><br /><br /><br />
 </td></tr>
 </table>
 <br />
index 909d63f..474b79f 100644 (file)
@@ -6,7 +6,7 @@
 #
 # Authors     : Arne Fitzenreiter - arne_f@ipfire.org
 #
-# Version     : 1.03
+# Version     : 1.04
 #
 # Notes       :
 #
@@ -36,6 +36,10 @@ case "${1}" in
                        DRV=${ROOT::`expr length $ROOT`-1}
                fi
 
+               boot_mesg "Update c,h,s values of ${DRV} ..."
+               echo -e ',' | sfdisk --no-reread -f -N1 ${DRV} 2>&1 > /dev/null
+               echo -e ',' | sfdisk --no-reread -f -N3 ${DRV} 2>&1 > /dev/null
+
                boot_mesg "Change Partition ${DRV}3 to all free space ..."
                echo -e ',+' | sfdisk --no-reread -N3 ${DRV} 2>/dev/null
 
@@ -44,7 +48,8 @@ case "${1}" in
 
                boot_mesg "Rebooting ..."
                sync
-               mount -o remount,ro / > /dev/null
+               mount -o remount,ro / 2>&1 > /dev/null
+               sleep 15
                reboot -f
 
                ;;
index 7159b53..57aef99 100644 (file)
@@ -13,19 +13,16 @@ case "$1" in
                boot_mesg "Initializing kernel random number generator..."
                if [ -f /var/tmp/random-seed ]; then
                        /bin/cat /var/tmp/random-seed >/dev/urandom
-               else
-               /bin/dd if=/dev/random of=/dev/urandom \
-                       count=1 &>/dev/null
                fi
                /bin/dd if=/dev/urandom of=/var/tmp/random-seed \
-                       count=1 &>/dev/null
+                       count=4 &>/dev/null
                evaluate_retval
                ;;
 
        stop)
                boot_mesg "Saving random seed..."
                /bin/dd if=/dev/urandom of=/var/tmp/random-seed \
-                       count=1 &>/dev/null
+                       count=4 &>/dev/null
                evaluate_retval
                ;;