summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authortao@kernel.org <tao@kernel.org>2004-08-11 01:03:03 -0700
committerGreg KH <gregkh@suse.de>2005-04-26 21:36:59 -0700
commitb9e3301c3b68a1c6464a0bf0ac6e61fc0e4063d1 (patch)
tree9cbbf4485cbe73728ec02b8620c7fe534c11c01c /etc
parent2410242aa4d21335026d3b90116078c9146a32f3 (diff)
[PATCH] Minor POSIX-fixes for udev
The attached patch contains a few patches against udev, to remove use of various XSI:isms and bash:isms, and to change two scripts form /bin/bash to /bin/sh. None of the bash-scripts in test/ uses any bash-specific functions as far as I know, but I didn't touch them since they aren't used runtime. Rationale: * Both of the /bin/bash-scripts are totally free from bashisms, hence they don't need to be /bin/bash; using /bin/sh instead helps (mainly) embedded-people * local and source are bash:isms (well, they exist in several other shells as well, but they aren't part of POSIX or any of its extensions) * -a in tests is an XSI-extension, not part of strict POSIX, and is easily replaced by && | http://www.opengroup.org/onlinepubs/009695399/utilities/test.html * Use of fgrep is deprecated in POSIX in favour of grep -F (though fgrep will remain in use for a long time...) | http://www.opengroup.org/onlinepubs/009695399/utilities/grep.html The fgrep-change isn't really necessary, since fgrep can always be implemented as a shell-script, but the rest of the changes would really be appreciated.
Diffstat (limited to 'etc')
-rw-r--r--etc/dev.d/default/pam_console.dev2
-rw-r--r--etc/dev.d/default/selinux.dev2
-rw-r--r--etc/init.d/udev2
-rw-r--r--etc/init.d/udev.debian2
-rw-r--r--etc/init.d/udev.init.lfs6
5 files changed, 7 insertions, 7 deletions
diff --git a/etc/dev.d/default/pam_console.dev b/etc/dev.d/default/pam_console.dev
index 7e95810e2c..563051d7f6 100644
--- a/etc/dev.d/default/pam_console.dev
+++ b/etc/dev.d/default/pam_console.dev
@@ -11,7 +11,7 @@ fi
[ "$UDEV_CONSOLE" != "yes" ] && exit 0
if [ -x /sbin/pam_console_setowner ]; then
- if [ "$UDEV_LOG" = "yes" -a -x /usr/bin/logger ]; then
+ if [ "$UDEV_LOG" = "yes" ] && [ -x /usr/bin/logger ]; then
/usr/bin/logger -p auth.debug "Restoring console permissions for $DEVNAME"
fi
exec /sbin/pam_console_setowner $DEVNAME
diff --git a/etc/dev.d/default/selinux.dev b/etc/dev.d/default/selinux.dev
index 7911d345b9..9682658aad 100644
--- a/etc/dev.d/default/selinux.dev
+++ b/etc/dev.d/default/selinux.dev
@@ -11,7 +11,7 @@ fi
[ "$UDEV_SELINUX" != "yes" ] && exit 0
if [ -x /sbin/restorecon ]; then
- if [ "$UDEV_LOG" = "yes" -a -x /usr/bin/logger ]; then
+ if [ "$UDEV_LOG" = "yes" ] && [ -x /usr/bin/logger ]; then
/usr/bin/logger -p auth.debug "Restoring file security contexts for $DEVNAME"
fi
/sbin/restorecon $DEVNAME
diff --git a/etc/init.d/udev b/etc/init.d/udev
index cd9074de09..7e6305a45b 100644
--- a/etc/init.d/udev
+++ b/etc/init.d/udev
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
#
# udev init script to setup /udev
#
diff --git a/etc/init.d/udev.debian b/etc/init.d/udev.debian
index 776a73644c..8268fe6c2f 100644
--- a/etc/init.d/udev.debian
+++ b/etc/init.d/udev.debian
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
#
# random init script to setup /udev
#
diff --git a/etc/init.d/udev.init.lfs b/etc/init.d/udev.init.lfs
index c738369081..41a3fecf0f 100644
--- a/etc/init.d/udev.init.lfs
+++ b/etc/init.d/udev.init.lfs
@@ -5,9 +5,9 @@
# 2003, 2004 by Michael Buesch <mbuesch@freenet.de>
#
-source /etc/sysconfig/rc
-source $rc_functions
-source /etc/udev/udev.conf
+. /etc/sysconfig/rc
+. $rc_functions
+. /etc/udev/udev.conf
sysfs_dir="/sys"
bin="/sbin/udev"