Attachment 303642 Details for Bug 444001 – Patch which fixes those annoyances.

[patch] Patch which fixes those annoyances.

patch (text/plain), 6.00 KB, created by archimerged Ark submedes on 2008-04-24 15:03:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: archimerged Ark submedes

Created: 2008-04-24 15:03:46 UTC

Size: 6.00 KB

patch

obsolete

>--- events.5-orig	2008-04-09 16:52:27.000000000 -0400
>+++ events.5	2008-04-24 00:46:50.000000000 -0400
>@@ -109,7 +109,7 @@
> 
> .TP
> .BI respawn
>-This sets the daemon, service, and respawn falgs for the job.
>+This sets the daemon, service, and respawn flags for the job.
> The respawn flag means that the process will be restarted when
> it ends.
> 
>--- initctl.8-orig	2008-04-09 16:52:23.000000000 -0400
>+++ initctl.8	2008-04-24 01:42:57.000000000 -0400
>@@ -4,7 +4,7 @@
> initctl \- init daemon control utility
> .\"
> .SH SYNOPSIS
>-\fBinitctl\fR [\fIOPTION\fR]... \fICOMMAND\fR [\fIOPTION\fR]... \fIARG...\fR
>+\fBinitctl\fR [\fIOPTION\fR]... \fICOMMAND\fR [\fIOPTION\fR]... \fIARG\fR...
> .\"
> .SH DESCRIPTION
> .B initctl
>@@ -14,7 +14,7 @@
> .IR COMMAND .
> 
> Normally it is invoked directly with the command specified as the first
>-non-option argument, however symbolic or hard links may be used so that
>+non-option argument; however, symbolic or hard links may be used so that
> it is invoked as the name of a command, in which case it behaves
> accordingly.
> .\"
>--- NetworkManager-orig	2008-04-16 15:54:06.000000000 -0400
>+++ /etc/rc.d/init.d/NetworkManager	2008-04-24 02:23:06.000000000 -0400
>@@ -46,8 +46,10 @@
> 
> start()
> {
>-	echo $"Setting network parameters... "
>+	echo -n $"Setting network parameters... "
> 	sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
>+	success
>+	echo
> 
> 	echo -n $"Starting NetworkManager daemon: "
> 	daemon --check $servicename $processname --pid-file=$pidfile
>--- rc1-orig	2008-04-04 11:49:20.000000000 -0400
>+++ /etc/event.d/rc1	2008-04-24 08:39:39.000000000 -0400
>@@ -1,10 +1,15 @@
> # rc1 - runlevel 1 compatibility
> #
> # This task runs the old sysv-rc runlevel 1 ("single-user") scripts. 
>+# /etc/rc.d/rc 1 will run the /etc/rc.d/rc1.d scripts.
>+# trap '' TERM avoids "init: rc1 main process (-pid-) killed by TERM signal"
>+# telinit S will run whichever task has "start on runlevel S",
>+# normally /etc/event.d/rcS-sulogin
> 
> start on runlevel 1
> 
> stop on runlevel
>+kill timeout 1
> 
> console output
> script
>@@ -15,5 +20,7 @@
> 	    export PREVLEVEL RUNLEVEL
> 	fi
> 
>-	exec /etc/rc.d/rc 1
>+	/etc/rc.d/rc 1
>+	trap '' TERM
>+	telinit S
> end script
>--- rcS-orig	2008-04-04 11:49:20.000000000 -0400
>+++ /etc/event.d/rcS	2008-04-24 09:09:35.000000000 -0400
>@@ -6,6 +6,10 @@
> 
> stop on runlevel
> 
>+# kill timeout 1 and trap '' TERM avoid the error message
>+# "init: rcS main process (-pid-) killed by TERM signal"
>+kill timeout 1
>+
> # Note: there can be no previous runlevel here, if we have one it's bad
> # information (we enter rc1 not rcS for maintenance).  Run /etc/rc.d/rc
> # without information so that it defaults to previous=N runlevel=S.
>@@ -24,5 +28,6 @@
> 			[1-9])       runlevel="$t" ;;
> 		esac
> 	done
>+	trap '' TERM
> 	telinit $runlevel
> end script
>--- rcS-sulogin-orig	2008-04-04 11:49:20.000000000 -0400
>+++ /etc/event.d/rcS-sulogin	2008-04-24 10:05:16.000000000 -0400
>@@ -1,18 +1,23 @@
> # rcS-sulogin - "single-user" runlevel compatibility
> #
>-# This task runs the sulogin binary during "single-user" mode.
>+# This task runs /bin/bash during "single-user" mode,
>+# then continues to the default runlevel.
> 
> start on runlevel S
> 
> stop on runlevel
> 
>-console owner
>+# kill timeout 1 and trap '' TERM avoid the error message
>+# "init: rcS-sulogin main process (-pid-) killed by TERM signal"
>+kill timeout 1
> 
>+console owner
> script
> 	runlevel --set S >/dev/null || true
> 	/bin/bash
> 
> 	runlevel=$(/bin/awk -F ':' '$3 == "initdefault" { print $2 }' /etc/inittab)
> 	[ -z "$runlevel" ] && runlevel="3"
>+	trap '' TERM
> 	telinit $runlevel
> end script
>--- rc.sysinit-orig	2008-04-15 13:28:02.000000000 -0400
>+++ /etc/rc.d/rc.sysinit	2008-04-23 23:53:09.000000000 -0400
>@@ -330,7 +330,7 @@
> 
> if [ -f /etc/crypttab ]; then
>     s=$"Starting disk encryption:"
>-    echo "$s"
>+    echo -n "$s"
>     init_crypto 0 && success "$s" || failure "$s"
>     echo
> fi
>@@ -364,7 +364,7 @@
> 
> if [ -f /etc/crypttab ]; then
>     s=$"Starting disk encryption:"
>-    echo "$s"
>+    echo -n "$s"
>     init_crypto 0 && success "$s" || failure "$s"
>     echo
> fi
>@@ -556,7 +556,7 @@
> if [ -z "$fastboot" -a "$READONLY" != "yes" ]; then
> 
>         STRING=$"Checking filesystems"
>-	echo $STRING
>+	echo -n $STRING
> 	if [ -n "${RHGB_STARTED}" -a -w /etc/rhgb/temp/rhgb-console ]; then
> 		fsck -T -t noopts=_netdev -A $fsckoptions > /etc/rhgb/temp/rhgb-console
> 	else
>@@ -701,7 +701,7 @@
> 
> if [ -f /etc/crypttab ]; then
>     s=$"Starting disk encryption using the RNG:"
>-    echo "$s"
>+    echo -n "$s"
>     init_crypto 1 && success "$s" || failure "$s"
>     echo
> fi
>--- single-orig	2008-04-15 13:02:37.000000000 -0400
>+++ /etc/rc.d/init.d/single	2008-04-24 09:34:33.000000000 -0400
>@@ -1,10 +1,20 @@
> #!/bin/bash
> #
> #
>-# rc.single     This file is executed by init when it goes into runlevel
>-#               1, which is the administrative state. It kills all
>-#               deamons and then puts the system into single user mode.
>-#               Note that the file systems are kept mounted.
>+# single	This file should be hard linked as /etc/rc.d/init.d/single
>+#		and /etc/rc.d/rc1.d/S99single.  The process of entering
>+#		single user mode is managed by the script specified in
>+#		/etc/event.d/rc1.  That script executes /etc/rc.d/rc 1,
>+#		which executes the Knn and Snn scripts in /etc/rc.d/rc1.d,
>+#		ending with this one.
>+#
>+#		This script does last-minute housekeeping needed before
>+#		the single user shell starts.
>+#
>+#		Then the /etc/event.d/rc1 script sets up to ignore TERM
>+#		traps, executes telinit S, receives and ignores a TERM
>+#		signal, and exits before init can issue the KILL signal.
>+#		The single user shell itself is run by event.d/rcS-sulogin.
> #
> # Author:       Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org>
> #               Modified for RHS Linux by Damien Neil
>@@ -16,9 +26,8 @@
>    exit 0
> fi
> 
>-# this looks nicer
>-[ -x /usr/bin/clear ] && /usr/bin/clear
>+sleep 1 # let user see the last "shutting down... [OK]" message.
> 
>-# Now go to the single user level.
>+# Clear the console screen.
>+[ -x /usr/bin/clear ] && /usr/bin/clear
> echo $"Telling INIT to go to single user mode."
>-exec init -t1 S

Actions: View | Diff

Attachments on bug 444001: 303642 | 303655 | 303679