Hello community, here is the log from the commit of package linuxrc checked in at Mon Sep 10 12:39:57 CEST 2007. -------- --- linuxrc/linuxrc.changes 2007-09-03 19:22:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2007-09-07 17:29:04.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 7 17:29:01 CEST 2007 - snwint@suse.de + +- 'netdevice' option is back (#304268) +- added 'device' option (replaces 'partition' and 'cdromdev') + +------------------------------------------------------------------- Old: ---- linuxrc-3.0.14.tar.bz2 New: ---- linuxrc-3.0.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.j10184/_old 2007-09-10 12:39:24.000000000 +0200 +++ /var/tmp/diff_new_pack.j10184/_new 2007-09-10 12:39:24.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.0.14) +# spec file for package linuxrc (Version 3.0.15) # # Copyright (c) 2007 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: 3.0.14 +Version: 3.0.15 Release: 1 -Source: linuxrc-3.0.14.tar.bz2 +Source: linuxrc-3.0.15.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,9 @@ %doc linuxrc.html %changelog +* Fri Sep 07 2007 - snwint@suse.de +- 'netdevice' option is back (#304268) +- added 'device' option (replaces 'partition' and 'cdromdev') * Mon Sep 03 2007 - snwint@suse.de - enable modprobe all the time (#303728) - write blacklist for modprobe ++++++ linuxrc-3.0.14.tar.bz2 -> linuxrc-3.0.15.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/auto2.c new/linuxrc-3.0.15/auto2.c --- old/linuxrc-3.0.14/auto2.c 2007-08-30 16:49:36.000000000 +0200 +++ new/linuxrc-3.0.15/auto2.c 2007-09-07 16:22:38.000000000 +0200 @@ -429,6 +429,7 @@ if((net_config_mask() & 3) == 3) { /* we have ip & netmask */ config.net.configured = nc_static; /* looks a bit weird, but we need it here for net_activate_ns() */ + if(!config.net.device) str_copy(&config.net.device, config.netdevice); if(!config.net.device) { util_update_netdevice_list(NULL, 1); if(config.net.devices) str_copy(&config.net.device, config.net.devices->key); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/Changelog new/linuxrc-3.0.15/Changelog --- old/linuxrc-3.0.14/Changelog 2007-09-03 16:32:05.000000000 +0200 +++ new/linuxrc-3.0.15/Changelog 2007-09-07 16:55:38.000000000 +0200 @@ -1,3 +1,7 @@ +7/9/2007: v3.0.15 + - 'netdevice' option is back (#304268) + - added 'device' option (replaces 'partition' and 'cdromdev') + 3/9/2007: v3.0.14 - enable modprobe all the time (#303728) - write blacklist for modprobe diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/checkmd5.c new/linuxrc-3.0.15/checkmd5.c --- old/linuxrc-3.0.14/checkmd5.c 2005-08-17 15:17:38.000000000 +0200 +++ new/linuxrc-3.0.15/checkmd5.c 2007-09-07 16:51:49.000000000 +0200 @@ -39,28 +39,26 @@ void md5_verify() { int i; - slist_t *sl; char buf[256]; + hd_t *hd; - if(dia_message(txt_get(TXT_INSERT_CD_DVD), MSGTYPE_INFO)) return; + update_device_list(0); - get_info(long_dev(config.cdrom)); + iso.err = 1; - if(iso.err) { - get_info(long_dev(config.cdromdev)); - if(!iso.err) str_copy(&config.cdrom, config.cdromdev); + for(hd = hd_list(config.hd_data, hw_cdrom, 0, NULL); hd; hd = hd->next) { + if(hd->is.notready) continue; + get_info(hd->unix_dev_name); + if(!iso.err) break; } if(iso.err) { - util_update_cdrom_list(); - for(sl = config.cdroms; sl; sl = sl->next) { - if(config.cdrom && !strcmp(config.cdrom, sl->key)) continue; - if(config.cdromdev && !strcmp(config.cdromdev, sl->key)) continue; - get_info(long_dev(sl->key)); - if(!iso.err) { - str_copy(&config.cdrom, sl->key); - break; - } + if(dia_message(txt_get(TXT_INSERT_CD_DVD), MSGTYPE_INFO)) return; + + for(hd = hd_list(config.hd_data, hw_cdrom, 0, NULL); hd; hd = hd->next) { + if(hd->is.notready) continue; + get_info(hd->unix_dev_name); + if(!iso.err) break; } } @@ -88,7 +86,7 @@ return; } - do_md5(long_dev(config.cdrom)); + do_md5(hd->unix_dev_name); if(iso.err_ofs) { fprintf(stderr, " err: sector %u\n", iso.err_ofs >> 1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/file.c new/linuxrc-3.0.15/file.c --- old/linuxrc-3.0.14/file.c 2007-09-03 16:17:09.000000000 +0200 +++ new/linuxrc-3.0.15/file.c 2007-09-07 16:51:27.000000000 +0200 @@ -175,7 +175,7 @@ { key_setupnetif, "SetupNetIF", kf_cfg + kf_cmd }, { key_netconfig, "NetConfig", kf_none }, { key_noshell, "NoShell", kf_cfg + kf_cmd + kf_cmd_early }, - { key_cdromdevice, "CDROMDevice", kf_cfg + kf_cmd }, + { key_device, "CDROMDevice", kf_cfg + kf_cmd }, { key_consoledevice, "ConsoleDevice", kf_cfg + kf_cmd }, { key_product, "Product", kf_cfg + kf_cmd }, { key_productdir, "ProductDir", kf_cfg + kf_cmd }, @@ -269,6 +269,7 @@ { key_kexec, "kexec", kf_cfg + kf_cmd }, { key_nisdomain, "NISDomain", kf_dhcp }, { key_nomodprobe, "nomodprobe", kf_cfg + kf_cmd_early }, + { key_device, "Device", kf_cfg + kf_cmd }, }; static struct { @@ -661,17 +662,6 @@ } break; - case key_partition: - if(*f->value) str_copy(&config.partition, f->value); - break; - - case key_netdevice: - if(*f->value) { - str_copy(&config.net.device, f->value); - config.net.device_given = 1; - } - break; - case key_bootpwait: if(f->is.numeric) config.net.bootp_wait = f->nvalue; break; @@ -921,13 +911,6 @@ if(f->is.numeric) config.noshell = f->nvalue; break; - case key_cdromdevice: - str_copy( - &config.cdromdev, - strstr(f->value, "/dev/") == f->value ? f->value + sizeof "/dev/" - 1 : *f->value ? f->value : NULL - ); - break; - case key_consoledevice: if(*f->value) { if(!config.console || strcmp(config.console, f->value)) { @@ -1303,9 +1286,8 @@ case key_bootif: if(strlen(f->value) > 3) { - str_copy(&config.net.device, f->value + 3); - for(s = config.net.device; *s; s++) if(*s == '-') *s = ':'; - config.net.device_given = 1; + str_copy(&config.netdevice, f->value + 3); + for(s = config.netdevice; *s; s++) if(*s == '-') *s = ':'; } break; @@ -1344,6 +1326,15 @@ if(f->is.numeric) config.nomodprobe = f->nvalue; break; + case key_netdevice: + str_copy(&config.netdevice, short_dev(*f->value ? f->value : NULL)); + break; + + case key_partition: + case key_device: + str_copy(&config.device, short_dev(*f->value ? f->value : NULL)); + break; + default: break; } @@ -2236,6 +2227,8 @@ load_network_mods(); + if(!config.net.device) str_copy(&config.net.device, config.netdevice); + if(!config.net.device) { util_update_netdevice_list(NULL, 1); if(config.net.devices) str_copy(&config.net.device, config.net.devices->key); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/file.h new/linuxrc-3.0.15/file.h --- old/linuxrc-3.0.14/file.h 2007-09-03 16:14:41.000000000 +0200 +++ new/linuxrc-3.0.15/file.h 2007-09-05 16:37:58.000000000 +0200 @@ -27,7 +27,7 @@ key_sshpassword, key_term, key_addswap, key_aborted, key_netstop, key_exec, key_usbwait, key_nfsrsize, key_nfswsize, key_setupcmd, key_setupnetif, key_netconfig, key_usessh, key_noshell, key_hwdetect, - key_cdromdevice, key_consoledevice, key_product, key_productdir, + key_consoledevice, key_product, key_productdir, key_linuxrcstderr, key_comment, key_kbdtimeout, key_brokenmodules, key_scsibeforeusb, key_hostip, key_linemode, key_moduledelay, key_updatedir, key_scsirename, key_doscsirename, key_lxrcdebug, @@ -46,7 +46,7 @@ key_wlan_key_hex, key_wlan_key_pass, key_wlan_key_len, key_netcardname, key_ibft_hwaddr, key_ibft_ipaddr, key_ibft_netmask, key_ibft_gateway, key_ibft_dns, key_net_retry, key_bootif, key_swap_size, key_ntfs_3g, - key_sha1, key_insecure, key_kexec, key_nisdomain, key_nomodprobe + key_sha1, key_insecure, key_kexec, key_nisdomain, key_nomodprobe, key_device } file_key_t; typedef enum { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/global.h new/linuxrc-3.0.15/global.h --- old/linuxrc-3.0.14/global.h 2007-09-03 16:18:12.000000000 +0200 +++ new/linuxrc-3.0.15/global.h 2007-09-05 16:43:17.000000000 +0200 @@ -385,6 +385,8 @@ slist_t *sha1; /* sha1sum list */ char *kexec_kernel; /* kernel image for kexec */ char *kexec_initrd; /* initrd image for kexec */ + char *device; /* local device to use */ + char *netdevice; /* network interface to use */ struct { char *instsys_default; /* default instsys url */ @@ -477,7 +479,6 @@ struct { unsigned use_dhcp:1; /* use dhcp instead of bootp */ unsigned dhcp_active:1; /* dhcpd is running */ - unsigned device_given:1; /* netdevice explicity set in info file */ unsigned ifconfig:1; /* setup network interface */ unsigned is_configured:1; /* set if network is configured */ unsigned keep:1; /* keep network interface up */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/net.c new/linuxrc-3.0.15/net.c --- old/linuxrc-3.0.14/net.c 2007-08-31 16:02:33.000000000 +0200 +++ new/linuxrc-3.0.15/net.c 2007-09-05 16:42:19.000000000 +0200 @@ -983,7 +983,6 @@ * Global vars changed: * config.net.device * - * config.net.device_given: do nothing if != 0 */ int net_choose_device() { @@ -1014,7 +1013,11 @@ hd_t *hd, *hd_cards; hd_t **item_hds = NULL; - if(config.net.device_given) return 0; + if(config.netdevice) { + str_copy(&config.net.device, config.netdevice); + + return 0; + } if(config.manual >= 2) { #if defined(__s390__) || defined(__s390x__) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/rootimage.c new/linuxrc-3.0.15/rootimage.c --- old/linuxrc-3.0.14/rootimage.c 2007-08-02 17:35:58.000000000 +0200 +++ new/linuxrc-3.0.15/rootimage.c 2007-09-07 16:36:22.000000000 +0200 @@ -144,9 +144,9 @@ char buf[256], root[64]; do { - rc = inst_choose_partition(&config.partition, 0, txt_get(TXT_CHOOSE_ROOT_FS), txt_get(TXT_ENTER_ROOT_FS)); - if(rc || !config.partition) return -1; - sprintf(root, "/dev/%s", config.partition); + rc = inst_choose_partition(&config.device, 0, txt_get(TXT_CHOOSE_ROOT_FS), txt_get(TXT_ENTER_ROOT_FS)); + if(rc || !config.device) return -1; + sprintf(root, "/dev/%s", config.device); if((type = util_fstype(root, &module))) { if(module && config.module.dir) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/url.c new/linuxrc-3.0.15/url.c --- old/linuxrc-3.0.14/url.c 2007-08-30 16:59:49.000000000 +0200 +++ new/linuxrc-3.0.15/url.c 2007-09-07 16:32:17.000000000 +0200 @@ -1131,6 +1131,7 @@ char *hwaddr; hd_hw_item_t hw_item = hw_network_ctrl; str_list_t *sl; + char *url_device; if(!url || !url->scheme) return 1; @@ -1161,6 +1162,9 @@ } } + url_device = url->device; + if(!url_device) url_device = url->is.network ? config.netdevice : config.device; + for(found = 0, hd = hd_list(config.hd_data, hw_item, 0, NULL); hd; hd = hd->next) { for(hwaddr = NULL, res = hd->res; res; res = res->next) { if(res->any.type == res_hwaddr) { @@ -1184,10 +1188,10 @@ !hd->unix_dev_name ) continue; - matched = url->device ? match_netdevice(short_dev(hd->unix_dev_name), hwaddr, url->device) : 1; + matched = url_device ? match_netdevice(short_dev(hd->unix_dev_name), hwaddr, url_device) : 1; for(sl = hd->unix_dev_names; !matched && sl; sl = sl->next) { - matched = match_netdevice(short_dev(sl->str), NULL, url->device); + matched = match_netdevice(short_dev(sl->str), NULL, url_device); } if(!matched) continue; @@ -1216,8 +1220,8 @@ } /* should not happen, but anyway: device name was not in our list */ - if(!err && !found && !url->used.device && url->device) { - str_copy(&url->used.device, long_dev(url->device)); + if(!err && !found && !url->used.device && url_device) { + str_copy(&url->used.device, long_dev(url_device)); str_copy(&url->used.model, NULL); str_copy(&url->used.hwaddr, NULL); str_copy(&url->used.unique_id, NULL); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/util.c new/linuxrc-3.0.15/util.c --- old/linuxrc-3.0.14/util.c 2007-08-17 17:20:51.000000000 +0200 +++ new/linuxrc-3.0.15/util.c 2007-09-07 16:35:57.000000000 +0200 @@ -1422,7 +1422,7 @@ slist_append_str(&sl0, buf); for(sl = config.partitions; sl; sl = sl->next) { if(!sl->key) continue; - i = config.partition && !strcmp(sl->key, config.partition) ? 1 : 0; + i = config.device && !strcmp(sl->key, config.device) ? 1 : 0; sprintf(buf, " %s%s", sl->key, i ? "*" : ""); if(sl->value) sprintf(buf + strlen(buf), " [%s]", sl->value); slist_append_str(&sl0, buf); @@ -4185,8 +4185,7 @@ for(f = f0; f; f = f->next) { switch(f->key) { case key_ibft_hwaddr: - str_copy(&config.net.device, f->value); - config.net.device_given = 1; + str_copy(&config.netdevice, f->value); break; case key_ibft_ipaddr: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.14/VERSION new/linuxrc-3.0.15/VERSION --- old/linuxrc-3.0.14/VERSION 2007-09-03 15:56:31.000000000 +0200 +++ new/linuxrc-3.0.15/VERSION 2007-09-07 16:54:29.000000000 +0200 @@ -1 +1 @@ -3.0.14 +3.0.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org