diff --git a/ChangeLog b/ChangeLog index 3ad5f577..2af575d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ $Id$ v0.71.7 12-Sep-2005 + script: + The installinit script now recognizes Fedora Core. + v0.71.6 02-Sep-2005 - 12-Sep-2005 diff --git a/script/init.RedHat b/script/init.RedHat index fba3e129..445eafef 100644 --- a/script/init.RedHat +++ b/script/init.RedHat @@ -3,7 +3,7 @@ # chkconfig: 345 95 05 # description: Starts and stops MBSE BBS. # -# For RedHat, E-Smith and Mandrake SYSV init style. +# For RedHat, Fedora Core, E-Smith and Mandrake SYSV init style. # $Id$ # # Source function library. diff --git a/script/installinit.sh b/script/installinit.sh index 88d7ecb0..dada60f4 100644 --- a/script/installinit.sh +++ b/script/installinit.sh @@ -72,7 +72,12 @@ if [ "$OSTYPE" = "Linux" ]; then if [ -f /etc/redhat-release ]; then DISTNAME="RedHat" if [ -z "`grep e-smith /etc/redhat-release`" ]; then - DISTVERS=`cat /etc/redhat-release | awk '{ print $5 }'` + if [ -z "`grep Fedora /etc/redhat-release`" ]; then + DISTVERS=`cat /etc/redhat-release | awk '{ print $5 }'` + else + DISTVERS=`cat /etc/redhat-release | awk '{ print $4 }'` + DISTNAME="Fedora Core" + fi else DISTVERS=`cat /etc/redhat-release | awk '{ print $13 }' | tr -d \)` fi @@ -195,11 +200,11 @@ fi #-------------------------------------------------------------------------- # -# Adding scripts for RedHat, e-smith and Mandrake +# Adding scripts for RedHat, Fedora Core, e-smith and Mandrake # -if [ "$DISTNAME" = "RedHat" ] || [ "$DISTNAME" = "Mandrake" ]; then +if [ "$DISTNAME" = "RedHat" ] || [ "$DISTNAME" = "Mandrake" ] || [ "$DISTNAME" = "Fedora Core" ]; then - log "+" "Adding RedHat/E-Smith/Mandrake SystemV init scripts" + log "+" "Adding RedHat/Fedora/E-Smith/Mandrake SystemV init scripts" DISTINIT="/etc/rc.d/init.d/mbsed" # # Extra tests are added for the RedHat e-smith server distribution,