![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package linuxrc checked in at Mon Sep 22 13:03:42 CEST 2008. -------- --- linuxrc/linuxrc.changes 2008-09-17 14:01:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2008-09-19 16:31:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 19 16:31:51 CEST 2008 - uli@suse.de + +- s390: fixed flaky net device name detection (bnc #427475) +- s390: don't ask for network parameters twice + +------------------------------------------------------------------- Old: ---- linuxrc-3.3.4.tar.bz2 New: ---- linuxrc-3.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.Y19103/_old 2008-09-22 13:03:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Y19103/_new 2008-09-22 13:03:09.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.3.4) +# spec file for package linuxrc (Version 3.3.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.3.4 +Version: 3.3.5 Release: 1 -Source: linuxrc-3.3.4.tar.bz2 +Source: linuxrc-3.3.5.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +61,9 @@ %doc linuxrc.html %changelog +* Fri Sep 19 2008 uli@suse.de +- s390: fixed flaky net device name detection (bnc #427475) +- s390: don't ask for network parameters twice * Wed Sep 17 2008 snwint@suse.de - s390: don't loop over net config, return error instead (prevents inconsistency in workflow on error) ++++++ linuxrc-3.3.4.tar.bz2 -> linuxrc-3.3.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.4/auto2.c new/linuxrc-3.3.5/auto2.c --- old/linuxrc-3.3.4/auto2.c 2008-07-25 12:27:10.000000000 +0200 +++ new/linuxrc-3.3.5/auto2.c 2008-09-19 15:24:02.000000000 +0200 @@ -434,12 +434,7 @@ */ if(config.url.install->is.network) { #if defined(__s390__) || defined(__s390x__) - static int as3d = 0; - - if(!as3d) { - as3d = 1; - if(net_activate_s390_devs()) return 0; - } + if(!config.net.is_configured && net_activate_s390_devs()) return 0; #endif if((config.net.do_setup & DS_SETUP)) auto2_user_netconfig(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.4/Changelog new/linuxrc-3.3.5/Changelog --- old/linuxrc-3.3.4/Changelog 2008-09-17 14:00:56.000000000 +0200 +++ new/linuxrc-3.3.5/Changelog 2008-09-19 16:31:29.000000000 +0200 @@ -1,3 +1,7 @@ +19/9/2008: v3.3.5 + - s390: fixed flaky net device name detection (bnc #427475) + - s390: don't ask for network parameters twice + 17/9/2008: v3.3.4 - s390: don't loop over net config, return error instead (prevents inconsistency in workflow on error) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.4/DEADJOE new/linuxrc-3.3.5/DEADJOE --- old/linuxrc-3.3.4/DEADJOE 1970-01-01 01:00:00.000000000 +0100 +++ new/linuxrc-3.3.5/DEADJOE 2008-09-10 10:08:44.000000000 +0200 @@ -0,0 +1,30 @@ + +*** These modified files were found in JOE when it aborted on Wed Sep 10 10:25:44 2008 +*** JOE was aborted by UNIX signal 15 + +*** File '(Unnamed)' +net_s390_get_ifname +qdio +net_s390_qdio_portname +no network if +"ctc" +/* OSA +mod_modprobe +zfcp_confi +zfcp +configure +_ex( +device + +*** File '(Unnamed)' +net.c +net.c +net.c +Changelog +net.c +net.c +initrd.file_list +Changelog +Changelog +net.c +net.c diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.4/net.c new/linuxrc-3.3.5/net.c --- old/linuxrc-3.3.4/net.c 2008-09-17 12:13:13.000000000 +0200 +++ new/linuxrc-3.3.5/net.c 2008-09-19 14:43:41.000000000 +0200 @@ -1177,6 +1177,7 @@ if(config.manual >= 2) { #if defined(__s390__) || defined(__s390x__) /* bring up network devices, write hwcfg */ + fprintf(stderr, "activate s390 devs 1\n"); if(net_activate_s390_devs()) return 1; #endif @@ -1290,6 +1291,7 @@ if(choice > 0 && !item_devs[choice - 1]) { #if defined(__s390__) || defined(__s390x__) + fprintf(stderr, "activate s390 devs 2\n"); net_activate_s390_devs_ex(item_hds[choice - 1], &item_devs[choice - 1]); if(!item_devs[choice - 1]) { #endif @@ -2190,7 +2192,8 @@ d = opendir(path); if(!d) return -1; while((e = readdir(d))) { - fprintf(stderr, "ccwgroup %s has network IF %s\n", channel, e->d_name + 4); + if(e->d_name[0] == '.') continue; + fprintf(stderr, "ccwgroup %s has network IF %s\n", channel, e->d_name); strprintf(device, e->d_name); closedir(d); return 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.4/svn-commit.tmp new/linuxrc-3.3.5/svn-commit.tmp --- old/linuxrc-3.3.4/svn-commit.tmp 1970-01-01 01:00:00.000000000 +0100 +++ new/linuxrc-3.3.5/svn-commit.tmp 2008-07-29 14:37:51.000000000 +0200 @@ -0,0 +1,5 @@ + +--This line, and those below, will be ignored-- + +M Changelog +M net.c diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.4/VERSION new/linuxrc-3.3.5/VERSION --- old/linuxrc-3.3.4/VERSION 2008-09-17 12:13:25.000000000 +0200 +++ new/linuxrc-3.3.5/VERSION 2008-09-19 16:31:31.000000000 +0200 @@ -1 +1 @@ -3.3.4 +3.3.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de