holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Shorewall-init tweaks

Browse Source 
1) Remove root check
2) Fix/add progress messages in the installer.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-03-01 07:21:17 -08:00
parent 67a1438a41
commit 36d4fff7b2
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Shorewall-init/install.sh
View File

@ -252,7 +252,7 @@ if [ -n "$INITFILE" ]; then
;;
esac
echo "$Product script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
echo "Shorewall-init script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
fi
#
# Install the .service file
@ -265,6 +265,7 @@ if [ -n "$SYSTEMD" ]; then
chmod 755 ${DESTDIR}/sbin
fi
run_install $OWNERSHIP -m 700 shorewall-init ${DESTDIR}/sbin/shorewall-init
echo "CLI installed as ${DESTDIR}/sbin/shorewall-init"
fi
#

6
Shorewall-init/shorewall-init
View File

@ -23,12 +23,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
#########################################################################################
if [ "$(id -u)" != "0" ]
then
echo "You must be root to start, stop or restart \"Shorewall \"."
exit 1
fi
# check if shorewall-init is configured or not
if [ -f "/etc/sysconfig/shorewall-init" ]; then
. /etc/sysconfig/shorewall-init