Package: udev
Version: 0.056-2
Severity: normal
Tags: patch

i believe the following is not fully /bin/sh compliant (it fails to work
with "posh"):

if [ -c /dev/.devfsd -o -c /dev/vc/1 ]; then

it should be:

if [ -c /dev/.devfsd ] || [ -c /dev/vc/1 ]; then

as well as:

  if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then

should be:

  if [ "$RUNLEVEL" = "S" ] && [ "$PREVLEVEL" = "N" ]; then

(i think these may be called XSI:isms)

i have found several in /etc/init.d/udev, udev.postinst, and udev.preinst...

attached are patches for each.

live well,
  vagrant

-- Package-specific info:
-- /etc/udev/rules.d/:
/etc/udev/rules.d/:
total 0
lrwxrwxrwx  1 root root 20 2005-05-16 11:18 020_permissions.rules -> 
../permissions.rules
lrwxrwxrwx  1 root root 19 2005-05-16 11:18 cd-aliases.rules -> 
../cd-aliases.rules
lrwxrwxrwx  1 root root 13 2005-05-16 11:18 udev.rules -> ../udev.rules

-- /sys/:
/sys/block/fd0/dev
/sys/block/hda/dev
/sys/block/hda/hda1/dev
/sys/block/hda/hda2/dev
/sys/block/hda/hda3/dev
/sys/block/hda/hda4/dev
/sys/block/hda/hda5/dev
/sys/block/hda/hda6/dev
/sys/block/loop0/dev
/sys/block/loop1/dev
/sys/block/loop2/dev
/sys/block/loop3/dev
/sys/block/loop4/dev
/sys/block/loop5/dev
/sys/block/loop6/dev
/sys/block/loop7/dev
/sys/block/ram0/dev
/sys/block/ram1/dev
/sys/block/ram10/dev
/sys/block/ram11/dev
/sys/block/ram12/dev
/sys/block/ram13/dev
/sys/block/ram14/dev
/sys/block/ram15/dev
/sys/block/ram2/dev
/sys/block/ram3/dev
/sys/block/ram4/dev
/sys/block/ram5/dev
/sys/block/ram6/dev
/sys/block/ram7/dev
/sys/block/ram8/dev
/sys/block/ram9/dev
/sys/class/input/event0/dev
/sys/class/input/event1/dev
/sys/class/input/event2/dev
/sys/class/input/mice/dev
/sys/class/input/mouse0/dev
/sys/class/input/ts0/dev
/sys/class/misc/device-mapper/dev
/sys/class/misc/psaux/dev
/sys/class/misc/rtc/dev
/sys/class/misc/tun/dev
/sys/class/sound/audio/dev
/sys/class/sound/controlC0/dev
/sys/class/sound/dsp/dev
/sys/class/sound/mixer/dev
/sys/class/sound/pcmC0D0c/dev
/sys/class/sound/pcmC0D0p/dev
/sys/class/sound/timer/dev

-- Kernel configuration:


-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i586)
Kernel: Linux 2.6.8-2-386
Locale: LANG=es_US, LC_CTYPE=es_US (charmap=ISO-8859-1)

Versions of packages udev depends on:
ii  hotplug                  0.0.20040329-22 Linux Hotplug Scripts
ii  initscripts              2.86.ds1-1      Standard scripts needed for bootin
ii  libc6                    2.3.2.ds1-21    GNU C Library: Shared libraries an
ii  makedev                  2.3.1-77        creates device files in /dev
ii  sed                      4.1.2-8         The GNU sed stream editor

-- no debconf information
--- /etc/init.d/udev    2005-04-08 07:28:52.000000000 -0600
+++ udev-init.d.new     2005-05-16 18:20:42.681450392 -0600
@@ -95,12 +95,12 @@
 }
 
 warn_if_interactive() {
-  if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then
+  if [ "$RUNLEVEL" = "S" ] && [ "$PREVLEVEL" = "N" ]; then
     return 0
   fi
 
   TTY=$(my_tty)
-  if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then
+  if [ -z "$TTY" ] || [ "$TTY" = "/dev/console" ]; then
     return 0
   fi
 
--- /var/lib/dpkg/info/udev.postinst    2005-04-09 10:25:29.000000000 -0600
+++ udev.postinst.new   2005-05-16 18:21:19.905791432 -0600
@@ -19,7 +19,7 @@
 
   ln -s ../permissions.rules 020_permissions.rules
 
-  if [ -c /dev/.devfsd -o -c /dev/vc/1 ]; then
+  if [ -c /dev/.devfsd ] || [ -c /dev/vc/1 ]; then
     # not perfect, but a good enough heuristic
     if [ -e /dev/tty1 ]; then
       ln -s ../devfs.rules ../compat-full.rules ../cd-aliases.rules .
@@ -75,7 +75,7 @@
 
   # XXX oops! some 0.048-* packages did not delete the first-install flag,
   # so we double check if udev had already been installed and enabled
-  if [ -e /dev/.udevdb -o -e /dev/.udev.tdb ]; then
+  if [ -e /dev/.udevdb ] || [ -e /dev/.udev.tdb ]; then
     return 0
   fi
 
--- /var/lib/dpkg/info/udev.preinst     2005-04-09 10:25:29.000000000 -0600
+++ udev.preinst.new    2005-05-16 18:21:47.304626176 -0600
@@ -39,7 +39,7 @@
   if dpkg --compare-versions $2 lt 0.046-4; then
     mkdir -p /etc/udev/scripts/
     for file in cdsymlinks.sh dvb.sh ide-devfs.sh inputdev.sh scsi-devfs.sh; do
-      if [ -f /etc/udev/$file -a ! -f /etc/udev/scripts/$file ]; then
+      if [ -f /etc/udev/$file ] && [ ! -f /etc/udev/scripts/$file ]; then
        mv -f /etc/udev/$file /etc/udev/scripts/
       fi
     done
@@ -58,7 +58,7 @@
     create_first_install_flag
   fi
   if dpkg --compare-versions $2 lt 0.054-3; then
-    if [ -d /.dev/ -a -d /dev/.udevdb/ ]; then
+    if [ -d /.dev/ ] && [ -d /dev/.udevdb/ ]; then
       mkdir -p /dev/.static/dev/
       chmod 700 /dev/.static/
       mount -n --move /.dev/ /dev/.static/dev/ || true
--- /etc/hotplug.d/default/default.hotplug      2005-02-16 10:15:46.000000000 
-0700
+++ default.hotplug.new 2005-05-16 19:01:18.340173984 -0600
@@ -41,7 +41,7 @@
 # Other parameters are passed in the environment, or positionally
 # through argv.
 # 
-if [ $# -lt 1 -o "$1" = "help" -o "$1" = "--help" ]; then
+if [ $# -lt 1 ] || [ "$1" = "help" ] || [ "$1" = "--help" ]; then
     if [ -t ]; then
        echo "Usage: $0 AgentName [AgentArguments]"
 

Attachment: signature.asc
Description: Digital signature

Reply via email to