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

Don't install SysV init script if systemd is specified.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-02-23 10:59:10 -08:00
parent c252005e25
commit 37a3dbb6f6
3 changed files with 60 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Shorewall-init/install.sh
View File

@ -216,9 +216,11 @@ fi
if [ -z "$DESTDIR" ]; then if [ -z "$DESTDIR" ]; then
if [ -f /lib/systemd/system ]; then if [ -f /lib/systemd/system ]; then
SYSTEMD=Yes SYSTEMD=Yes
INITFILE=
fi fi
elif [ -n "$SYSTEMD" ]; then elif [ -n "$SYSTEMD" ]; then
mkdir -p ${DESTDIR}/lib/systemd/system mkdir -p ${DESTDIR}/lib/systemd/system
INITFILE=
fi fi
# #
@ -237,22 +239,24 @@ else
first_install="Yes" first_install="Yes"
fi fi
# if [ -n "$INITFILE" ]; then
# Install the Init Script #
# # Install the Init Script
case $TARGET in #
debian) case $TARGET in
install_file init.debian.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544 debian)
;; install_file init.debian.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
redhat) ;;
install_file init.fedora.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544 redhat)
;; install_file init.fedora.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
*) ;;
install_file init.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544 *)
;; install_file init.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
esac ;;
esac
echo "$Product script installed in ${DESTDIR}${INITDIR}/${INITFILE}" echo "$Product script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
fi
# #
# Install the .service file # Install the .service file
# #

35
Shorewall-lite/install.sh
View File

@ -240,6 +240,7 @@ if [ -n "$DESTDIR" ]; then
if [ -n "$SYSTEMD" ]; then if [ -n "$SYSTEMD" ]; then
mkdir -p ${DESTDIR}/lib/systemd/system mkdir -p ${DESTDIR}/lib/systemd/system
INITFILE=
fi fi
else else
if [ ! -f /usr/share/shorewall/coreversion ]; then if [ ! -f /usr/share/shorewall/coreversion ]; then
@ -249,6 +250,7 @@ else
if [ -f /lib/systemd/system ]; then if [ -f /lib/systemd/system ]; then
SYSTEMD=Yes SYSTEMD=Yes
INITFILE=
fi fi
fi fi
@ -305,23 +307,24 @@ if [ -n "$DESTDIR" ]; then
chmod 755 ${DESTDIR}${INITDIR} chmod 755 ${DESTDIR}${INITDIR}
fi fi
case $TARGET in if [ -n "$INITFILE" ]; then
debian) case $TARGET in
install_file init.debian.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544 debian)
;; install_file init.debian.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
redhat) ;;
install_file init.fedora.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544 redhat)
;; install_file init.fedora.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
archlinux) ;;
install_file init.archlinux.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544 archlinux)
;; install_file init.archlinux.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
*) ;;
install_file init.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544 *)
;; install_file init.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
esac ;;
esac
echo "$Product script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
echo "$Product init script installed in ${DESTDIR}${INITDIR}/${INITFILE}"
fi
# #
# Install the .service file # Install the .service file
# #

42
Shorewall/install.sh
View File

@ -310,10 +310,12 @@ fi
if [ -z "$DESTDIR" ]; then if [ -z "$DESTDIR" ]; then
if [ -f /lib/systemd/system ]; then if [ -f /lib/systemd/system ]; then
SYSTEMD=Yes SYSTEMD=Yes
INITFILE=
fi fi
elif [ -n "$SYSTEMD" ]; then elif [ -n "$SYSTEMD" ]; then
mkdir -p ${DESTDIR}/lib/systemd/system mkdir -p ${DESTDIR}/lib/systemd/system
fi INITFILE=
fI
echo "Installing $Product Version $VERSION" echo "Installing $Product Version $VERSION"
@ -342,27 +344,27 @@ fi
# #
# Install the Firewall Script # Install the Firewall Script
# #
case $HOST in if [ -n "$INITFILE" ]; then
debian) case $HOST in
install_file init.debian.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544 debian)
;; install_file init.debian.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
redhat) ;;
install_file init.fedora.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544 redhat)
;; install_file init.fedora.sh ${DESTDIR}${INITDIR}/${INITFILE} 0544
slackware) ;;
if [ $PRODUCT = shorewall ]; then slackware)
install_file init.slackware.firewall.sh ${DESTDIR}${DEST}/rc.firewall 0644 if [ $PRODUCT = shorewall ]; then
install_file init.slackware.$PRODUCT.sh ${DESTDIR}${DEST}/rc.$PRODUCT 0644 install_file init.slackware.firewall.sh ${DESTDIR}${DEST}/rc.firewall 0644
fi install_file init.slackware.$PRODUCT.sh ${DESTDIR}${DEST}/rc.$PRODUCT 0644
;; fi
*) ;;
if [ -n "$INITFILE" ]; then *)
install_file init.sh ${DESTDIR}${INITDIR}/$INITFILE 0544 install_file init.sh ${DESTDIR}${INITDIR}/$INITFILE 0544
fi ;;
;; esac
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 # Create /etc/$PRODUCT and /var/lib/$PRODUCT if needed