Jacques Gelinas wrote:
> Ok I found the problem. The forwarders stuff was broken. I have fixed this
> and it will be in 1.13r8, hopefully tomorrow.
Could you please include the following Debian patch into this release?
I have built Debian packages and needed the following changes. If you
wish, I can send you these packages so you can put them on the official
ftp site.
--
Stefan Gybas
[EMAIL PROTECTED]
--- linuxconf-1.13r7.orig/conf.files/debian/perm/base
+++ linuxconf-1.13r7/conf.files/debian/perm/base
@@ -1,20 +1,19 @@
-/ root root d 755 required
-/tmp root root d 1777 required
-/home root root d 755
-/usr root root d 755
-/bin root root d 755
-/sbin root root d 755
-/var root root d 755 required
-/var/run root root d 755 required
-/etc root root d 755 required
+/ root root d 755 required
+/tmp root root d 1777 required
+/home root staff d 2775
+/usr root root d 755
+/bin root root d 755
+/sbin root root d 755
+/var root root d 755 required
+/var/run root root d 755 required
+/etc root root d 755 required
/etc/passwd root root f 644
-/etc/shadow root root f 400
+/etc/shadow root shadow f 640
/dev/null root root c,1,3 666 required
/dev/zero root root c,1,5 666 required
-/dev/lp0 root lp c,6,0 660 required
-/dev/lp1 root lp c,6,1 660 required
-/dev/lp2 root lp c,6,2 660 required
-/etc/linuxconf root root d 755
-/etc/linuxconf/archive root root d 700
-/etc/fax root root d 755
-
+/dev/lp0 root lp c,6,0 660 required
+/dev/lp1 root lp c,6,1 660 required
+/dev/lp2 root lp c,6,2 660 required
+/etc/linuxconf root root d 755
+/etc/linuxconf/archive root root d 700
+/etc/fax root root d 755
--- linuxconf-1.13r7.orig/conf.files/debian/perm/mail
+++ linuxconf-1.13r7/conf.files/debian/perm/mail
@@ -1,5 +1,5 @@
-/var/spool/mqueue root daemon d 755 required
-/var/spool/mail root mail d 1777 required
-/usr/sbin/sendmail root daemon f 6555
-/etc/mail root mail d 755
-
+/var/spool/mqueue root daemon d 700
+/var/spool/mail root mail d 2775 required
+/usr/sbin/smail root root f 4755
+/usr/sbin/sendmail root daemon f 4755
+/etc/mail root mail d 755
--- linuxconf-1.13r7.orig/conf.files/debian/perm/uucp
+++ linuxconf-1.13r7/conf.files/debian/perm/uucp
@@ -1,4 +1,3 @@
-/var/spool/uucp uucp uucp d 775
-/usr/sbin/uucico uucp uucp f 6555
-/var/log/uucp uucp uucp d 755 required
-
+/var/spool/uucp uucp uucp d 775
+/usr/sbin/uucico uucp uucp f 6555
+/var/log/uucp.log root adm f 640
--- linuxconf-1.13r7.orig/conf.files/install/doinst.sh
+++ linuxconf-1.13r7/conf.files/install/doinst.sh
@@ -39,14 +39,13 @@
GRABINFO=/usr/lib/linuxconf/suse/scripts/grabinfo.sh
USE_SED_ON_RCS=Y
checkalready
-elif [ -f /etc/init.d/boot ] ; then
+elif [ -f /etc/debian_version ] ; then
echo
echo Debian based system detected
echo This installation script has been tested on
- echo " " Debian 1.1
- echo " " Debian support in linuxconf is preliminary
+ echo " " Debian 2.1
echo
- rcs=/etc/init.d/boot
+ rcs=/etc/init.d/rcS
rcsysv=/etc/init.d/rc
DVER=debian
UPDCONF=conf.linuxconf-debian
--- linuxconf-1.13r7.orig/conf.files/install/uninstall_linuxconf.sh
+++ linuxconf-1.13r7/conf.files/install/uninstall_linuxconf.sh
@@ -57,7 +57,7 @@
echo
echo Debian based system detected
echo
- rcs=/etc/init.d/boot
+ rcs=/etc/init.d/rcS
rcm=/etc/init.d/rc
DVER=debian
elif [ -f /etc/rc.d/rc.sysinit ] ; then
--- linuxconf-1.13r7.orig/conf.files/lib-install/rcsysv-debian
+++ linuxconf-1.13r7/conf.files/lib-install/rcsysv-debian
@@ -1,23 +1,37 @@
#! /bin/bash
#
-# rc This file is responsible for starting/stopping
-# services when the runlevel changes.
+# rc This file is responsible for starting/stopping
+# services when the runlevel changes.
#
-# Optimization feature:
-# A startup script is _not_ run when the service was
-# running in the previous runlevel and it wasn't stopped
-# in the runlevel transition (most Debian services don't
-# have K?? links in rc{1,2,3,4,5} )
+# Optimization feature:
+# A startup script is _not_ run when the service was
+# running in the previous runlevel and it wasn't stopped
+# in the runlevel transition (most Debian services don't
+# have K?? links in rc{1,2,3,4,5} )
#
-# Author: Miquel van Smoorenburg <[EMAIL PROTECTED]>
-# Bruce Perens <[EMAIL PROTECTED]>
+# Author: Miquel van Smoorenburg <[EMAIL PROTECTED]>
+# Bruce Perens <[EMAIL PROTECTED]>
#
-# Version: @(#)rc 1.20 15-Nov-1996 [EMAIL PROTECTED]
+# Version: @(#)rc 2.73 26-Nov-1997 [EMAIL PROTECTED]
#
# Un-comment the following for debugging.
# debug=echo
+#
+# Start script or program.
+#
+startup() {
+ case "$1" in
+ *.sh)
+ $debug sh "$@"
+ ;;
+ *)
+ $debug "$@"
+ ;;
+ esac
+}
+
# Ignore CTRL-C only in this shell, so we can interrupt subprocesses.
trap ":" INT QUIT TSTP
@@ -37,46 +51,53 @@
# Is there an rc directory for this new runlevel?
if [ -d /etc/rc$runlevel.d ]
then
- if [ "$runlevel" != 0 -a "$runlevel" != 1 -a "$runlevel" != 6 -a -x
/bin/netconf ] ; then
- /bin/netconf --bootrc /etc/rc$runlevel.d
- else
- # First, run the KILL scripts.
- if [ $previous != N ]
- then
- for i in /etc/rc$runlevel.d/K[0-9][0-9]*
- do
- # Check if the script is there.
- [ ! -f $i ] && continue
-
- # Stop the service.
- $debug $i stop
- done
- fi
- # Now run the START scripts for this runlevel.
- for i in /etc/rc$runlevel.d/S*
- do
- [ ! -f $i ] && continue
-
- if [ $previous != N ]
- then
- #
- # Find start script in previous runlevel and
- # stop script in this runlevel.
- #
- suffix=${i#/etc/rc$runlevel.d/S[0-9][0-9]}
- stop=/etc/rc$runlevel.d/K[0-9][0-9]$suffix
- previous_start=/etc/rc$previous.d/S[0-9][0-9]$suffix
- #
- # If there is a start script in the previous level
- # and _no_ stop script in this level, we don't
- # have to re-start the service.
- #
- [ -f $previous_start ] && [ ! -f $stop ] && continue
- fi
- $debug $i start
- done
+# linuxconf extra bit
+if [ "$runlevel" != 0 -a "$runlevel" != 1 -a \
+ "$runlevel" != 6 -a -x /bin/netconf ] ; then
+ /bin/netconf --bootrc /etc/rc$runlevel.d
+else
+ # First, run the KILL scripts.
+ if [ $previous != N ]
+ then
+ for i in /etc/rc$runlevel.d/K[0-9][0-9]*
+ do
+ # Check if the script is there.
+ [ ! -f $i ] && continue
+
+ # Stop the service.
+ startup $i stop
+ done
fi
+ # Now run the START scripts for this runlevel.
+ for i in /etc/rc$runlevel.d/S*
+ do
+ [ ! -f $i ] && continue
+
+ if [ $previous != N ]
+ then
+ #
+ # Find start script in previous runlevel and
+ # stop script in this runlevel.
+ #
+ suffix=${i#/etc/rc$runlevel.d/S[0-9][0-9]}
+ stop=/etc/rc$runlevel.d/K[0-9][0-9]$suffix
+ previous_start=/etc/rc$previous.d/S[0-9][0-9]$suffix
+ #
+ # If there is a start script in the previous level
+ # and _no_ stop script in this level, we don't
+ # have to re-start the service.
+ #
+ [ -f $previous_start ] && [ ! -f $stop ] && continue
+ fi
+ case "$runlevel" in
+ 0|6)
+ startup $i stop
+ ;;
+ *)
+ startup $i start
+ ;;
+ esac
+ done
+fi # linuxconf extra bit
fi
-/usr/sbin/anacron
-# eof /etc/init.d/rc --------------------------------------------------
-
+# eof /etc/init.d/rc
