diff -u sysvinit-2.85/debian/postinst sysvinit-2.85/debian/postinst --- sysvinit-2.85/debian/postinst +++ sysvinit-2.85/debian/postinst @@ -17,28 +17,22 @@ esac umask 022 +INITCTL_PATH=/var/run/initctl + # -# Check /dev/initctl +# Check initctl fifo # -if [ ! -p /dev/initctl ] +if [ ! -p $INITCTL_PATH ] then - echo "sysvinit: creating /dev/initctl" - rm -f /dev/initctl - mknod -m 600 /dev/initctl p + echo "sysvinit: creating $INITCTL_PATH" + rm -f $INITCTL_PATH + mkfifo -m 600 $INITCTL_PATH || true fi rm -f /etc/ioctl.save if [ ! -f /etc/inittab ] then - # Prefer arch-specific inittab. - arch=`dpkg --print-installation-architecture` - expl=/usr/share/sysvinit - if [ -f $expl/inittab.$arch ]; then - inittab=$expl/inittab.$arch - else - inittab=$expl/inittab - fi - cp -a $inittab /etc/inittab + cp -a /usr/share/sysvinit/inittab /etc/inittab fi # diff -u sysvinit-2.85/debian/control sysvinit-2.85/debian/control --- sysvinit-2.85/debian/control +++ sysvinit-2.85/debian/control @@ -30,7 +30,7 @@ Package: initscripts Essential: yes Architecture: all -Depends: dpkg (>= 1.9.0), mount (>= 2.7l-1), util-linux (>= 2.9t-2), e2fsprogs (>= 1.19-1), coreutils (>= 5.0.91-2) +Depends: dpkg (>= 1.9.0), mount (>= 2.7l-1) | not+linux-gnu, util-linux (>= 2.9t-2), e2fsprogs (>= 1.19-1), coreutils (>= 5.0.91-2) Replaces: sysvinit (<< 2.85-1) Conflicts: kbd (<< 0.95-2), mdutils (<< 0.35-9) Description: Standard scripts needed for booting and shutting down diff -u sysvinit-2.85/debian/rules sysvinit-2.85/debian/rules --- sysvinit-2.85/debian/rules +++ sysvinit-2.85/debian/rules @@ -9,6 +9,8 @@ SHELL = /bin/bash LC_ALL = POSIX +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + define checkdir test -f src/init.c endef @@ -37,8 +39,15 @@ install -g root -m 644 debian/README.runlevels \ $(tmp)$(doc)/sysvinit gzip -9f $(tmp)$(doc)/sysvinit/{README.runlevels,changelog*} - install -g root -m 644 -o root debian/share/inittab* \ - $(tmp)/usr/share/sysvinit + if test -e debian/share/inittab.$(DEB_BUILD_GNU_TYPE) ; \ + then install -g root -m 644 -o root \ + debian/share/inittab.$(DEB_BUILD_GNU_TYPE) \ + $(tmp)/usr/share/sysvinit/inittab ; \ + else install -g root -m 644 -o root \ + debian/share/inittab \ + $(tmp)/usr/share/sysvinit/inittab ; \ + fi + install -g root -m 755 -o root debian/share/update-rc.d \ $(tmp)/usr/share/sysvinit install -d -g root -m 755 -o root $(tmp)/bin reverted: --- sysvinit-2.85/debian/share/inittab.s390 +++ sysvinit-2.85.orig/debian/share/inittab.s390 @@ -1,63 +0,0 @@ -# /etc/inittab: init(8) configuration. -# $Id: inittab.s390,v 1.9 2000/01/10 10:15:30 miquels Exp $ - -# The default runlevel. -id:2:initdefault: - -# Boot-time system configuration/initialization script. -# This is run first except when booting in emergency (-b) mode. -si::sysinit:/etc/init.d/rcS - -# What to do in single-user mode. -~~:S:wait:/sbin/sulogin - -# /etc/init.d executes the S and K scripts upon change -# of runlevel. -# -# Runlevel 0 is halt. -# Runlevel 1 is single-user. -# Runlevels 2-5 are multi-user. -# Runlevel 6 is reboot. - -l0:0:wait:/etc/init.d/rc 0 -l1:1:wait:/etc/init.d/rc 1 -l2:2:wait:/etc/init.d/rc 2 -l3:3:wait:/etc/init.d/rc 3 -l4:4:wait:/etc/init.d/rc 4 -l5:5:wait:/etc/init.d/rc 5 -l6:6:wait:/etc/init.d/rc 6 -# Normally not reached, but fallthrough in case of emergency. -z6:6:respawn:/sbin/sulogin - -# What to do when CTRL-ALT-DEL is pressed. -ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now - -# Action on special keypress (ALT-UpArrow). -kb::kbrequest:/bin/echo "Keyboard Request--edit /etc/inittab to let this work." - -# What to do when the power fails/returns. -pf::powerwait:/etc/init.d/powerfail start -pn::powerfailnow:/etc/init.d/powerfail now -po::powerokwait:/etc/init.d/powerfail stop - -# /sbin/getty invocations for the runlevels. -# -# The "id" field MUST be the same as the last -# characters of the device (after "tty"). -# -# Format: -# ::: -# -# The s390 only has a dumb terminal on /dev/console. -# -1:2345:respawn:/sbin/getty 38400 console dumb - -# Example how to put a getty on a serial line (for a terminal) -# -#T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 -#T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 - -# Example how to put a getty on a modem line. -# -#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3 - diff -u sysvinit-2.85/debian/changelog sysvinit-2.85/debian/changelog --- sysvinit-2.85/debian/changelog +++ sysvinit-2.85/debian/changelog @@ -1,3 +1,10 @@ +sysvinit (2.85-9+kbsd) unreleased; urgency=low + + * Update GNU/k*BSD fixes (see changelog.rej). + - Except for init.c setting TERM variable. This belongs in getty. + + -- Robert Millan Wed, 7 Jan 2004 22:38:54 +0100 + sysvinit (2.85-9) unstable; urgency=low * Fix typo in /etc/init.d/halt (closes: #224626) diff -u sysvinit-2.85/debian/initscripts/etc/init.d/halt sysvinit-2.85/debian/initscripts/etc/init.d/halt --- sysvinit-2.85/debian/initscripts/etc/init.d/halt +++ sysvinit-2.85/debian/initscripts/etc/init.d/halt @@ -13,6 +13,8 @@ INIT_HALT="POWEROFF" fi +. /etc/init.d/rcArch + # See if we need to cut the power. if [ "$INIT_HALT" = "POWEROFF" -a -x /etc/init.d/ups-monitor ] then @@ -34,5 +36,5 @@ fi -halt -d -f -i $poweroff $hddown +halt -d -f $poweroff $halt_ifdown $hddown : exit 0 diff -u sysvinit-2.85/debian/initscripts/etc/init.d/reboot sysvinit-2.85/debian/initscripts/etc/init.d/reboot --- sysvinit-2.85/debian/initscripts/etc/init.d/reboot +++ sysvinit-2.85/debian/initscripts/etc/init.d/reboot @@ -10,2 +10,4 @@ +. /etc/init.d/rcArch + echo -n "Rebooting... " -reboot -d -f -i +reboot -d -f $halt_ifdown diff -u sysvinit-2.85/debian/initscripts/etc/init.d/single sysvinit-2.85/debian/initscripts/etc/init.d/single --- sysvinit-2.85/debian/initscripts/etc/init.d/single +++ sysvinit-2.85/debian/initscripts/etc/init.d/single @@ -19,11 +19,14 @@ # We start update here, since we just killed it. if [ -x /sbin/update ] then - case `uname -r` in - 0.*|1.*|2.[0123].*) - update - ;; - esac + if [ `uname -s` = Linux ] + then + case `uname -r` in + 0.*|1.*|2.[0123].*) + update + ;; + esac + fi fi echo "Entering single-user mode..." diff -u sysvinit-2.85/debian/initscripts/etc/init.d/bootmisc.sh sysvinit-2.85/debian/initscripts/etc/init.d/bootmisc.sh --- sysvinit-2.85/debian/initscripts/etc/init.d/bootmisc.sh +++ sysvinit-2.85/debian/initscripts/etc/init.d/bootmisc.sh @@ -5,6 +5,8 @@ # . /etc/default/rcS +. /etc/init.d/rcArch + # # Put a nologin file in /etc to prevent people from logging in # before system startup is complete. @@ -57,7 +59,7 @@ # # Save kernel messages in /var/log/dmesg # -dmesg -s 65536 > /var/log/dmesg +dmesg $dmesg_bufsize > /var/log/dmesg # # Remove ".clean" files. diff -u sysvinit-2.85/debian/initscripts/etc/init.d/checkroot.sh sysvinit-2.85/debian/initscripts/etc/init.d/checkroot.sh --- sysvinit-2.85/debian/initscripts/etc/init.d/checkroot.sh +++ sysvinit-2.85/debian/initscripts/etc/init.d/checkroot.sh @@ -5,6 +5,7 @@ # . /etc/default/rcS +. /etc/init.d/rcArch # # Set SULOGIN in /etc/default/rcS to yes if you want a sulogin to be spawned @@ -78,7 +79,7 @@ doproc=no fi fi -[ "$doproc" = yes ] && mount -n /proc +[ "$doproc" = yes ] && mount $mount_no_mtab /proc # # Activate the swap device(s) in /etc/fstab. This needs to be done @@ -115,7 +116,7 @@ # # Ensure that root is quiescent and read-only before fsck'ing. # - mount -n -o remount,ro / + mount $mount_no_mtab $mount_remount,ro / if [ $? = 0 ] then if [ -f /forcefsck ] @@ -128,15 +129,16 @@ then fix="-y" else - fix="-a" + fix="$fsck_fix_all" fi - spinner="-C" + spinner="$fsck_spinner" + case "$TERM" in dumb|network|unknown|"") spinner="" ;; esac [ `uname -m` = s390 ] && spinner="" # This should go away echo "Checking root file system..." - fsck $spinner $force $fix / + fsck $spinner $fsck_preen_mode $force $fix / FSCKCODE=$? # # If there was a failure, drop into single-user mode. @@ -155,7 +157,7 @@ echo "that the root file system is currently mounted read-only. To" echo "remount it read-write:" echo - echo " # mount -n -o remount,rw /" + echo " # mount $mount_no_mtab $mount_remount,rw /" echo echo "CONTROL-D will exit from this shell and REBOOT the system." echo @@ -180,7 +182,7 @@ # /etc/mtab is a symlink (not to /proc/mounts) then we also # initialize the mtab file. # -mount -n -o remount,$rootmode / +mount $mount_no_mtab $mount_remount,$rootmode / if [ -L /etc/mtab ] then # Get symlink destination file and directory. @@ -213,8 +215,8 @@ if [ -n "$INIT_MTAB" ] then - mount -f -o remount / - mount -f /proc + mount -f $mount_remount,$rootmode / + [ $SYSTEM = linux-compat ] && mount -f $mount_remount /proc [ -n "$devfs" ] && mount -f $devfs fi diff -u sysvinit-2.85/debian/initscripts/etc/init.d/checkfs.sh sysvinit-2.85/debian/initscripts/etc/init.d/checkfs.sh --- sysvinit-2.85/debian/initscripts/etc/init.d/checkfs.sh +++ sysvinit-2.85/debian/initscripts/etc/init.d/checkfs.sh @@ -5,6 +5,7 @@ # . /etc/default/rcS +. /etc/init.d/rcArch # # Check the rest of the file systems. @@ -21,15 +22,16 @@ then fix="-y" else - fix="-a" + fix="$fsck_fix_all" fi - spinner="-C" + spinner="$fsck_spinner" case "$TERM" in dumb|network|unknown|"") spinner="" ;; esac [ `uname -m` = s390 ] && spinner="" # This should go away + fsckargs="$fsck_all_noroot" echo "Checking all file systems..." - fsck $spinner -R -A $fix $force + fsck $spinner $fsckargs $fix $force if [ $? -gt 1 ] then echo diff -u sysvinit-2.85/debian/initscripts/etc/init.d/mountall.sh sysvinit-2.85/debian/initscripts/etc/init.d/mountall.sh --- sysvinit-2.85/debian/initscripts/etc/init.d/mountall.sh +++ sysvinit-2.85/debian/initscripts/etc/init.d/mountall.sh @@ -4,22 +4,25 @@ # Version: @(#)mountall.sh 2.85-9 23-Dec-2003 miquels@cistron.nl # . /etc/default/rcS +. /etc/init.d/rcArch . /etc/init.d/bootclean.sh # # Mount local file systems in /etc/fstab. # [ "$VERBOSE" != no ] && echo "Mounting local filesystems..." -mount -av -t nonfs,nosmbfs,noncpfs,noproc 2>&1 | +mount -av -t nonfs,nosmbfs,noncpfs,no$procfs 2>&1 | egrep -v '(already|nothing was) mounted' +INITCTL_PATH=/var/run/initctl + # # We might have mounted something over /dev, see if /dev/initctl is there. # -if [ ! -p /dev/initctl ] +if [ ! -p $INITCTL_PATH ] then - rm -f /dev/initctl - mknod -m 600 /dev/initctl p + rm -f $INITCTL_PATH + mknod -m 600 $INITCTL_PATH p fi kill -USR1 1 @@ -28,8 +31,8 @@ # a file on a now mounted filesystem. # doswap=yes -case "`uname -r`" in - 2.[0123].*) +case "`uname -s`:`uname -r`" in + Linux:2.[0123].*) if grep -qs resync /proc/mdstat then doswap=no diff -u sysvinit-2.85/debian/initscripts/etc/init.d/umountfs sysvinit-2.85/debian/initscripts/etc/init.d/umountfs --- sysvinit-2.85/debian/initscripts/etc/init.d/umountfs +++ sysvinit-2.85/debian/initscripts/etc/init.d/umountfs @@ -8,18 +8,22 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -echo -n "Deactivating swap..." -umount -ttmpfs -a -r -swapoff -a -echo "done." +. /etc/init.d/rcArch + +if [ `uname -s` = Linux ] ; then + echo -n "Deactivating swap..." + umount -ttmpfs -a -r + swapoff -a + echo "done." +fi # # Umount all filesystems except the virtual ones. # echo -n "Unmounting local filesystems..." -umount -tnoproc,nodevfs,nosysfs,nousbfs,nousbdevfs,nodevpts -d -a -r +umount -tno$procfs,nodevfs,nosysfs,nousbfs,nousbdevfs,nodevpts -d $umount_all echo "done." # This is superfluous. -mount -n -o remount,ro / +mount $mount_no_mtab $mount_remount,ro / : exit 0 diff -u sysvinit-2.85/debian/initscripts/etc/init.d/umountnfs.sh sysvinit-2.85/debian/initscripts/etc/init.d/umountnfs.sh --- sysvinit-2.85/debian/initscripts/etc/init.d/umountnfs.sh +++ sysvinit-2.85/debian/initscripts/etc/init.d/umountnfs.sh @@ -11,16 +11,21 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin -case "`uname -r`" in - [01].*|2.[01].*) +. /etc/init.d/rcArch + +case "`uname -s`:`uname -r`" in + Linux:[01].*|Linux:2.[01].*) FLAGS="" ;; - 2.[23].*|2.4.?|2.4.?-*|2.4.10|2.4.10-*) + Linux:2.[23].*|Linux:2.4.?|Linux:2.4.?-*|Linux:2.4.10|Linux:2.4.10-*) FLAGS="-f" ;; - *) + Linux:*) FLAGS="-f -l" ;; + *:*) + FLAGS="$umount_force $umount_lazy" + ;; esac # Write a reboot record to /var/log/wtmp before unmounting @@ -48,7 +53,7 @@ nfs|smbfs|ncpfs|coda) DIRS="$DIR $DIRS" ;; - proc|devfs|devpts|usbfs|usbdevfs|sysfs) + $procfs|devfs|devpts|usbfs|usbdevfs|sysfs) DIRS="$DIR $DIRS" ;; esac diff -u sysvinit-2.85/debian/initscripts/conffiles sysvinit-2.85/debian/initscripts/conffiles --- sysvinit-2.85/debian/initscripts/conffiles +++ sysvinit-2.85/debian/initscripts/conffiles @@ -1,3 +1,4 @@ +/etc/init.d/rcArch /etc/init.d/bootclean.sh /etc/init.d/bootlogd /etc/init.d/bootmisc.sh diff -u sysvinit-2.85/src/init.c sysvinit-2.85/src/init.c --- sysvinit-2.85/src/init.c +++ sysvinit-2.85/src/init.c @@ -68,7 +68,7 @@ # define CBAUD 0 #endif #ifndef CBAUDEX -# defined CBAUDEX 0 +# define CBAUDEX 0 #endif /* Set a signal handler. */ diff -u sysvinit-2.85/src/initreq.h sysvinit-2.85/src/initreq.h --- sysvinit-2.85/src/initreq.h +++ sysvinit-2.85/src/initreq.h @@ -17,7 +17,11 @@ #include #define INIT_MAGIC 0x03091969 -#define INIT_FIFO "/dev/initctl" +#if defined(__FreeBSD_kernel__) +# define INIT_FIFO "/var/run/initctl" +#else +# define INIT_FIFO "/dev/initctl" +#endif #define INIT_CMD_START 0 #define INIT_CMD_RUNLVL 1 #define INIT_CMD_POWERFAIL 2 diff -u sysvinit-2.85/src/bootlogd.c sysvinit-2.85/src/bootlogd.c --- sysvinit-2.85/src/bootlogd.c +++ sysvinit-2.85/src/bootlogd.c @@ -41,7 +41,6 @@ #include #include #include -#include char *Version = "@(#) bootlogd 2.85 22-Jul-2003 miquels@cistron.nl"; @@ -235,7 +234,7 @@ return -1; } if (st.st_dev == st2.st_dev) { - if (mount("proc", "/proc", "proc", 0, NULL) < 0) { + if (system("mount -t proc proc /proc") != 0) { perror("bootlogd: mount /proc"); return -1; } @@ -254,7 +253,7 @@ perror("bootlogd: /proc/cmdline"); close(fd); } - if (didmount) umount("/proc"); + if (didmount) system("umount /proc"); if (r < 0) return r; only in patch2: unchanged: --- sysvinit-2.85.orig/src/reboot.h +++ sysvinit-2.85/src/reboot.h @@ -10,11 +10,19 @@ # include #endif +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#define BMAGIC_HARD BMAGIC_REBOOT +#define BMAGIC_SOFT BMAGIC_REBOOT +#define BMAGIC_REBOOT RB_AUTOBOOT +#define BMAGIC_HALT RB_HALT +#define BMAGIC_POWEROFF RB_POWEROFF +#else #define BMAGIC_HARD 0x89ABCDEF #define BMAGIC_SOFT 0 #define BMAGIC_REBOOT 0x01234567 #define BMAGIC_HALT 0xCDEF0123 #define BMAGIC_POWEROFF 0x4321FEDC +#endif #if defined(__GLIBC__) #define init_reboot(magic) reboot(magic) only in patch2: unchanged: --- sysvinit-2.85.orig/debian/changelog.rej +++ sysvinit-2.85/debian/changelog.rej @@ -0,0 +1,58 @@ +*************** +*** 1,3 **** + sysvinit (2.85-7) unstable; urgency=low + + * Fix devfs mtab fixup in checkroot.sh (closes: #202421) +--- 1,52 ---- ++ sysvinit (2.85-7+kbsd.6) unreleased; urgency=low ++ ++ * Build with -sa and gcc with proper flags. ++ ++ -- Robert Millan Thu, 4 Dec 2003 17:33:55 +0100 ++ ++ sysvinit (2.85-7+kbsd.5) unreleased; urgency=low ++ ++ * debian/share/inittab.i386-knetbsd-gnu: New. ++ * debian/control (initscripts/Depends): Nuke mount. ++ * debian/postinst: Add || true to mkfifo. ++ * src/init.c: Set TERM=vt220 for GNU/KNetBSD. ++ ++ -- Robert Millan Fri, 21 Nov 2003 17:53:26 +0100 ++ ++ sysvinit (2.85-7+kbsd.4) unreleased; urgency=low ++ ++ * Select inittab in build time, not install time (works around missing ++ dpkg-dev dependency). ++ - debian/rules: select inittab using dpkg-architecture. ++ - debian/postinst: use default inittab. ++ ++ -- Robert Millan Wed, 29 Oct 2003 19:10:24 +0100 ++ ++ sysvinit (2.85-7+kbsd.2) unreleased; urgency=low ++ ++ * debian/control: Fallback to freebsd-diskutils as an alternative for ++ mount. ++ ++ -- Robert Millan Wed, 29 Oct 2003 00:31:56 +0100 ++ ++ sysvinit (2.85-7+kbsd.1) unreleased; urgency=low ++ ++ * src/init.c: Set TERM=cons25. ++ ++ -- Robert Millan Thu, 23 Oct 2003 23:45:01 +0200 ++ ++ sysvinit (2.85-7+kbsd) unreleased; urgency=low ++ ++ * Substituted mount(2) with system(2) calls. ++ * Generalized non portable arguments to low level utils. ++ * Fixed a wrong CPP define. ++ * Moved initctl from /dev to /var/run because in KFreeBSD it's ++ not writable. ++ * Fixed the inittab to use proper terminal devices. ++ * Added KFreeBSD reboot and halt magic defines. ++ ++ -- Guillem Jover Sat, 4 Oct 2003 20:16:06 +0200 ++ + sysvinit (2.85-7) unstable; urgency=low + + * Fix devfs mtab fixup in checkroot.sh (closes: #202421) only in patch2: unchanged: --- sysvinit-2.85.orig/debian/share/inittab.s390-linux +++ sysvinit-2.85/debian/share/inittab.s390-linux @@ -0,0 +1,63 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab.s390,v 1.9 2000/01/10 10:15:30 miquels Exp $ + +# The default runlevel. +id:2:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin + +# What to do when CTRL-ALT-DEL is pressed. +ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now + +# Action on special keypress (ALT-UpArrow). +kb::kbrequest:/bin/echo "Keyboard Request--edit /etc/inittab to let this work." + +# What to do when the power fails/returns. +pf::powerwait:/etc/init.d/powerfail start +pn::powerfailnow:/etc/init.d/powerfail now +po::powerokwait:/etc/init.d/powerfail stop + +# /sbin/getty invocations for the runlevels. +# +# The "id" field MUST be the same as the last +# characters of the device (after "tty"). +# +# Format: +# ::: +# +# The s390 only has a dumb terminal on /dev/console. +# +1:2345:respawn:/sbin/getty 38400 console dumb + +# Example how to put a getty on a serial line (for a terminal) +# +#T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 +#T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 + +# Example how to put a getty on a modem line. +# +#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3 + only in patch2: unchanged: --- sysvinit-2.85.orig/debian/share/inittab.i386-knetbsd-gnu +++ sysvinit-2.85/debian/share/inittab.i386-knetbsd-gnu @@ -0,0 +1,67 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ + +# The default runlevel. +id:2:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin + +# What to do when CTRL-ALT-DEL is pressed. +ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now + +# Action on special keypress (ALT-UpArrow). +#kb::kbrequest:/bin/echo "Keyboard Request--edit /etc/inittab to let this work." + +# What to do when the power fails/returns. +pf::powerwait:/etc/init.d/powerfail start +pn::powerfailnow:/etc/init.d/powerfail now +po::powerokwait:/etc/init.d/powerfail stop + +# /sbin/getty invocations for the runlevels. +# +# The "id" field MUST be the same as the last +# characters of the device (after "tty"). +# +# Format: +# ::: +# +# Note that on most Debian systems tty7 is used by the X Window System, +# so if you want to add more getty's go ahead but skip tty7 if you run X. +# +1:2345:respawn:/sbin/getty 38400 ttyE0 +2:23:respawn:/sbin/getty 38400 ttyE1 +3:23:respawn:/sbin/getty 38400 ttyE2 +4:23:respawn:/sbin/getty 38400 ttyE3 + +# Example how to put a getty on a serial line (for a terminal) +# +#T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 +#T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 + +# Example how to put a getty on a modem line. +# +#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3 + only in patch2: unchanged: --- sysvinit-2.85.orig/debian/share/inittab.i386-kfreebsd-gnu +++ sysvinit-2.85/debian/share/inittab.i386-kfreebsd-gnu @@ -0,0 +1,69 @@ +# /etc/inittab: init(8) configuration. +# $Id: inittab,v 1.91 2002/01/25 13:35:21 miquels Exp $ + +# The default runlevel. +id:2:initdefault: + +# Boot-time system configuration/initialization script. +# This is run first except when booting in emergency (-b) mode. +si::sysinit:/etc/init.d/rcS + +# What to do in single-user mode. +~~:S:wait:/sbin/sulogin + +# /etc/init.d executes the S and K scripts upon change +# of runlevel. +# +# Runlevel 0 is halt. +# Runlevel 1 is single-user. +# Runlevels 2-5 are multi-user. +# Runlevel 6 is reboot. + +l0:0:wait:/etc/init.d/rc 0 +l1:1:wait:/etc/init.d/rc 1 +l2:2:wait:/etc/init.d/rc 2 +l3:3:wait:/etc/init.d/rc 3 +l4:4:wait:/etc/init.d/rc 4 +l5:5:wait:/etc/init.d/rc 5 +l6:6:wait:/etc/init.d/rc 6 +# Normally not reached, but fallthrough in case of emergency. +z6:6:respawn:/sbin/sulogin + +# What to do when CTRL-ALT-DEL is pressed. +ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now + +# Action on special keypress (ALT-UpArrow). +#kb::kbrequest:/bin/echo "Keyboard Request--edit /etc/inittab to let this work." + +# What to do when the power fails/returns. +pf::powerwait:/etc/init.d/powerfail start +pn::powerfailnow:/etc/init.d/powerfail now +po::powerokwait:/etc/init.d/powerfail stop + +# /sbin/getty invocations for the runlevels. +# +# The "id" field MUST be the same as the last +# characters of the device (after "tty"). +# +# Format: +# ::: +# +# Note that on most Debian systems tty7 is used by the X Window System, +# so if you want to add more getty's go ahead but skip tty7 if you run X. +# +1:2345:respawn:/sbin/getty 38400 ttyv0 +2:23:respawn:/sbin/getty 38400 ttyv1 +3:23:respawn:/sbin/getty 38400 ttyv2 +4:23:respawn:/sbin/getty 38400 ttyv3 +5:23:respawn:/sbin/getty 38400 ttyv4 +6:23:respawn:/sbin/getty 38400 ttyv5 + +# Example how to put a getty on a serial line (for a terminal) +# +#T0:23:respawn:/sbin/getty -L ttyS0 9600 vt100 +#T1:23:respawn:/sbin/getty -L ttyS1 9600 vt100 + +# Example how to put a getty on a modem line. +# +#T3:23:respawn:/sbin/mgetty -x0 -s 57600 ttyS3 + only in patch2: unchanged: --- sysvinit-2.85.orig/debian/initscripts/etc/init.d/rcArch +++ sysvinit-2.85/debian/initscripts/etc/init.d/rcArch @@ -0,0 +1,44 @@ +# Arch specific options + +if [ `uname -s` = Linux -o `uname -s` = GNU ]; then + SYSTEM=linux-compat + umount_all="-a -r" + umount_try_ro="-r" + case "`uname -r`" in + [01].*|2.[01].*) + umount_force="" + umount_lazy="" + ;; + 2.[23].*) + umount_force="-f" + umount_lazy="" + ;; + *) + umount_force="-f" + umount_lazy="-l" + ;; + esac + dmesg_bufsize="-s 65536" + fsck_all_noroot="-R -A" + fsck_fix_all="-a" + fsck_spinner="-C" + fsck_preen_mode="" + procfs="proc" + mount_no_mtab="-n" + mount_remount="-o remount" + halt_ifdown="-i" +else + SYSTEM=bsd-compat + umount_all="-a" + umount_try_ro="" + umount_force="-f" + fsck_all_noroot="-B -p" + fsck_fix_all="" + fsck_spinner="" + fsck_preen_mode="-p" + procfs="procfs" + mount_no_mtab="" + mount_remount="-o update" + halt_ifdown="" +fi +