diff options
| -rw-r--r-- | etc/dev.d/default/pam_console.dev | 2 | ||||
| -rw-r--r-- | etc/dev.d/default/selinux.dev | 2 | ||||
| -rw-r--r-- | etc/init.d/udev | 2 | ||||
| -rw-r--r-- | etc/init.d/udev.debian | 2 | ||||
| -rw-r--r-- | etc/init.d/udev.init.lfs | 6 | ||||
| -rw-r--r-- | extras/ide-devfs.sh | 12 | ||||
| -rw-r--r-- | extras/scsi-devfs.sh | 4 | ||||
| -rw-r--r-- | extras/start_udev | 2 |
8 files changed, 15 insertions, 17 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" diff --git a/extras/ide-devfs.sh b/extras/ide-devfs.sh index 4d021c5e87..4f20259480 100644 --- a/extras/ide-devfs.sh +++ b/extras/ide-devfs.sh @@ -15,15 +15,13 @@ else fi get_dev_number() { - local x= - local num=0 - local MEDIA= - local DRIVE="${1%%[0-9]*}" + num=0 + DRIVE="${1%%[0-9]*}" for x in /proc/ide/*/media; do if [ -e "${x}" ]; then - MEDIA=`cat ${x}` - if [ "${MEDIA}" = "$2" ]; then + lMEDIA=`cat ${x}` + if [ "${lMEDIA}" = "$2" ]; then num=$((${num} + 1)) fi if [ "${x}" = "/proc/ide/${DRIVE}/media" ]; then @@ -35,7 +33,7 @@ get_dev_number() { echo $((${num} - 1)) } -if [ -z "$3" -a -f /proc/ide/${1}/media ]; then +if [ -z "$3" ] && [ -f /proc/ide/${1}/media ]; then MEDIA=`cat /proc/ide/${1}/media` if [ "${MEDIA}" = "cdrom" ]; then echo ide/host${HOST}/bus${BUS}/target${TARGET}/lun0/cd cdroms/cdrom`get_dev_number $1 cdrom` diff --git a/extras/scsi-devfs.sh b/extras/scsi-devfs.sh index 30f4553a5b..12c8aa8eb5 100644 --- a/extras/scsi-devfs.sh +++ b/extras/scsi-devfs.sh @@ -14,7 +14,7 @@ # BUS="scsi", KERNEL="sg*", PROGRAM="/etc/udev/scsi-devfs.sh sg %b %n", NAME="%c{1}", SYMLINK="%c{2} %k %c{3} %c{4}" # Find out where sysfs is mounted. Exit if not available -sysfs=`fgrep sysfs /proc/mounts | awk '{print $2}'` +sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'` if [ "$sysfs" = "" ]; then echo "sysfs is required" exit 1 @@ -63,7 +63,7 @@ s_com="b${scsi_bus}t${scsi_target}u${scsi_lun}$spart" l_log="scsi/host$scsi_host/$l_com" s_log="$1/c${scsi_host}${s_com}" -readlink $2 | fgrep -q pci +readlink $2 | grep -F -q pci if [ "$?" != "0" ]; then # Not a PCI controller, show logical locations only echo $l_log $s_log diff --git a/extras/start_udev b/extras/start_udev index 4908d05b70..bbf32a1bb9 100644 --- a/extras/start_udev +++ b/extras/start_udev @@ -1,4 +1,4 @@ -#! /bin/bash +#! /bin/sh # # start_udev # |