Hello community, here is the log from the commit of package linuxrc checked in at Fri Apr 28 21:13:15 CEST 2006. -------- --- linuxrc/linuxrc.changes 2006-04-25 16:22:12.000000000 +0200 +++ STABLE/linuxrc/linuxrc.changes 2006-04-27 15:59:00.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 27 15:58:58 CEST 2006 - snwint@suse.de + +- wait for usb-stor-scan to finish (#168983) + +------------------------------------------------------------------- Old: ---- linuxrc-2.0.36.tar.bz2 New: ---- linuxrc-2.0.37.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.D3HC4a/_old 2006-04-28 21:13:11.000000000 +0200 +++ /var/tmp/diff_new_pack.D3HC4a/_new 2006-04-28 21:13:11.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 2.0.36) +# spec file for package linuxrc (Version 2.0.37) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,9 +16,9 @@ Group: System/Boot Autoreqprov: on Summary: SUSE Installation Program -Version: 2.0.36 -Release: 1 -Source: linuxrc-2.0.36.tar.bz2 +Version: 2.0.37 +Release: 2 +Source: linuxrc-2.0.37.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,8 @@ %doc linuxrc.html %changelog -n linuxrc +* Thu Apr 27 2006 - snwint@suse.de +- wait for usb-stor-scan to finish (#168983) * Tue Apr 25 2006 - uli@suse.de - s390: fixed zfcp_disk_configure parameters (bug #162954) * Fri Apr 21 2006 - snwint@suse.de ++++++ linuxrc-2.0.36.tar.bz2 -> linuxrc-2.0.37.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.36/Changelog new/linuxrc-2.0.37/Changelog --- old/linuxrc-2.0.36/Changelog 2006-04-25 16:17:08.000000000 +0200 +++ new/linuxrc-2.0.37/Changelog 2006-04-27 15:34:36.000000000 +0200 @@ -1,3 +1,6 @@ +27/4/2006: v2.0.37 + - wait for usb-stor-scan to finish (#168983) + 25/4/2006: v2.0.36 - s390: fixed zfcp_disk_configure parameters (bug #162954) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.36/VERSION new/linuxrc-2.0.37/VERSION --- old/linuxrc-2.0.36/VERSION 2006-04-25 16:17:08.000000000 +0200 +++ new/linuxrc-2.0.37/VERSION 2006-04-27 15:34:40.000000000 +0200 @@ -1 +1 @@ -2.0.36 +2.0.37 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.36/auto2.c new/linuxrc-2.0.37/auto2.c --- old/linuxrc-2.0.36/auto2.c 2006-03-27 13:56:25.000000000 +0200 +++ new/linuxrc-2.0.37/auto2.c 2006-04-27 15:33:34.000000000 +0200 @@ -184,7 +184,13 @@ if(config.usbwait > 0) sleep(config.usbwait); if(with_usb) { + int max_wait = 30; + mod_modprobe("usb-storage", NULL); + do { + sleep(1); + } while(max_wait-- && util_process_running("usb-stor-scan")); + if(config.usbwait > 0) sleep(config.usbwait); hd_free_hd_list(hd_list(hd_data, hw_usb, 1, NULL)); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.36/util.c new/linuxrc-2.0.37/util.c --- old/linuxrc-2.0.36/util.c 2006-04-19 14:43:30.000000000 +0200 +++ new/linuxrc-2.0.37/util.c 2006-04-26 16:24:55.000000000 +0200 @@ -4710,3 +4710,24 @@ } +int util_process_running(char *name) +{ + pid_t pid; + struct dirent *de; + DIR *d; + char *s; + + if(!name) return 0; + + if(!(d = opendir("/proc"))) return 0; + + while((de = readdir(d))) { + pid = strtoul(de->d_name, &s, 10); + if(!*s && !strcmp(util_process_name(pid), name)) break; + } + + closedir(d); + + return de ? 1 : 0; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.0.36/util.h new/linuxrc-2.0.37/util.h --- old/linuxrc-2.0.36/util.h 2006-03-27 13:56:24.000000000 +0200 +++ new/linuxrc-2.0.37/util.h 2006-04-26 16:25:13.000000000 +0200 @@ -152,4 +152,5 @@ int util_read_and_chop(char* path, char* dst); char *get_translation(slist_t *trans, char *locale); +int util_process_running(char *name); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...