tags 624441 + pending thanks Dear maintainer,
I've prepared an NMU for scsitools (versioned as 0.12-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Eric Clapton: Tears In Heaven
diff -Nru scsitools-0.12/debian/changelog scsitools-0.12/debian/changelog --- scsitools-0.12/debian/changelog 2011-01-21 22:39:27.000000000 +0100 +++ scsitools-0.12/debian/changelog 2011-12-07 17:26:55.000000000 +0100 @@ -1,3 +1,13 @@ +scsitools (0.12-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "rescan-scsi-bus call nonexistent usleep command": + new patch rescan-scsi-bus_sleep.patch, based on suggestion from Ubuntu / + Daniel T Chen: replace usleep with sleep. + (Closes: #624441) + + -- gregor herrmann <gre...@debian.org> Wed, 07 Dec 2011 17:25:32 +0100 + scsitools (0.12-2) unstable; urgency=low * Removed note displayed at install time (debconf abuse). Closes: #610233 diff -Nru scsitools-0.12/debian/patches/rescan-scsi-bus_sleep.patch scsitools-0.12/debian/patches/rescan-scsi-bus_sleep.patch --- scsitools-0.12/debian/patches/rescan-scsi-bus_sleep.patch 1970-01-01 01:00:00.000000000 +0100 +++ scsitools-0.12/debian/patches/rescan-scsi-bus_sleep.patch 2011-12-07 17:28:40.000000000 +0100 @@ -0,0 +1,35 @@ +Description: s/usleep/sleep/g + there is no usleep in Debian +Forwarded: no +Author: Daniel T Chen <seven.st...@gmail.com> +Bug-Debian: http://bugs.debian.org/624441 + +--- a/rescan-scsi-bus/rescan-scsi-bus.sh ++++ b/rescan-scsi-bus/rescan-scsi-bus.sh +@@ -229,7 +229,7 @@ + fi + while test $RC = 2 -o $RC = 6 && test $ctr -le 8; do + if test $RC = 2 -a "$RMB" != "1"; then echo -n "."; let $LN+=1; sleep 1 +- else usleep 20000; fi ++ else sleep 0.02; fi + let ctr+=1 + sg_turs /dev/$SGDEV >/dev/null 2>&1 + RC=$? +@@ -352,7 +352,7 @@ + /sbin/udevadm settle + white_out + else +- usleep 20000 ++ sleep 0.02 + fi + } + +@@ -388,7 +388,7 @@ + fi + # FIXME: Can we skip udevadm settle for removal? + #udevadm_settle +- usleep 20000 ++ sleep 0.02 + else + echo "scsi remove-single-device $devnr" > /proc/scsi/scsi + if test $RC -eq 1 -o $lun -eq 0 ; then diff -Nru scsitools-0.12/debian/patches/series scsitools-0.12/debian/patches/series --- scsitools-0.12/debian/patches/series 2011-01-10 22:53:41.000000000 +0100 +++ scsitools-0.12/debian/patches/series 2011-12-07 17:25:06.000000000 +0100 @@ -2,3 +2,4 @@ sraw.patch rescan-scsi-bus.patch scsidev.patch +rescan-scsi-bus_sleep.patch
signature.asc
Description: Digital signature