Re: [SRM] Seeking approval for hw-detect changes for 6.0.1
On Sun, Feb 20, 2011 at 04:42:19PM +0000, Jurij Smakov wrote:
> Hello,
>
> We would like to push the following changes to 6.0.1 to fix a problem
> with not waiting long enough for SCSI subsystem to be initialized, and
> disk detection failing in d-i on the first try as a result. These have
> been committed to the hw-detect squeeze brance:
Ping, any opinions on this?
Best regards,
> http://git.debian.org/?p=d-i/hw-detect.git;a=shortlog;h=refs/heads/squeeze
>
> >From 50435e2136ac15d0ca4cba0852b55b37cd888368 Mon Sep 17 00:00:00 2001
> From: Jurij Smakov <jurij@debian.org>
> Date: Sat, 19 Feb 2011 23:36:51 +0000
> Subject: [PATCH 1/2] Increase the number of retries in disk_found() of disk-detect.sh
>
> Increase the number of attempts to detect the new disk devices in
> disk_found() of disk-detect.sh to 15, bringing the total waiting
> time to 28 seconds. Current timeout of 4 seconds is not sufficient for
> some SCSI subsystems with long driver/disk initialization time.
> ---
> debian/changelog | 10 ++++++++++
> disk-detect.sh | 4 ++--
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index 1a4200b..4624394 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,13 @@
> +hw-detect (1.84squeeze1) UNRELEASED; urgency=low
> +
> + * Increase the number of attempts to detect the new disk devices in
> + disk_found() of disk-detect.sh to 15, bringing the total waiting time
> + to 28 seconds. Current timeout of 4 seconds is not sufficient for
> + some SCSI subsystems with long driver/disk initialization time.
> + Closes: #611314
> +
> + -- Jurij Smakov <jurij@debian.org> Sun, 20 Feb 2011 16:09:35 +0000
> +
> hw-detect (1.84) unstable; urgency=low
>
> [ Joey Hess ]
> diff --git a/disk-detect.sh b/disk-detect.sh
> index b0fc600..e2641de 100755
> --- a/disk-detect.sh
> +++ b/disk-detect.sh
> @@ -34,7 +34,7 @@ list_disk_modules() {
> }
>
> disk_found() {
> - for try in 1 2 3; do
> + for try in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
> if search-path parted_devices; then
> # Use partman's parted_devices if available.
> if [ -n "$(parted_devices)" ]; then
> @@ -49,7 +49,7 @@ disk_found() {
> fi
>
> # Wait for disk to be activated.
> - if [ "$try" != 3 ]; then
> + if [ "$try" != 15 ]; then
> sleep 2
> fi
> done
> --
> 1.7.2.3
>
>
> >From d6eb1aaad16f61c6d1bd905c9145f19e892b4c7d Mon Sep 17 00:00:00 2001
> From: Jurij Smakov <jurij@debian.org>
> Date: Sun, 20 Feb 2011 16:28:53 +0000
> Subject: [PATCH 2/2] Add plus to version number as recommended by dev reference.
>
> ---
> debian/changelog | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/debian/changelog b/debian/changelog
> index 4624394..e82e497 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,4 +1,4 @@
> -hw-detect (1.84squeeze1) UNRELEASED; urgency=low
> +hw-detect (1.84+squeeze1) UNRELEASED; urgency=low
>
> * Increase the number of attempts to detect the new disk devices in
> disk_found() of disk-detect.sh to 15, bringing the total waiting time
> --
> 1.7.2.3
>
> Best regards,
> --
> Jurij Smakov jurij@wooyd.org
> Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CC
>
>
> --
> To UNSUBSCRIBE, email to debian-release-REQUEST@lists.debian.org
> with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
> Archive: [🔎] 20110220164219.GA3155@droopy.oc.cox.net">http://lists.debian.org/[🔎] 20110220164219.GA3155@droopy.oc.cox.net
--
Jurij Smakov jurij@wooyd.org
Key: http://www.wooyd.org/pgpkey/ KeyID: C99E03CC
Reply to: