extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-19 17:28:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correct FEDORA/REDHAT fiasco

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-02-20 16:11:28 -08:00
parent 3180e13719
commit ed9e03b095
4 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Shorewall-core/install.sh
View File

@ -130,11 +130,7 @@ if [ -z "$BUILD" ]; then
if [ -f /etc/debian_version ]; then if [ -f /etc/debian_version ]; then
BUILD=DEBIAN BUILD=DEBIAN
elif [ -f /etc/redhat-release ]; then elif [ -f /etc/redhat-release ]; then
if [ -d /etc/sysconfig/network-scripts/ ]; then BUILD=REDHAT
BUILD=REDHAT
else
BUILD=FEDORA
fi
elif [ -f /etc/slackware-version ] ; then elif [ -f /etc/slackware-version ] ; then
BUILD=SLACKWARE BUILD=SLACKWARE
elif [ -f /etc/SuSE-release ]; then elif [ -f /etc/SuSE-release ]; then
@ -230,7 +226,7 @@ case "$HOST" in
echo "Installing Debian-specific configuration..." echo "Installing Debian-specific configuration..."
SPARSE=yes SPARSE=yes
;; ;;
FEDORA|REDHAT|SLACKWARE|ARCHLINUX|LINUX) REDHAT|SLACKWARE|ARCHLINUX|LINUX)
;; ;;
*) *)
echo "ERROR: Unknown HOST \"$HOST\"" >&2 echo "ERROR: Unknown HOST \"$HOST\"" >&2
@ -258,7 +254,12 @@ echo "Installing Shorewall Core Version $VERSION"
# Create /usr/share/shorewall # Create /usr/share/shorewall
# #
mkdir -p ${DESTDIR}${LIBEXEC}/shorewall mkdir -p ${DESTDIR}${LIBEXEC}/shorewall
chmod 755 ${DESTDIR}/usr/share/shorewall chmod 755 ${DESTDIR}${LIBEXEC}/shorewall
if [ $LIBEXEC != /usr/shorewall/ ]; then
mkdir -p ${DESTDIR}/usr/share/shorewall
chmod 755 ${DESTDIR}/usr/share/shorewall
fi
# #
# Install wait4ifup # Install wait4ifup
# #

17
Shorewall-init/install.sh
View File

@ -112,7 +112,8 @@ case "$LIBEXEC" in
/*) /*)
;; ;;
*) *)
LIBEXEC=/usr/${LIBEXEC} echo "The LIBEXEC setting must be an absolute path name" >&2
exit 1
;; ;;
esac esac
@ -128,11 +129,7 @@ if [ -z "$BUILD" ]; then
if [ -f /etc/debian_version ]; then if [ -f /etc/debian_version ]; then
BUILD=DEBIAN BUILD=DEBIAN
elif [ -f /etc/redhat-release ]; then elif [ -f /etc/redhat-release ]; then
if [ -d /etc/sysconfig/network-scripts/ ]; then BUILD=REDHAT
BUILD=REDHAT
else
BUILD=FEDORA
fi
elif [ -f /etc/SuSE-release ]; then elif [ -f /etc/SuSE-release ]; then
BUILD=SUSE BUILD=SUSE
elif [ -f /etc/slackware-version ] ; then elif [ -f /etc/slackware-version ] ; then
@ -178,12 +175,8 @@ case "$HOST" in
echo "Installing Debian-specific configuration..." echo "Installing Debian-specific configuration..."
SPARSE=yes SPARSE=yes
;; ;;
FEDORA)
echo "Installing Fedora-specific configuration..."
DEST=/etc/rc.d/init.d
;;
REDHAT) REDHAT)
echo "Installing Redhat-specific configuration..." echo "Installing Redhat/Fedora-specific configuration..."
DEST=/etc/rc.d/init.d DEST=/etc/rc.d/init.d
;; ;;
SLACKWARE) SLACKWARE)
@ -254,7 +247,7 @@ case $HOST in
DEBIAN) DEBIAN)
install_file init.debian.sh ${DESTDIR}/etc/init.d/shorewall-init 0544 install_file init.debian.sh ${DESTDIR}/etc/init.d/shorewall-init 0544
;; ;;
REDHAT|FEDORA) REDHAT)
install_file init.fedora.sh ${DESTDIR}/etc/init.d/shorewall-init 0544 install_file init.fedora.sh ${DESTDIR}/etc/init.d/shorewall-init 0544
;; ;;
*) *)

10
Shorewall-lite/install.sh
View File

@ -151,11 +151,7 @@ if [ -z "$BUILD" ]; then
if [ -f /etc/debian_version ]; then if [ -f /etc/debian_version ]; then
BUILD=DEBIAN BUILD=DEBIAN
elif [ -f /etc/redhat-release ]; then elif [ -f /etc/redhat-release ]; then
if [ -d /etc/sysconfig/network-scripts/ ]; then BUILD=REDHAT
BUILD=REDHAT
else
BUILD=FEDORA
fi
elif [ -f /etc/SuSE-release ]; then elif [ -f /etc/SuSE-release ]; then
BUILD=SUSE BUILD=SUSE
elif [ -f /etc/slackware-version ] ; then elif [ -f /etc/slackware-version ] ; then
@ -212,7 +208,7 @@ case "$HOST" in
echo "Installing Debian-specific configuration..." echo "Installing Debian-specific configuration..."
SPARSE=yes SPARSE=yes
;; ;;
FEDORA|REDHAT) REDHAT)
echo "Installing Redhat/Fedora-specific configuration..." echo "Installing Redhat/Fedora-specific configuration..."
DEST=/etc/rc.d/init.d DEST=/etc/rc.d/init.d
;; ;;
@ -308,7 +304,7 @@ case $HOST in
DEBIAN) DEBIAN)
install_file init.debian.sh ${DESTDIR}/etc/init.d/$PRODUCT 0544 install_file init.debian.sh ${DESTDIR}/etc/init.d/$PRODUCT 0544
;; ;;
FEDORA|REDHAT) REDHAT)
install_file init.fedora.sh ${DESTDIR}/etc/init.d/$PRODUCT 0544 install_file init.fedora.sh ${DESTDIR}/etc/init.d/$PRODUCT 0544
;; ;;
ARCHLINUX) ARCHLINUX)

10
Shorewall/install.sh
View File

@ -145,11 +145,7 @@ if [ -z "$BUILD" ]; then
if [ -f /etc/debian_version ]; then if [ -f /etc/debian_version ]; then
BUILD=DEBIAN BUILD=DEBIAN
elif [ -f /etc/redhat-release ]; then elif [ -f /etc/redhat-release ]; then
if [ -d /etc/sysconfig/network-scripts/ ]; then BUILD=REDHAT
BUILD=REDHAT
else
BUILD=FEDORA
fi
elif [ -f /etc/slackware-version ] ; then elif [ -f /etc/slackware-version ] ; then
BUILD=SLACKWARE BUILD=SLACKWARE
elif [ -f /etc/SuSE-release ]; then elif [ -f /etc/SuSE-release ]; then
@ -268,7 +264,7 @@ case "$HOST" in
echo "Installing Debian-specific configuration..." echo "Installing Debian-specific configuration..."
SPARSE=yes SPARSE=yes
;; ;;
FEDORA|REDHAT) REDHAT)
echo "Installing Redhat/Fedora-specific configuration..." echo "Installing Redhat/Fedora-specific configuration..."
DEST="/etc/rc.d/init.d" DEST="/etc/rc.d/init.d"
;; ;;
@ -353,7 +349,7 @@ case $HOST in
DEBIAN) DEBIAN)
install_file init.debian.sh ${DESTDIR}/etc/init.d/$PRODUCT 0544 install_file init.debian.sh ${DESTDIR}/etc/init.d/$PRODUCT 0544
;; ;;
FEDORA|REDHAT) REDHAT)
install_file init.fedora.sh ${DESTDIR}${DEST}/$PRODUCT 0544 install_file init.fedora.sh ${DESTDIR}${DEST}/$PRODUCT 0544
;; ;;
ARCHLINUX) ARCHLINUX)