Unify the supported install script os/distro set.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-02-17 15:26:02 -08:00
parent 8a3f1f7111
commit ee7ea4adb9
3 changed files with 21 additions and 7 deletions

View File

@ -148,6 +148,8 @@ if [ -n "INSTALLSYS" ]; then
else else
INSTALLSYS=FEDORA INSTALLSYS=FEDORA
fi fi
elif [ -f /etc/SuSE-release ]; then
INSTALLSYS=SUSE
elif [ -f /etc/slackware-version ] ; then elif [ -f /etc/slackware-version ] ; then
INSTALLSYS=SLACKWARE INSTALLSYS=SLACKWARE
elif [ -f /etc/arch-release ] ; then elif [ -f /etc/arch-release ] ; then

View File

@ -161,7 +161,13 @@ if [ -n "INSTALLSYS" ]; then
if [ -f /etc/debian_version ]; then if [ -f /etc/debian_version ]; then
INSTALLSYS=DEBIAN INSTALLSYS=DEBIAN
elif [ -f /etc/redhat-release ]; then elif [ -f /etc/redhat-release ]; then
if [ -d /etc/sysconfig/network-scripts/ ]; then
INSTALLSYS=REDHAT
else
INSTALLSYS=FEDORA INSTALLSYS=FEDORA
fi
elif [ -f /etc/SuSE-release ]; then
INSTALLSYS=SUSE
elif [ -f /etc/slackware-version ] ; then elif [ -f /etc/slackware-version ] ; then
INSTALLSYS=SLACKWARE INSTALLSYS=SLACKWARE
elif [ -f /etc/arch-release ] ; then elif [ -f /etc/arch-release ] ; then
@ -216,7 +222,7 @@ case "$TARGET" in
echo "Installing Debian-specific configuration..." echo "Installing Debian-specific configuration..."
SPARSE=yes SPARSE=yes
;; ;;
FEDORA) FEDORA|REDHAT)
echo "Installing Redhat/Fedora-specific configuration..." echo "Installing Redhat/Fedora-specific configuration..."
;; ;;
SLACKWARE) SLACKWARE)
@ -230,7 +236,7 @@ case "$TARGET" in
DEST="/etc/rc.d" DEST="/etc/rc.d"
INIT="$PRODUCT" INIT="$PRODUCT"
;; ;;
LINUX) LINUX|SUSE)
;; ;;
*) *)
echo "ERROR: Unknown TARGET \"$TARGET\"" >&2 echo "ERROR: Unknown TARGET \"$TARGET\"" >&2
@ -303,7 +309,7 @@ case $TARGET 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) FEDORA|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)

View File

@ -153,9 +153,15 @@ if [ -n "INSTALLSYS" ]; then
if [ -f /etc/debian_version ]; then if [ -f /etc/debian_version ]; then
INSTALLSYS=DEBIAN INSTALLSYS=DEBIAN
elif [ -f /etc/redhat-release ]; then elif [ -f /etc/redhat-release ]; then
if [ -d /etc/sysconfig/network-scripts/ ]; then
INSTALLSYS=REDHAT
else
INSTALLSYS=FEDORA INSTALLSYS=FEDORA
fi
elif [ -f /etc/slackware-version ] ; then elif [ -f /etc/slackware-version ] ; then
INSTALLSYS=SLACKWARE INSTALLSYS=SLACKWARE
elif [ -f /etc/SuSE-release ]; then
INSTALLSYS=SUSE
elif [ -f /etc/arch-release ] ; then elif [ -f /etc/arch-release ] ; then
INSTALLSYS=ARCHLINUX INSTALLSYS=ARCHLINUX
else else
@ -270,7 +276,7 @@ case "$TARGET" in
echo "Installing Debian-specific configuration..." echo "Installing Debian-specific configuration..."
SPARSE=yes SPARSE=yes
;; ;;
FEDORA) FEDORA|REDHAT)
echo "Installing Redhat/Fedora-specific configuration..." echo "Installing Redhat/Fedora-specific configuration..."
;; ;;
SLACKWARE) SLACKWARE)
@ -346,7 +352,7 @@ case $TARGET 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) FEDORA|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)