Hello community, here is the log from the commit of package linuxrc checked in at Wed Sep 24 17:10:40 CEST 2008. -------- --- linuxrc/linuxrc.changes 2008-09-19 16:31:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2008-09-23 16:42:14.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 23 16:42:14 CEST 2008 - snwint@suse.de + +- added 'supporturl' option (fate #305180) + +------------------------------------------------------------------- +Mon Sep 22 13:32:42 CEST 2008 - uli@suse.de + +- s390: added second port support for OSA 3/ATM (fate #304080) + +------------------------------------------------------------------- Old: ---- linuxrc-3.3.5.tar.bz2 New: ---- linuxrc-3.3.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.A27400/_old 2008-09-24 17:10:27.000000000 +0200 +++ /var/tmp/diff_new_pack.A27400/_new 2008-09-24 17:10:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.3.5) +# spec file for package linuxrc (Version 3.3.7) # # 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.5 +Version: 3.3.7 Release: 1 -Source: linuxrc-3.3.5.tar.bz2 +Source: linuxrc-3.3.7.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +61,10 @@ %doc linuxrc.html %changelog +* Tue Sep 23 2008 snwint@suse.de +- added 'supporturl' option (fate #305180) +* Mon Sep 22 2008 uli@suse.de +- s390: added second port support for OSA 3/ATM (fate #304080) * Fri Sep 19 2008 uli@suse.de - s390: fixed flaky net device name detection (bnc #427475) - s390: don't ask for network parameters twice ++++++ linuxrc-3.3.5.tar.bz2 -> linuxrc-3.3.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.5/Changelog new/linuxrc-3.3.7/Changelog --- old/linuxrc-3.3.5/Changelog 2008-09-19 16:31:29.000000000 +0200 +++ new/linuxrc-3.3.7/Changelog 2008-09-23 15:29:39.000000000 +0200 @@ -1,3 +1,9 @@ +23/9/2008: v3.3.7 + - added 'supporturl' option (fate #305180) + +22/9/2008: v3.3.6 + - s390: added second port support for OSA 3/ATM (fate #304080) + 19/9/2008: v3.3.5 - s390: fixed flaky net device name detection (bnc #427475) - s390: don't ask for network parameters twice diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.5/DEADJOE new/linuxrc-3.3.7/DEADJOE --- old/linuxrc-3.3.5/DEADJOE 2008-09-10 10:08:44.000000000 +0200 +++ new/linuxrc-3.3.7/DEADJOE 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ - -*** 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.5/file.c new/linuxrc-3.3.7/file.c --- old/linuxrc-3.3.5/file.c 2008-09-16 17:51:56.000000000 +0200 +++ new/linuxrc-3.3.7/file.c 2008-09-23 15:28:19.000000000 +0200 @@ -297,6 +297,7 @@ { key_usesax2, "UseSax2", kf_cfg + kf_cmd }, { key_usesax2, "Sax2", kf_cfg + kf_cmd }, { key_efi, "EFI", kf_cfg + kf_cmd }, + { key_supporturl, "supporturl", kf_cfg + kf_cmd }, }; static struct { @@ -1530,6 +1531,10 @@ if(f->is.numeric) config.efi = f->nvalue; break; + case key_supporturl: + str_copy(&config.supporturl, f->value); + break; + default: break; } @@ -1899,6 +1904,8 @@ file_write_str(f, key_yepurl, config.yepurl); file_write_str(f, key_yepcert, config.yepcert); + file_write_str(f, key_supporturl, config.supporturl); + file_free_file(ft0); /* resolve module deps for initrd module list */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.5/file.h new/linuxrc-3.3.7/file.h --- old/linuxrc-3.3.5/file.h 2008-09-02 11:45:59.000000000 +0200 +++ new/linuxrc-3.3.7/file.h 2008-09-23 15:27:14.000000000 +0200 @@ -49,7 +49,7 @@ key_sha1, key_insecure, key_kexec, key_nisdomain, key_nomodprobe, key_device, key_nomdns, key_yepurl, key_yepcert, key_mediacheck, key_y2gdb, key_squash, key_kexec_reboot, key_devbyid, key_braille, key_nfsopts, key_ipv4, key_ipv4only, - key_ipv6, key_ipv6only, key_usesax2, key_efi + key_ipv6, key_ipv6only, key_usesax2, key_efi, key_supporturl } file_key_t; typedef enum { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.5/global.h new/linuxrc-3.3.7/global.h --- old/linuxrc-3.3.5/global.h 2008-09-02 11:45:59.000000000 +0200 +++ new/linuxrc-3.3.7/global.h 2008-09-23 15:28:50.000000000 +0200 @@ -364,6 +364,7 @@ char *autoyast; /* yast autoinstall parameter */ char *yepurl; /* just pass it to yast */ char *yepcert; /* just pass it to yast */ + char *supporturl; /* just pass it to yast */ slist_t *linuxrc; /* 'linuxrc' parameters */ char *stderr_name; /* stderr device name */ int color; /* color scheme: 0-3: undef, mono, color, alternate */ @@ -584,6 +585,7 @@ int interface; int medium; int layer2; + int portno; } hwp; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.5/net.c new/linuxrc-3.3.7/net.c --- old/linuxrc-3.3.5/net.c 2008-09-19 14:43:41.000000000 +0200 +++ new/linuxrc-3.3.7/net.c 2008-09-23 11:47:13.000000000 +0200 @@ -2355,6 +2355,16 @@ } else rc=config.hwp.medium; + + IFNOTAUTO(config.hwp.portno) + { + if(hd && hd->is.dualport) + { + char* port = NULL; + if((rc=dia_input2_chopspace(txt_get(TXT_OSA_PORTNO), &port,2,0))) return rc; + config.hwp.portno = atoi(port) + 1; + } + } } if(config.hwp.interface == di_osa_qdio) @@ -2407,6 +2417,7 @@ } char cmd[256]; + char* ccmd = cmd; switch(config.hwp.type) { case di_390net_iucv: /* add netiucv to MODULES_LOADED_ON_BOOT */ @@ -2429,7 +2440,10 @@ break; case di_390net_hsi: case di_390net_osa: - sprintf(cmd, "qeth_configure %s %s %s %s %s %s 1", + ccmd += sprintf(ccmd, "qeth_configure "); + if(config.hwp.portno) + ccmd += sprintf(ccmd, "-n %d ", config.hwp.portno - 1); + ccmd += sprintf(ccmd, "%s %s %s %s %s %s 1", config.hwp.portname ? "-p" : "", config.hwp.portname ? config.hwp.portname : "", config.hwp.layer2 == 2 ? "-l" : "", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.5/svn-commit.tmp new/linuxrc-3.3.7/svn-commit.tmp --- old/linuxrc-3.3.5/svn-commit.tmp 2008-07-29 14:37:51.000000000 +0200 +++ new/linuxrc-3.3.7/svn-commit.tmp 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ - ---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.5/VERSION new/linuxrc-3.3.7/VERSION --- old/linuxrc-3.3.5/VERSION 2008-09-19 16:31:31.000000000 +0200 +++ new/linuxrc-3.3.7/VERSION 2008-09-23 15:28:54.000000000 +0200 @@ -1 +1 @@ -3.3.5 +3.3.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org