mirror of
https://gitlab.com/shorewall/code.git
synced 2024-11-22 15:43:30 +01:00
Allow coexistence when install.sh is used
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4045 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
0ab93eaba7
commit
9fc13c0506
@ -268,14 +268,13 @@ fi
|
||||
run_install $OWNERSHIP -m 0600 Makefile ${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
|
||||
install_file_with_backup shorewall /sbin/shorewall 0544 /var/lib/shorewall-lite-${VERSION}.bkout
|
||||
|
||||
echo "shorewall control program installed in /sbin/shorewall"
|
||||
else
|
||||
install_file shorewall ${PREFIX}/usr/share/shorewall-lite/shorewall 0544
|
||||
|
||||
echo "shorewall control program installed in /usr/share/shorewall-lite/shorewall"
|
||||
if [ ! -L /sbin/shorewall ]; then
|
||||
ln -sf /usr/share/shorewall-lite/shorewall /sbin/shorewall
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
|
@ -275,12 +275,13 @@ fi
|
||||
#
|
||||
# Install control program
|
||||
#
|
||||
if [ -n "$PREFIX" ]; then
|
||||
install_file shorewall ${PREFIX}/usr/share/shorewall/shorewall 0555
|
||||
echo "shorewall control program installed in ${PREFIX}/usr/share/shorewall/shorewall"
|
||||
else
|
||||
install_file_with_backup shorewall ${PREFIX}/sbin/shorewall 0555 ${PREFIX}/var/lib/shorewall-${VERSION}.bkout
|
||||
echo "shorewall control program installed in ${PREFIX}/sbin/shorewall"
|
||||
install_file shorewall ${PREFIX}/usr/share/shorewall/shorewall 0555
|
||||
echo "shorewall control program installed in /usr/share/shorewall/shorewall"
|
||||
|
||||
if [ -z "$PREFIX" ]; then
|
||||
if [ ! -L /sbin/shorewall ]; then
|
||||
ln -sf /usr/share/shorewall/shorewall /sbin/shorewall
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user