Revision: 6513
http://ipcop.svn.sourceforge.net/ipcop/?rev=6513&view=rev
Author: owes
Date: 2012-03-27 20:28:43 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Add flagfile to remind admin about required reboot.
Modified Paths:
--------------
ipcop/trunk/html/cgi-bin/index.cgi
ipcop/trunk/src/rc.d/rc.sysinit
ipcop/trunk/src/scripts/updatekernel.pl
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
Modified: ipcop/trunk/html/cgi-bin/index.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/index.cgi 2012-03-25 16:19:07 UTC (rev 6512)
+++ ipcop/trunk/html/cgi-bin/index.cgi 2012-03-27 20:28:43 UTC (rev 6513)
@@ -16,7 +16,7 @@
# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
# (c) The SmoothWall Team
-# (c) 2007-2012, the IPCop team
+# (c) 2001-2012, the IPCop team
#
# $Id$
#
@@ -143,6 +143,10 @@
print "<br />\n";
+# Reboot required flagfile
+if (-e '/rebootrequired') {
+ $warnmessage .= "<li><b>$Lang::tr{'reboot required'}</b></li>\n";
+}
# Memory usage warning
my @free = `/usr/bin/free`;
$free[1] =~ m/(\d+)/;
Modified: ipcop/trunk/src/rc.d/rc.sysinit
===================================================================
--- ipcop/trunk/src/rc.d/rc.sysinit 2012-03-25 16:19:07 UTC (rev 6512)
+++ ipcop/trunk/src/rc.d/rc.sysinit 2012-03-27 20:28:43 UTC (rev 6513)
@@ -13,10 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
-# (c) 2001-2011, the IPCop team
+# (c) 2001-2012, the IPCop team
#
# $Id$
#
@@ -157,6 +156,9 @@
# Can only do this if / is mounted rw
rm -f /forcefsck
+# Remove the reboot required flagfile
+rm -f /rebootrequired
+
# Copy the udev rules generated before root was mounted read/write
# Multiple rulefiles can exist, but we only care for 70-persistent-net
if [ -e /dev/.udev/tmp-rules--70-persistent-net.rules ]; then
Modified: ipcop/trunk/src/scripts/updatekernel.pl
===================================================================
--- ipcop/trunk/src/scripts/updatekernel.pl 2012-03-25 16:19:07 UTC (rev
6512)
+++ ipcop/trunk/src/scripts/updatekernel.pl 2012-03-27 20:28:43 UTC (rev
6513)
@@ -13,10 +13,9 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with IPCop. If not, see <http://www.gnu.org/licenses/>.
#
-# (c) 2009-2010, the IPCop team
+# (c) 2009-2012, the IPCop team
#
# $Id$
#
@@ -72,6 +71,8 @@
die "Kernel $newversion not found" unless (-e "/lib/modules/$newversion" );
die "Kernel $keepversion not found" unless (-e "/lib/modules/$keepversion" );
+# Flagfile to indicate reboot required in index.cgi
+system('/usr/bin/touch /rebootrequired');
# Fetch some lines from the current boot configfile, architecture dependant
my %lines = ();
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-03-25 16:19:07 UTC
(rev 6512)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-03-27 20:28:43 UTC
(rev 6513)
@@ -1,4 +1,5 @@
## please place IPCop files first, then packages sorted by alphabetical order
+/etc/rc.d/rc.sysinit
/etc/rc.d/rc.updatered
/home/httpd/cgi-bin/ddns.cgi
/home/httpd/cgi-bin/dhcp.cgi
@@ -27,6 +28,7 @@
/usr/local/bin/puzzleFwRules.pl
/usr/local/bin/restartsquid
/usr/local/bin/scheduler.pl
+/usr/local/bin/updatekernel.pl
/usr/share/locale/af_ZA/LC_MESSAGES/ipcop.mo
/usr/share/locale/bg_BG/LC_MESSAGES/ipcop.mo
/usr/share/locale/ca_ES/LC_MESSAGES/ipcop.mo
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
