Hello community, here is the log from the commit of package linuxrc checked in at Mon Sep 15 18:36:14 CEST 2008. -------- --- linuxrc/linuxrc.changes 2008-09-01 18:12:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2008-09-15 18:02:43.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 15 18:02:39 CEST 2008 - snwint@suse.de + +- s390: remove old network setup code +- s390: pass layer2, portname to qeth_configure +- add ZyppRepoURL to install.inf (bnc #406162) + +------------------------------------------------------------------- Old: ---- linuxrc-3.3.2.tar.bz2 New: ---- linuxrc-3.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.U29617/_old 2008-09-15 18:35:24.000000000 +0200 +++ /var/tmp/diff_new_pack.U29617/_new 2008-09-15 18:35:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.3.2) +# spec file for package linuxrc (Version 3.3.3) # # 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.2 +Version: 3.3.3 Release: 1 -Source: linuxrc-3.3.2.tar.bz2 +Source: linuxrc-3.3.3.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +61,10 @@ %doc linuxrc.html %changelog +* Mon Sep 15 2008 snwint@suse.de +- s390: remove old network setup code +- s390: pass layer2, portname to qeth_configure +- add ZyppRepoURL to install.inf (bnc #406162) * Mon Sep 01 2008 snwint@suse.de - load 'efivars' module - added 'efi' option ++++++ linuxrc-3.3.2.tar.bz2 -> linuxrc-3.3.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.2/Changelog new/linuxrc-3.3.3/Changelog --- old/linuxrc-3.3.2/Changelog 2008-09-01 18:11:10.000000000 +0200 +++ new/linuxrc-3.3.3/Changelog 2008-09-15 18:02:27.000000000 +0200 @@ -1,3 +1,8 @@ +15/9/2008: v3.3.3 + - s390: remove old network setup code + - s390: pass layer2, portname to qeth_configure + - add ZyppRepoURL to install.inf (bnc #406162) + 1/9/2008: v3.3.2 - load 'efivars' module - added 'efi' option diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.2/file.c new/linuxrc-3.3.3/file.c --- old/linuxrc-3.3.2/file.c 2008-09-01 15:15:25.000000000 +0200 +++ new/linuxrc-3.3.3/file.c 2008-09-15 18:01:54.000000000 +0200 @@ -1706,6 +1706,7 @@ fprintf(f, "RepoURL: %s\n", url_print(url, 3)); fprintf(f, "InstsysURL: %s\n", url_print(config.url.instsys, 3)); + fprintf(f, "xxxZyppRepoURL: %s\n", url_print(url, 4)); file_write_str(f, key_instmode, get_instmode_name(url->scheme)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.2/net.c new/linuxrc-3.3.3/net.c --- old/linuxrc-3.3.2/net.c 2008-08-18 11:28:57.000000000 +0200 +++ new/linuxrc-3.3.3/net.c 2008-09-08 16:13:32.000000000 +0200 @@ -2144,14 +2144,6 @@ return -1; } -/* set config variables common to CCW devices */ -static void net_s390_set_config_ccwdev() -{ - config.hwp.scriptup="hwup-ccw"; - config.hwp.scriptup_ccw="hwup-ccw"; - config.hwp.scriptdown="hwdown-ccw"; -} - /* ask user for read and write channels */ static int net_s390_getrwchans_ex(hd_t* hd) { @@ -2183,116 +2175,6 @@ } #endif -/* group CCW channels */ -static int net_s390_group_chans(int num, char* driver) -{ - int rc; - char devs[8*3+1*3+1]; /* three channel addresses, commas/LF, zero */ - char path[100]; - - fprintf(stderr,"grouping %d channels for driver %s\n",num,driver); - - if(num==2) - sprintf(devs,"%s,%s\n",config.hwp.readchan,config.hwp.writechan); - else if(num==3) - sprintf(devs,"%s,%s,%s\n",config.hwp.readchan,config.hwp.writechan,config.hwp.datachan); - else - return -1; - - sprintf(path,"/sys/bus/ccwgroup/drivers/%s/group",driver); - if((rc=util_set_sysfs_attr(path,devs))) return rc; - sprintf(path,"/sys/bus/ccwgroup/devices/%s", config.hwp.readchan); - if((rc=hotplug_wait_for_path(path))) return rc; - return 0; -} - -/* set protocol */ -static int net_s390_ctc_protocol(int protocol) -{ - char devpath[256]; - char proto_value[3]; - int rc; - - fprintf(stderr,"setting CTC protocol to %d\n",protocol); - - sprintf(devpath,"/sys/bus/ccwgroup/devices/%s/protocol", - config.hwp.readchan); - sprintf(proto_value,"%d", protocol); - rc=util_set_sysfs_attr(devpath,proto_value); - - return rc; -} - -/* set port number */ -static int net_s390_lcs_portno(char *portno) -{ - char devpath[256]; - int rc = 0; - - fprintf(stderr, "setting LCS port number to %s\n",portno); - - if (portno && strlen(portno) > 0) { - sprintf(devpath,"/sys/bus/ccwgroup/devices/%s/portno", - config.hwp.readchan); - rc=util_set_sysfs_attr(devpath,portno); - } - - return rc; -} - -/* set portname */ -static int net_s390_qdio_portname(char *portname) -{ - char devpath[256]; - int rc = 0; - - fprintf(stderr, "setting QDIO portname to %s\n",portname); - - if(portname && strlen(portname) > 0) - { - sprintf(devpath,"/sys/bus/ccwgroup/devices/%s/portname", - config.hwp.readchan); - rc=util_set_sysfs_attr(devpath,portname); - } - - return rc; -} - -/* enable layer2 support */ -static int net_s390_enable_layer2(int enable) -{ - char devpath[256]; - char value[10]; - - fprintf(stderr, "setting layer2 support to %d\n",enable); - - sprintf(devpath,"/sys/bus/ccwgroup/devices/%s/layer2", - config.hwp.readchan); - sprintf(value,"%d",enable); - return util_set_sysfs_attr(devpath,value); -} - -/* put device online */ -static int net_s390_put_online(char* channel) -{ - int rc; - char path[256]; - int online; - - fprintf(stderr, "putting device %s online\n",channel); - - if (!channel || !strlen(channel)) - return 1; - sprintf(path,"/sys/bus/ccwgroup/devices/%s/online",channel); - if((rc=util_set_sysfs_attr(path,"1"))) return rc; - rc=util_get_sysfs_int_attr(path,&online); - fprintf(stderr,"grmtob: %d/%d\n",rc,online); - if(rc) return rc; - if (online == 0) - return 1; - return 0; -} - int net_activate_s390_devs(void) { return net_activate_s390_devs_ex(NULL, NULL); @@ -2386,15 +2268,6 @@ return -1; } - if((rc=util_set_sysfs_attr("/sys/bus/iucv/drivers/netiucv/connection",config.hwp.userid))) return rc; - - sprintf(hwcfg_name,"static-iucv-id-%s",config.hwp.userid); - config.hwp.module="netiucv"; - config.hwp.scriptup="hwup-iucv"; - - /* bold assumption */ - if(device) strprintf(device, "iucv0"); - break; case di_390net_ctc: @@ -2434,25 +2307,6 @@ } } - if((rc=net_s390_group_chans(2,"ctc"))) return rc; - - /* set protocol */ - if ((rc=net_s390_ctc_protocol(config.hwp.protocol-1))) return rc; - - if((rc=net_s390_put_online(config.hwp.readchan))) { - fprintf(stderr,"Could not activate device\n"); - return rc; - } - net_s390_set_config_ccwdev(); - sprintf(hwcfg_name, "ctc-bus-ccw-%s",config.hwp.readchan); - config.hwp.module="ctcm"; - config.hwp.scriptup_ccwgroup="hwup-ctc"; - config.hwp.ccw_chan_num=2; - strprintf(&config.hwp.ccw_chan_ids,"%s %s",config.hwp.readchan,config.hwp.writechan); - sprintf(chanlist, "%s,%s", config.hwp.readchan, config.hwp.writechan); - - if(device) net_s390_get_ifname(config.hwp.readchan, device); - break; case di_390net_osa: @@ -2528,21 +2382,6 @@ } } - if((rc=net_s390_group_chans(3,"qeth"))) return rc; - - if((rc=net_s390_qdio_portname(config.hwp.portname))) return rc; - - if(config.hwp.layer2 == 2) if((rc=net_s390_enable_layer2(1))) return rc; - - if((rc=net_s390_put_online(config.hwp.readchan))) return rc; - - sprintf(hwcfg_name, "qeth-bus-ccw-%s",config.hwp.readchan); - config.hwp.module="qeth"; - net_s390_set_config_ccwdev(); - config.hwp.scriptup_ccwgroup="hwup-qeth"; - strprintf(&config.hwp.ccw_chan_ids,"%s %s %s",config.hwp.readchan,config.hwp.writechan,config.hwp.datachan); - sprintf(chanlist, "%s,%s,%s", config.hwp.readchan, config.hwp.writechan, config.hwp.datachan); - config.hwp.ccw_chan_num=3; } else /* LCS */ { @@ -2556,24 +2395,8 @@ IFNOTAUTO(config.hwp.portname) if((rc=dia_input2_chopspace(txt_get(TXT_OSA_PORTNO), &config.hwp.portname,9,0))) return rc; - if((rc=net_s390_group_chans(2,"lcs"))) return rc; - - /* set port number */ - if((rc=net_s390_lcs_portno(config.hwp.portname))) return rc; - - if((rc=net_s390_put_online(config.hwp.readchan))) return rc; - - net_s390_set_config_ccwdev(); - sprintf(hwcfg_name, "lcs-bus-ccw-%s",config.hwp.readchan); - config.hwp.module="lcs"; - config.hwp.scriptup_ccwgroup="hwup-lcs"; - config.hwp.ccw_chan_num=2; - strprintf(&config.hwp.ccw_chan_ids,"%s %s",config.hwp.readchan,config.hwp.writechan); - sprintf(chanlist, "%s,%s", config.hwp.readchan, config.hwp.writechan); } - if(device) net_s390_get_ifname(config.hwp.readchan, device); - break; default: @@ -2603,7 +2426,13 @@ break; case di_390net_hsi: case di_390net_osa: - sprintf(cmd, "qeth_configure %s %s %s 1", config.hwp.readchan, config.hwp.writechan, config.hwp.datachan); + sprintf(cmd, "qeth_configure %s %s %s %s %s %s 1", + config.hwp.portname ? "-p" : "", + config.hwp.portname ? config.hwp.portname : "", + config.hwp.layer2 == 2 ? "-l" : "", + config.hwp.readchan, + config.hwp.writechan, + config.hwp.datachan); break; default: sprintf(cmd, "unknown s390 network type %d", config.hwp.type); @@ -2618,6 +2447,12 @@ return -1; } + if (device) { + if (config.hwp.type == di_390net_iucv) + strprintf(device, "iucv0"); /* bold assumption */ + else + net_s390_get_ifname(config.hwp.readchan, device); + } //net_ask_hostname(); /* not sure if this is the best place; ssh login does not work if the hostname is not correct */ return 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.2/url.c new/linuxrc-3.3.3/url.c --- old/linuxrc-3.3.2/url.c 2008-07-23 15:38:39.000000000 +0200 +++ new/linuxrc-3.3.3/url.c 2008-09-08 17:07:50.000000000 +0200 @@ -62,6 +62,7 @@ static slist_t *url_config_get_file_list(char *entry); static hd_t *sort_a_bit(hd_t *hd_list); static int link_detected(hd_t *hd); +static char *url_print_zypp(url_t *url); void url_read(url_data_t *url_data) @@ -636,6 +637,7 @@ * 1: without query part * 2: with device * 3: like 2, but remove 'rel:' scheme + * 4: in zypp format */ char *url_print(url_t *url, int format) { @@ -649,6 +651,8 @@ if(!url) return buf; + if(format == 4) return url_print_zypp(url); + if(format != 3 || url->scheme != inst_rel) { strprintf(&buf, "%s:", get_instmode_name(url->scheme)); } @@ -717,6 +721,82 @@ } +char *url_print_zypp(url_t *url) +{ + static char *buf = NULL, *s; + int q = 0, scheme; + + // printf("start buf = %p\n", buf); + // LXRC_WAIT + + str_copy(&buf, NULL); + + scheme = url->scheme; + + if(scheme == inst_disk) { + scheme = url->is.cdrom ? inst_cdrom : inst_hd; + } + + if( + scheme != inst_hd || + scheme != inst_cdrom || + scheme != inst_file || + scheme != inst_ftp || + scheme != inst_http || + scheme != inst_nfs || + scheme != inst_smb || + scheme != inst_tftp + ) return buf; + + strprintf(&buf, "%s:", get_instmode_name(scheme)); + + if(url->domain || url->user || url->password || url->server || url->port) { + strprintf(&buf, "%s//", buf); + if(url->domain) strprintf(&buf, "%s%s;", buf, url->domain); + if(url->user) { + s = curl_easy_escape(NULL, url->user, 0); + strprintf(&buf, "%s%s", buf, s); + curl_free(s); + } + if(url->password) { + s = curl_easy_escape(NULL, url->password, 0); + strprintf(&buf, "%s:%s", buf, s); + curl_free(s); + } + if(url->user || url->password) strprintf(&buf, "%s@", buf); + if(url->server) { + if(strchr(url->server, ':')) { + strprintf(&buf, "%s[%s]", buf, url->server); + } + else { + strprintf(&buf, "%s%s", buf, url->server); + } + } + if(url->port) strprintf(&buf, "%s:%u", buf, url->port); + } + + if(url->share) strprintf(&buf, "%s/%s", buf, url->share); + if(url->path) { + strprintf(&buf, "%s/%s%s", + buf, + url->scheme == inst_ftp && *url->path == '/' ? "%2F" : "", + *url->path == '/' ? url->path + 1 : url->path + ); + } + + if(url->scheme == inst_hd) { + if((s = url->used.device) || (s = url->device)) { + strprintf(&buf, "%s%cdevice=%s", buf, q++ ? '&' : '?', long_dev(s)); + } + } + + // printf("end buf = %p\n", buf); + // LXRC_WAIT + + return buf; +} + + url_t *url_free(url_t *url) { if(url) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.2/VERSION new/linuxrc-3.3.3/VERSION --- old/linuxrc-3.3.2/VERSION 2008-09-01 14:44:40.000000000 +0200 +++ new/linuxrc-3.3.3/VERSION 2008-09-08 16:13:47.000000000 +0200 @@ -1 +1 @@ -3.3.2 +3.3.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org