diff options
| author | P. J. McDermott <pjm@nac.net> | 2014-03-13 23:40:07 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2014-03-13 23:40:07 (EDT) |
| commit | 03fa1b027e4d92df4be3b5d1cca5bae38ba19707 (patch) | |
| tree | 64aa07a4d3379f1de439ace63abd1abdffb4333e /src.etc/init.d/mountdevsubfs | |
| parent | c007674154570c98c5fd36868af2d346a4c6e0e9 (diff) | |
Fix grep commands in init scripts.
The exit status of a pipeline is the exit status of the last command in
the pipeline. If the last command is ":", the exit status will always
be 0, regardless of whether grep finds the specified pattern.
So just use grep's -q command. According to the documentation for GNU
grep, some older grep implementations lacked this option. But we're
only running these scripts on BusyBox grep, which unconditionally
includes this option.
Diffstat (limited to 'src.etc/init.d/mountdevsubfs')
| -rwxr-xr-x | src.etc/init.d/mountdevsubfs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src.etc/init.d/mountdevsubfs b/src.etc/init.d/mountdevsubfs index 7e2fa87..5f44355 100755 --- a/src.etc/init.d/mountdevsubfs +++ b/src.etc/init.d/mountdevsubfs @@ -5,7 +5,7 @@ start() printf 'Mounting device file systems... ' [ -d /dev/pts ] || mkdir -m 0755 /dev/pts - if ! mount | grep -F ' /dev/pts ' 2>&1 | :; then + if ! mount | grep -Fq ' /dev/pts '; then mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts fi @@ -18,7 +18,7 @@ stop() { printf 'Unmounting device file systems... ' - if mount | grep -F ' /dev/pts ' 2>&1 | :; then + if mount | grep -Fq ' /dev/pts '; then umount /dev/pts fi |