mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-22 22:30:58 +01:00
Don't install SysV init script if systemd is specified.
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
c252005e25
commit
37a3dbb6f6
@ -216,9 +216,11 @@ fi
|
||||
if [ -z "$DESTDIR" ]; then
|
||||
if [ -f /lib/systemd/system ]; then
|
||||
SYSTEMD=Yes
|
||||
INITFILE=
|
||||
fi
|
||||
elif [ -n "$SYSTEMD" ]; then
|
||||
mkdir -p ${DESTDIR}/lib/systemd/system
|
||||
INITFILE=
|
||||
fi
|
||||
|
||||
#
|
||||
@ -237,6 +239,7 @@ else
|
||||
first_install="Yes"
|
||||
fi
|
||||
|
||||
if [ -n "$INITFILE" ]; then
|
||||
#
|
||||
# Install the Init Script
|
||||
#
|
||||
@ -253,6 +256,7 @@ case $TARGET in
|
||||
esac
|
||||
|
||||
echo "$Product script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
|
||||
fi
|
||||
#
|
||||
# Install the .service file
|
||||
#
|
||||
|
@ -240,6 +240,7 @@ if [ -n "$DESTDIR" ]; then
|
||||
|
||||
if [ -n "$SYSTEMD" ]; then
|
||||
mkdir -p ${DESTDIR}/lib/systemd/system
|
||||
INITFILE=
|
||||
fi
|
||||
else
|
||||
if [ ! -f /usr/share/shorewall/coreversion ]; then
|
||||
@ -249,6 +250,7 @@ else
|
||||
|
||||
if [ -f /lib/systemd/system ]; then
|
||||
SYSTEMD=Yes
|
||||
INITFILE=
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -305,6 +307,7 @@ if [ -n "$DESTDIR" ]; then
|
||||
chmod 755 ${DESTDIR}${INITDIR}
|
||||
fi
|
||||
|
||||
if [ -n "$INITFILE" ]; then
|
||||
case $TARGET in
|
||||
debian)
|
||||
install_file init.debian.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
|
||||
@ -320,8 +323,8 @@ case $TARGET in
|
||||
;;
|
||||
esac
|
||||
|
||||
echo "$Product script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
|
||||
|
||||
echo "$Product init script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
|
||||
fi
|
||||
#
|
||||
# Install the .service file
|
||||
#
|
||||
|
@ -310,10 +310,12 @@ fi
|
||||
if [ -z "$DESTDIR" ]; then
|
||||
if [ -f /lib/systemd/system ]; then
|
||||
SYSTEMD=Yes
|
||||
INITFILE=
|
||||
fi
|
||||
elif [ -n "$SYSTEMD" ]; then
|
||||
mkdir -p ${DESTDIR}/lib/systemd/system
|
||||
fi
|
||||
INITFILE=
|
||||
fI
|
||||
|
||||
echo "Installing $Product Version $VERSION"
|
||||
|
||||
@ -342,6 +344,7 @@ fi
|
||||
#
|
||||
# Install the Firewall Script
|
||||
#
|
||||
if [ -n "$INITFILE" ]; then
|
||||
case $HOST in
|
||||
debian)
|
||||
install_file init.debian.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
|
||||
@ -356,13 +359,12 @@ case $HOST in
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if [ -n "$INITFILE" ]; then
|
||||
install_file init.sh ${DESTDIR}${INITDIR}/$INITFILE 0544
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
[ -n "$INITFILE" ] && echo "$Product script installed in ${DESTDIR}${INITDIR}/$INITFILE"
|
||||
echo "$Product script installed in ${DESTDIR}${INITDIR}/$INITFILE"
|
||||
fi
|
||||
|
||||
#
|
||||
# Create /etc/$PRODUCT and /var/lib/$PRODUCT if needed
|
||||
|
Loading…
Reference in New Issue
Block a user