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

Allow coexistence when install.sh is used

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4045 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-09 21:20:30 +00:00
parent 0ab93eaba7
commit 9fc13c0506
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Shorewall-lite/install.sh
View File

@ -268,14 +268,13 @@ fi
run_install $OWNERSHIP -m 0600 Makefile ${PREFIX}/etc/shorewall-lite/Makefile run_install $OWNERSHIP -m 0600 Makefile ${PREFIX}/etc/shorewall-lite/Makefile
echo "Makefile installed as ${PREFIX}/etc/shorewall-lite/Makefile" echo "Makefile installed as ${PREFIX}/etc/shorewall-lite/Makefile"
install_file shorewall ${PREFIX}/usr/share/shorewall-lite/shorewall 0555
echo "shorewall control program installed in /usr/share/shorewall-lite/shorewall"
if [ -z "$PREFIX" ]; then if [ -z "$PREFIX" ]; then
install_file_with_backup shorewall /sbin/shorewall 0544 /var/lib/shorewall-lite-${VERSION}.bkout if [ ! -L /sbin/shorewall ]; then
ln -sf /usr/share/shorewall-lite/shorewall /sbin/shorewall
echo "shorewall control program installed in /sbin/shorewall" fi
else
install_file shorewall ${PREFIX}/usr/share/shorewall-lite/shorewall 0544
echo "shorewall control program installed in /usr/share/shorewall-lite/shorewall"
fi fi
# #

13
Shorewall/install.sh
View File

@ -275,12 +275,13 @@ fi
# #
# Install control program # Install control program
# #
if [ -n "$PREFIX" ]; then install_file shorewall ${PREFIX}/usr/share/shorewall/shorewall 0555
install_file shorewall ${PREFIX}/usr/share/shorewall/shorewall 0555 echo "shorewall control program installed in /usr/share/shorewall/shorewall"
echo "shorewall control program installed in ${PREFIX}/usr/share/shorewall/shorewall"
else if [ -z "$PREFIX" ]; then
install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/var/lib/shorewall-${VERSION}.bkout if [ ! -L /sbin/shorewall ]; then
echo "shorewall control program installed in ${PREFIX}/sbin/shorewall" ln -sf /usr/share/shorewall/shorewall /sbin/shorewall
fi
fi fi
# #