summaryrefslogtreecommitdiff
path: root/packages/slugos-init/files
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-02-06 02:42:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-06 02:42:55 +0000
commita56f5680381313b9a12a3ba133c5cb7a2154aa67 (patch)
treede6d252a90a1ff8db12b6e9e22aba986f81aa40a /packages/slugos-init/files
parent54a44b070e7516a04ecaf6d1ed8c05c836a70e1b (diff)
initscripts-slugos: further fixes to checkroot.sh in 1.0
slugos-init: make beep silent, extend single_user_ok function in 0.10
Diffstat (limited to 'packages/slugos-init/files')
-rw-r--r--packages/slugos-init/files/functions2
-rw-r--r--packages/slugos-init/files/leds5
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/slugos-init/files/functions b/packages/slugos-init/files/functions
index df74aea717..78dcf816b3 100644
--- a/packages/slugos-init/files/functions
+++ b/packages/slugos-init/files/functions
@@ -35,7 +35,7 @@ single_user_ok() {
test "$SULOGIN" = yes -o "$SULOGIN" = ok ||
case "$(machine)" in
ixdp*|avila|loft)
- return 0;;
+ test "$SULOGIN" != never;;
*) return 1;;
esac
}
diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds
index 227ed78ff4..433467b96f 100644
--- a/packages/slugos-init/files/leds
+++ b/packages/slugos-init/files/leds
@@ -169,7 +169,8 @@ sysled(){
#
# beep {arguments}
# emit a beep
-# does nothing if there is no beep executable
+# does nothing if there is no beep executable, is very
+# quiet in the presence of errors
beep(){
local arg
arg=
@@ -177,7 +178,7 @@ beep(){
if test -x /bin/beep
then
test -c /dev/buzzer && arg="-e /dev/buzzer"
- /bin/beep $arg "$@"
+ /bin/beep $arg "$@" 2>/dev/null
fi
return 0
}