diff -urN suse92_plain/etc/rc.d/rc suse92/etc/rc.d/rc --- suse92_plain/etc/rc.d/rc 2004-10-04 16:38:42.000000000 +0200 +++ suse92/etc/rc.d/rc 2005-01-24 14:37:47.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/bash +#!/bin/bash # # Copyright (c) 1996-2004 SuSE Linux AG, Nuernberg, Germany. # All rights reserved. @@ -17,6 +17,9 @@ # stop that feature. # +RUNLEVEL="$1" +CONSOLE=/dev/null + # # Avoid be interrupted by child or keyboard # @@ -166,20 +169,6 @@ fi # -# Get terminal size of standard input of the system console -# -test -z "$CONSOLE" && CONSOLE=/dev/console -set -- $(stty size < $CONSOLE) - LINES=$1 -COLUMNS=$2 -export LINES COLUMNS CONSOLE - -# -# Set I/O of this script and its childs to console -# -exec 0<> $CONSOLE 1>&0 2>&0 - -# # Dummy shell function # chvt () { true; } --- suse92_plain/etc/init.d/syslog 2004-10-02 03:00:05.000000000 +0200 +++ suse92/etc/init.d/syslog 2005-01-24 15:30:05.000000000 +0100 @@ -44,7 +44,6 @@ # check config and programs test -s ${config} || exit 6 test -x ${BINDIR}/$syslog || exit 5 -test -x ${BINDIR}/klogd || exit 5 # # Do not translate symbol addresses for 2.6 kernel @@ -65,7 +64,6 @@ mkfifo -m 0600 /dev/xconsole chown root:tty /dev/xconsole fi - test -s /var/run/klogd.pid && killproc ${BINDIR}/klogd test -s ${syslog_pid} && { killproc -p ${syslog_pid} ${BINDIR}/${syslog} echo -n "Re-" @@ -75,15 +73,10 @@ startproc -p ${syslog_pid} ${BINDIR}/${syslog} $params rc_status - if test $? -eq 0 ; then - startproc ${BINDIR}/klogd -c $KERNEL_LOGLEVEL $KLOGD_PARAMS - rc_status - fi rc_status -v ;; stop) echo -n "Shutting down syslog services" - killproc -TERM ${BINDIR}/klogd ; rc_status killproc -p ${syslog_pid} -TERM ${BINDIR}/${syslog} ; rc_status -v ;; try-restart) @@ -99,12 +92,9 @@ echo -n "Reload syslog service" killproc -TSTP ${BINDIR}/klogd ; rc_status killproc -p ${syslog_pid} -HUP ${BINDIR}/${syslog} ; rc_status - killproc -CONT ${BINDIR}/klogd ; rc_status - killproc -USR2 ${BINDIR}/klogd ; rc_status -v ;; status) echo -n "Checking for service syslog:" - checkproc ${BINDIR}/klogd ; rc_status checkproc -p ${syslog_pid} ${BINDIR}/${syslog} ; rc_status -v ;; probe) --- suse92_plain/etc/init.d/halt 2004-10-04 16:37:23.000000000 +0200 +++ suse92/etc/init.d/halt 2005-01-24 16:41:48.000000000 +0100 @@ -60,9 +60,6 @@ rc_status -v1 -r } -# Write to wtmp file before unmounting /var -$command -w - # Set a flag that we had success upto this point > /success @@ -80,9 +77,6 @@ killall5 -9 echo -e "$rc_done_up" -# Redirect our mesages to default console -test -n "$REDIRECT" && exec 0<> $REDIRECT 1>&0 2>&0 - # # call modules in boot.d via K* symlinks # (reverse sequence) @@ -104,20 +98,6 @@ # kill splash animation test "$SPLASH" = yes && /sbin/splash -q -umount -anvt proc - -# on umsdos fs this would lead to an error message, so direct errors to -# /dev/null -mount -no remount,ro / 2> /dev/null -sync - -# show "the system is down" message -if test "$SPLASH" = yes ; then - mount -nt proc proc /proc - /sbin/splash -q -p 65535 -t "isdown" - umount -n /proc -fi - # Make reboot noise and wait a few seconds to give harddisks the chance # to really flush their buffers before power goes down. if test -n "$REDIRECT" ; then @@ -150,4 +130,4 @@ test -n "$REDIRECT" -a -n "$CONSOLE" && setconsole $REDIRECT < $CONSOLE # Now talk to kernel -exec $command -d -f +exec $command