Skip to contentSkip to conversation

package/openrc: cleanup sysv-rcs script

PATCH New aduskett at gmail.com 2 participants 2 messages Dec 20, 2019 – Dec 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/openrc: cleanup sysv-rcs script

From: Adam Duskett <[email protected]>

Currently, the sysv-rcs script has two issues:
- The return code of each RCS script is not checked.
- The output does not match the formatting of the other openrc init scripts.

Modify the script in the following ways to fix both issues:
- Remove the "einfo "Starting sysv rc scripts"" at the top of the start function in favor of "einfo "Starting $i" in the loop itself.

- Add a "> /dev/null" to the end of $i start; this suppresses stdout while still allowing for stderr messages to print to the terminal.

- add an "eend $? to both the start and stop functions, this allows for openrc to show if an RCS script returned 0 or not.

The following is the startup output of OpenRC on a minimal system with S01syslogd modified to exit with a return code 1 for testing purposes:

Before:
* Adding static routes ...
[ ok ]
Starting default runlevel
* Starting sysv rc scripts
Starting syslogd: OK
Starting klogd: OK
Running sysctl: OK

After:
* Adding static routes ...
[ ok ]
Starting default runlevel
* Starting /etc/init.d/S01syslogd ...
[ !! ]
* Starting /etc/init.d/S02klogd ...
[ ok ]
* Starting /etc/init.d/S02sysctl ...
[ ok ]

---
 package/openrc/sysv-rcs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
package/openrc/sysv-rcs +6 -4
index 606a73d2b4..1564cbe603 100755
@@ -7,19 +7,21 @@ depend() {
 }
 
 start() {
-    einfo "Starting sysv rc scripts"
     for i in /etc/init.d/S??*; do
         # Ignore dangling symlinks (if any).
         [ -e "$i" ] || continue
-        $i start
+        einfo "Starting $i"
+        $i start > /dev/null
+        eend $?
     done
 }
 
 stop() {
-    einfo "Stopping sysv rc scripts"
     for i in $(ls -r /etc/init.d/S??*); do
         # Ignore dangling symlinks (if any).
         [ -e "$i" ] || continue
-        $i stop
+        einfo "Stopping $i"
+        $i stop > /dev/null
+        eend $?
     done
 }
Signature · 1 line
2.24.1
#1 lore raw

PATCH 1/1 package/openrc: cleanup sysv-rcs script

Quoted 44 lines · On Thu, 19 Dec 2019 16:04:37 -0800 aduskett at gmail.com wrote:

From: Adam Duskett <[email protected]>

Currently, the sysv-rcs script has two issues:
- The return code of each RCS script is not checked.
- The output does not match the formatting of the other openrc init scripts.

Modify the script in the following ways to fix both issues:
- Remove the "einfo "Starting sysv rc scripts"" at the top of the start function in favor of "einfo "Starting $i" in the loop itself.

- Add a "> /dev/null" to the end of $i start; this suppresses stdout while still allowing for stderr messages to print to the terminal.

- add an "eend $? to both the start and stop functions, this allows for openrc to show if an RCS script returned 0 or not.

The following is the startup output of OpenRC on a minimal system with S01syslogd modified to exit with a return code 1 for testing purposes:

Before:
* Adding static routes ...
[ ok ]
Starting default runlevel
* Starting sysv rc scripts
Starting syslogd: OK
Starting klogd: OK
Running sysctl: OK

After:
* Adding static routes ...
[ ok ]
Starting default runlevel
* Starting /etc/init.d/S01syslogd ...
[ !! ]
* Starting /etc/init.d/S02klogd ...
[ ok ]
* Starting /etc/init.d/S02sysctl ...
[ ok ]

Quoted 4 lines
---
 package/openrc/sysv-rcs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com