Revision: 7625
http://sourceforge.net/p/ipcop/svn/7625
Author: owes
Date: 2014-07-16 04:09:15 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
Rename installflash.sh to stop people from (ab)using it
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/ipcop-progs
ipcop/trunk/lfs/ipcop-progs
ipcop/trunk/updates/2.1.6/setup
Added Paths:
-----------
ipcop/trunk/src/scripts/flashfinal.sh
Removed Paths:
-------------
ipcop/trunk/src/scripts/installflash.sh
Modified: ipcop/trunk/config/rootfiles/common/ipcop-progs
===================================================================
--- ipcop/trunk/config/rootfiles/common/ipcop-progs 2014-07-14 12:45:35 UTC
(rev 7624)
+++ ipcop/trunk/config/rootfiles/common/ipcop-progs 2014-07-16 04:09:15 UTC
(rev 7625)
@@ -96,6 +96,6 @@
usr/local/bin/updatemenu.pl
usr/local/bin/upgrade.sh
usr/local/bin/vpn-watch
-usr/local/sbin/installflash.sh
+usr/local/sbin/flashfinal.sh
usr/local/sbin/updatekernel.pl
usr/sbin/usb_modeswitch.sh
Modified: ipcop/trunk/lfs/ipcop-progs
===================================================================
--- ipcop/trunk/lfs/ipcop-progs 2014-07-14 12:45:35 UTC (rev 7624)
+++ ipcop/trunk/lfs/ipcop-progs 2014-07-16 04:09:15 UTC (rev 7625)
@@ -70,7 +70,7 @@
chmod 755 /usr/local/bin/`basename $$i`; \
done
# Move flash install script
- mv -f /usr/local/bin/installflash.sh /usr/local/sbin/installflash.sh
+ mv -f /usr/local/bin/flashfinal.sh /usr/local/sbin/flashfinal.sh
# Move updatekernel script
mv -f /usr/local/bin/updatekernel.pl /usr/local/sbin/updatekernel.pl
# Move mkinitramfs script
Copied: ipcop/trunk/src/scripts/flashfinal.sh (from rev 7624,
ipcop/trunk/src/scripts/installflash.sh)
===================================================================
--- ipcop/trunk/src/scripts/flashfinal.sh (rev 0)
+++ ipcop/trunk/src/scripts/flashfinal.sh 2014-07-16 04:09:15 UTC (rev
7625)
@@ -0,0 +1,73 @@
+#!/bin/bash
+#
+# This file is part of the IPCop Firewall.
+#
+# IPCop is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# IPCop is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# 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
+#
+# $Id$
+#
+
+
+if [ -f /etc/FLASH ]; then
+ echo "This is already a FLASH'd IPCop."
+ exit 1
+fi
+
+
+############################################################################
+# #
+# Touching /etc/FLASH #
+# #
+############################################################################
+/usr/bin/touch /etc/FLASH
+
+
+############################################################################
+# #
+# Reconfiguring logrotate #
+# #
+############################################################################
+/bin/ln -sf /etc/logrotate.conf.FLASH /etc/logrotate.conf
+
+
+############################################################################
+# #
+# Rescue log, rrd, ulogd, /var/log will be in RAM disk #
+# Normally this is not necessary since rc.flash.down will do this, but do #
+# this just in case of installation and/or abnormal shutdown #
+# #
+############################################################################
+tar -czf /var/log_compressed/log.tgz --exclude=/var/log/cache/* /var/log/*
+
+
+############################################################################
+# #
+# Rescue fcrontab, /var/spool will be in RAM disk #
+# Normally this is not necessary since rc.flash.down will do this, but do #
+# this just in case of installation and/or abnormal shutdown #
+# #
+############################################################################
+tar -czf /var/log_compressed/spool.tgz -C /var/spool cron
+
+
+############################################################################
+# #
+# Configure apache to follow symlinks in /home/httpd/html #
+# #
+############################################################################
+if [ -z "`/bin/grep \"Options ExecCGI FollowSymlinks\"
/etc/httpd/conf/httpd.conf`" ]; then
+ sed -i -e s/"^\s*Options ExecCGI.*"/" Options ExecCGI FollowSymlinks"/1
/etc/httpd/conf/httpd.conf
+fi
+
Deleted: ipcop/trunk/src/scripts/installflash.sh
===================================================================
--- ipcop/trunk/src/scripts/installflash.sh 2014-07-14 12:45:35 UTC (rev
7624)
+++ ipcop/trunk/src/scripts/installflash.sh 2014-07-16 04:09:15 UTC (rev
7625)
@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-# This file is part of the IPCop Firewall.
-#
-# IPCop is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# IPCop is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# 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
-#
-# $Id$
-#
-
-
-if [ -f /etc/FLASH ]; then
- echo "This is already a FLASH'd IPCop."
- exit 1
-fi
-
-
-############################################################################
-# #
-# Touching /etc/FLASH #
-# #
-############################################################################
-/usr/bin/touch /etc/FLASH
-
-
-############################################################################
-# #
-# Reconfiguring logrotate #
-# #
-############################################################################
-/bin/ln -sf /etc/logrotate.conf.FLASH /etc/logrotate.conf
-
-
-############################################################################
-# #
-# Rescue log, rrd, ulogd, /var/log will be in RAM disk #
-# Normally this is not necessary since rc.flash.down will do this, but do #
-# this just in case of installation and/or abnormal shutdown #
-# #
-############################################################################
-tar -czf /var/log_compressed/log.tgz --exclude=/var/log/cache/* /var/log/*
-
-
-############################################################################
-# #
-# Rescue fcrontab, /var/spool will be in RAM disk #
-# Normally this is not necessary since rc.flash.down will do this, but do #
-# this just in case of installation and/or abnormal shutdown #
-# #
-############################################################################
-tar -czf /var/log_compressed/spool.tgz -C /var/spool cron
-
-
-############################################################################
-# #
-# Configure apache to follow symlinks in /home/httpd/html #
-# #
-############################################################################
-if [ -z "`/bin/grep \"Options ExecCGI FollowSymlinks\"
/etc/httpd/conf/httpd.conf`" ]; then
- sed -i -e s/"^\s*Options ExecCGI.*"/" Options ExecCGI FollowSymlinks"/1
/etc/httpd/conf/httpd.conf
-fi
-
Modified: ipcop/trunk/updates/2.1.6/setup
===================================================================
--- ipcop/trunk/updates/2.1.6/setup 2014-07-14 12:45:35 UTC (rev 7624)
+++ ipcop/trunk/updates/2.1.6/setup 2014-07-16 04:09:15 UTC (rev 7625)
@@ -93,6 +93,9 @@
/bin/rm -f /usr/lib/squid/logfile-daemon
/bin/rm -f /usr/lib/squid/ntlm_auth
+# renamed
+/bin/rm -f /usr/local/sbin/installflash.sh
+
# For new shared libs. May not always be required, but makes sure we do not
forget
/sbin/ldconfig
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
