Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-06-26 08:00:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2014-06-19 13:07:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-06-26 08:00:56.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Jun 25 15:59:55 CEST 2014 - [email protected] + +- tag ibft interface as persistent +- ignore ibft data if we can't find a matching interface (bnc #883712, bnc #874795) +- 4.2.36 + +------------------------------------------------------------------- +Tue Jun 24 11:12:31 CEST 2014 - [email protected] + +- keep network config for rescue system and pass ssh options (bnc #882844) +- 4.2.35 + +------------------------------------------------------------------- +Mon Jun 23 13:37:25 CEST 2014 - [email protected] + +- add separate upgrade option to linuxrc +- stick to ascii language names (bnc #881440) +- 4.2.34 + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.33.tar.xz New: ---- linuxrc-4.2.36.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.QDSXYf/_old 2014-06-26 08:00:57.000000000 +0200 +++ /var/tmp/diff_new_pack.QDSXYf/_new 2014-06-26 08:00:57.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.33 +Version: 4.2.36 Release: 0 -Source: linuxrc-4.2.33.tar.xz +Source: linuxrc-4.2.36.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.33.tar.xz -> linuxrc-4.2.36.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/VERSION new/linuxrc-4.2.36/VERSION --- old/linuxrc-4.2.33/VERSION 2014-06-17 12:50:27.000000000 +0200 +++ new/linuxrc-4.2.36/VERSION 2014-06-25 15:59:47.000000000 +0200 @@ -1 +1 @@ -4.2.33 +4.2.36 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/changelog new/linuxrc-4.2.36/changelog --- old/linuxrc-4.2.33/changelog 2014-06-17 12:50:29.000000000 +0200 +++ new/linuxrc-4.2.36/changelog 2014-06-25 15:59:49.000000000 +0200 @@ -1,4 +1,15 @@ -2014-06-17: HEAD +2014-06-25: HEAD + - tag ibft interface as persistent + - ignore ibft data if we can't find a matching interface (bnc #883712, bnc #874795) + +2014-06-24: 4.2.35 + - keep network config for rescue system and pass ssh options (bnc #882844) + +2014-06-23: 4.2.34 + - add separate upgrade option to linuxrc + - stick to ascii language names (bnc #881440) + +2014-06-17: 4.2.33 - don't kill haveged (bnc #875848) - We start haveged early in in linuxrc now. So don't accidentally kill it. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/dialog.c new/linuxrc-4.2.36/dialog.c --- old/linuxrc-4.2.33/dialog.c 2014-05-30 07:54:43.000000000 +0200 +++ new/linuxrc-4.2.36/dialog.c 2014-06-23 13:35:40.000000000 +0200 @@ -58,9 +58,10 @@ { di_set_startshell, "Start shell before and after YaST?", }, { di_set_slp, "Get SLP info", }, - { di_inst_install, "Start Installation or Update", }, + { di_inst_install, "Installation", }, + { di_inst_update, "Upgrade", }, + { di_inst_rescue, "Rescue System", }, { di_inst_system, "Boot Installed System", }, - { di_inst_rescue, "Start Rescue System", }, { di_inst_update_add, "Add Driver Update", }, { di_inst_update_show, "Show Driver Updates", }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/dialog.h new/linuxrc-4.2.36/dialog.h --- old/linuxrc-4.2.33/dialog.h 2014-04-24 14:35:36.000000000 +0200 +++ new/linuxrc-4.2.36/dialog.h 2014-06-23 12:50:51.000000000 +0200 @@ -46,8 +46,9 @@ di_set_slp, di_inst_install, - di_inst_system, + di_inst_update, di_inst_rescue, + di_inst_system, di_inst_update_add, di_inst_update_show, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/file.c new/linuxrc-4.2.36/file.c --- old/linuxrc-4.2.33/file.c 2014-05-30 07:54:43.000000000 +0200 +++ new/linuxrc-4.2.36/file.c 2014-06-24 10:25:13.000000000 +0200 @@ -151,7 +151,7 @@ { key_dhcptimeout, "DHCPTimeout", kf_cfg + kf_cmd }, { key_tftptimeout, "TFTPTimeout", kf_cfg + kf_cmd }, { key_tmpfs, "_TmpFS", kf_cmd }, - { key_netstop, "_NetStop", kf_cfg + kf_cmd }, + { key_netstop, "NetStop", kf_cfg + kf_cmd }, { key_testmode, "_TestMode", kf_cfg }, { key_debugwait, "_DebugWait", kf_cfg + kf_cmd + kf_cmd_early }, { key_expert, "Expert", kf_cfg + kf_cmd }, /* drop it? */ @@ -307,6 +307,7 @@ { key_restarted, "Restarted", kf_cfg }, { key_wicked, "Wicked", kf_cfg + kf_cmd + kf_cmd_early }, { key_withipoib, "WithIPoIB", kf_cfg + kf_cmd_early }, + { key_upgrade, "Upgrade", kf_cfg + kf_cmd }, }; static struct { @@ -1643,6 +1644,10 @@ if(f->is.numeric) config.withipoib = f->nvalue; break; + case key_upgrade: + if(f->is.numeric) config.upgrade = f->nvalue; + break; + default: break; } @@ -1954,6 +1959,7 @@ file_write_num(f, key_kexec_reboot, config.kexec_reboot); file_write_num(f, key_usesax2, config.usesax2); file_write_num(f, key_efi, config.efi >= 0 ? config.efi : config.efi_vars); + if(config.upgrade) file_write_num(f, key_upgrade, config.upgrade); if(config.net.dhcp_timeout_set) file_write_num(f, key_dhcptimeout, config.net.dhcp_timeout); if( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/file.h new/linuxrc-4.2.36/file.h --- old/linuxrc-4.2.33/file.h 2014-04-11 09:50:20.000000000 +0200 +++ new/linuxrc-4.2.36/file.h 2014-06-23 12:56:43.000000000 +0200 @@ -53,7 +53,7 @@ key_osahwaddr, key_zen, key_zenconfig, key_udevrule, key_dhcpfail, key_namescheme, key_ptoptions, key_is_ptoption, key_withfcoe, key_digests, key_plymouth, key_sslcerts, key_restart, key_restarted, key_wicked, key_autoyast2, - key_withipoib + key_withipoib, key_upgrade } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/global.h new/linuxrc-4.2.36/global.h --- old/linuxrc-4.2.33/global.h 2014-05-15 11:01:53.000000000 +0200 +++ new/linuxrc-4.2.36/global.h 2014-06-25 15:56:18.000000000 +0200 @@ -335,7 +335,7 @@ unsigned addswap:2; /* offer to add swap if yast needs it */ unsigned aborted:1; /* yast did abort the installation */ unsigned splash:1; /* splash active */ - unsigned netstop:1; /* shut down network iface at end */ + unsigned netstop:2; /* shut down network interface at end 0: no, 1: yes, 3: auto */ unsigned noshell:1; /* don't start any shells */ volatile unsigned restart_on_segv:1; /* restart linuxrc after segfault */ unsigned had_segv:1; /* last linuxrc run ended with segv */ @@ -386,6 +386,7 @@ unsigned restarting:1; /* we are preparing for restart */ unsigned restarted:1; /* we have been restarted */ unsigned wicked:1; /* use wicked for network setup */ + unsigned upgrade:1; /* upgrade or fresh install */ struct { unsigned check:1; /* check for braille displays and start brld if found */ char *dev; /* braille device */ @@ -609,6 +610,7 @@ char *ethtool_used; /* ethtool options used for active card */ char *cardname; /* network card name */ char *dhcpfail; /* dhcp failure action */ + char *persistent; /* persistent interface */ struct { char *binary; /* cifs/smb mount binary */ char *module; /* cifs/smb kernel module */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/install.c new/linuxrc-4.2.36/install.c --- old/linuxrc-4.2.33/install.c 2014-04-24 14:35:53.000000000 +0200 +++ new/linuxrc-4.2.36/install.c 2014-06-23 12:54:47.000000000 +0200 @@ -89,8 +89,9 @@ dia_item_t di; dia_item_t items[] = { di_inst_install, - di_inst_system, + di_inst_update, di_inst_rescue, + di_inst_system, di_none }; @@ -98,6 +99,10 @@ /* ... apparently not: keep VNC & SSH settings (bnc #447433) */ config.net.do_setup &= DS_VNC | DS_SSH; + if(di_inst_menu_last == di_none) { + di_inst_menu_last = config.rescue ? di_inst_rescue : config.upgrade ? di_inst_update : di_inst_install; + } + di = dia_menu2("Start Installation", 40, inst_menu_cb, items, di_inst_menu_last); return di == di_none ? 1 : 0; @@ -119,11 +124,14 @@ switch(di) { case di_inst_install: config.rescue = 0; + config.upgrade = 0; err = inst_start_install(); break; - case di_inst_system: - err = root_boot_system(); + case di_inst_update: + config.rescue = 0; + config.upgrade = 1; + err = inst_start_install(); break; case di_inst_rescue: @@ -131,6 +139,10 @@ err = inst_start_install(); break; + case di_inst_system: + err = root_boot_system(); + break; + default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/linuxrc.c new/linuxrc-4.2.36/linuxrc.c --- old/linuxrc-4.2.33/linuxrc.c 2014-06-17 12:13:43.000000000 +0200 +++ new/linuxrc-4.2.36/linuxrc.c 2014-06-24 10:55:54.000000000 +0200 @@ -374,9 +374,12 @@ chroot("."); if(config.rescue) { + if(config.usessh) setenv("SSH", "1", 1); + if(config.net.sshpassword) setenv("SSHPASSWORD", config.net.sshpassword, 1); + system("/mounts/initrd/scripts/prepare_rescue"); - // system("PS1='\\w # ' /bin/bash 2>&1"); + LXRC_WAIT if(!config.debug) { umount("/mounts/initrd"); @@ -451,9 +454,13 @@ void lxrc_end() { + unsigned netstop = config.netstop; + + if(netstop == 3) netstop = config.rescue ? 0 : 1; + util_plymouth_off(); - if(config.netstop || config.restarting) { + if(netstop || config.restarting) { LXRC_WAIT net_stop(); @@ -761,7 +768,7 @@ config.explode_win = 1; config.color = 2; config.addswap = 1; - config.netstop = 1; + config.netstop = 3; config.usbwait = 4; /* 4 seconds */ config.escdelay = 100; /* 100 ms */ config.utf8 = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/settings.c new/linuxrc-4.2.36/settings.c --- old/linuxrc-4.2.33/settings.c 2014-05-08 14:21:22.000000000 +0200 +++ new/linuxrc-4.2.36/settings.c 2014-06-23 12:45:56.000000000 +0200 @@ -60,31 +60,31 @@ #define LANG_DEFAULT lang_en static language_t set_languages_arm[] = { { lang_af, "Afrikaans", "us", "af_ZA", "af" }, - { lang_bg, "Български", "us", "bg_BG", "bg" }, - { lang_ca, "Català", "us", "ca_ES", "ca" }, - { lang_cs, "Čeština", "cz-us-qwertz", "cs_CZ", "cs" }, + { lang_bg, "Bulgarian", "us", "bg_BG", "bg" }, + { lang_ca, "Catala", "us", "ca_ES", "ca" }, + { lang_cs, "Cestina", "cz-us-qwertz", "cs_CZ", "cs" }, { lang_da, "Dansk", "dk", "da_DK", "da" }, { lang_de, "Deutsch", "de-latin1-nodeadkeys", "de_DE", "de" }, { lang_en, "English", "us", "en_US", "en_US" }, - { lang_es, "Español", "es", "es_ES", "es" }, - { lang_fr, "Français", "fr-latin1", "fr_FR", "fr" }, - { lang_el, "Ελληνικά", "gr", "el_GR", "el" }, + { lang_es, "Espanol", "es", "es_ES", "es" }, + { lang_fr, "Francais", "fr-latin1", "fr_FR", "fr" }, + { lang_el, "Greek", "gr", "el_GR", "el" }, { lang_it, "Italiano", "it", "it_IT", "it" }, { lang_ja, "Japanese", "jp106", "ja_JP", "ja" }, { lang_hu, "Magyar", "hu", "hu_HU", "hu" }, { lang_nl, "Nederlands", "us", "nl_NL", "nl" }, { lang_nb, "Norsk", "no-latin1", "nb_NO", "nb" }, { lang_pl, "Polski", "Pl02", "pl_PL", "pl" }, - { lang_pt, "Português", "pt-latin1", "pt_PT", "pt" }, - { lang_pt_BR, "Português Brasileiro", "br-abnt2", "pt_BR", "pt_BR" }, - { lang_ru, "Русский", "ru1", "ru_RU", "ru" }, + { lang_pt, "Portugues", "pt-latin1", "pt_PT", "pt" }, + { lang_pt_BR, "Portugues brasileiro", "br-abnt2", "pt_BR", "pt_BR" }, + { lang_ru, "Russian", "ru1", "ru_RU", "ru" }, { lang_zh_CN, "Simplified Chinese", "us", "zh_CN", "zh_CN" }, - { lang_sk, "Slovenčina", "sk-qwerty", "sk_SK", "sk" }, - { lang_sl, "Slovenščina", "slovene", "sl_SI", "sl" }, + { lang_sk, "Slovencina", "sk-qwerty", "sk_SK", "sk" }, + { lang_sl, "Slovenscina", "slovene", "sl_SI", "sl" }, { lang_fi, "Suomi", "fi-latin1", "fi_FI", "fi" }, { lang_sv, "Svenska", "sv-latin1", "sv_SE", "sv" }, { lang_zh_TW, "Traditional Chinese", "us", "zh_TW", "zh_TW" }, - { lang_uk, "Українська", "us", "uk_UA", "uk" }, + { lang_uk, "Ukrainian", "us", "uk_UA", "uk" }, { lang_xh, "isiXhosa", "us", "xh_ZA", "xh" }, { lang_zu, "isiZulu", "us", "zu_ZA", "zu" }, // entry for unknown language diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.33/util.c new/linuxrc-4.2.36/util.c --- old/linuxrc-4.2.33/util.c 2014-06-06 08:15:20.000000000 +0200 +++ new/linuxrc-4.2.36/util.c 2014-06-25 15:56:54.000000000 +0200 @@ -1198,6 +1198,7 @@ add_flag(&sl0, buf, config.withiscsi, "iscsi"); add_flag(&sl0, buf, config.withfcoe, "fcoe"); add_flag(&sl0, buf, config.withipoib, "ipoib"); + add_flag(&sl0, buf, config.upgrade, "upgrade"); if(*buf) slist_append_str(&sl0, buf); sprintf(buf, "net_config_mask = 0x%x", net_config_mask()); @@ -4254,19 +4255,22 @@ free(s); s = t; } - str_copy(&config.netdevice, s); + if(!mac_ofs) str_copy(&config.netdevice, s); + fprintf(stderr, "ibft: tagging %s as persistent\n", t); + str_copy(&config.net.persistent, t); iscsi_ok++; } + free(s); free(attr); - if(use_dhcp) { - config.net.do_setup |= DS_SETUP; - config.net.setup = NS_DHCP; - } - else { + if(!mac_ofs) { /* use ibft config only if mac matches */ - if(!mac_ofs) { + if(use_dhcp) { + config.net.do_setup |= DS_SETUP; + config.net.setup = NS_DHCP; + } + else { asprintf(&attr, "%s/ip-addr", sysfs_ibft); s = util_get_attr(attr); fprintf(stderr, "ibft: ip-addr = %s\n", s); @@ -4276,57 +4280,58 @@ iscsi_ok++; } free(attr); - } - else { - iscsi_ok++; - } - - asprintf(&attr, "%s/subnet-mask", sysfs_ibft); - s = util_get_attr(attr); - fprintf(stderr, "ibft: subnet-mask = %s\n", s); - if(*s) { - name2inet(&config.net.netmask, s); - net_check_address(&config.net.netmask, 0); - iscsi_ok++; - } - free(attr); - if(iscsi_ok == 3) { - config.net.do_setup |= DS_SETUP; - config.net.setup = NS_HOSTIP | NS_NETMASK; - - asprintf(&attr, "%s/gateway", sysfs_ibft); + asprintf(&attr, "%s/subnet-mask", sysfs_ibft); s = util_get_attr(attr); - fprintf(stderr, "ibft: gateway = %s\n", s); + fprintf(stderr, "ibft: subnet-mask = %s\n", s); if(*s) { - name2inet(&config.net.gateway, s); - net_check_address(&config.net.gateway, 0); - config.net.setup |= NS_GATEWAY; + name2inet(&config.net.netmask, s); + net_check_address(&config.net.netmask, 0); + iscsi_ok++; } free(attr); - asprintf(&attr, "%s/primary-dns", sysfs_ibft); - s = util_get_attr(attr); - fprintf(stderr, "ibft: primary-dns = %s\n", s); - if(*s) { - name2inet(&config.net.nameserver[0], s); - net_check_address(&config.net.nameserver[0], 0); - config.net.nameservers = 1; - config.net.setup |= NS_NAMESERVER; - } - free(attr); + if(iscsi_ok == 3) { + config.net.do_setup |= DS_SETUP; + config.net.setup = NS_HOSTIP | NS_NETMASK; + + asprintf(&attr, "%s/gateway", sysfs_ibft); + s = util_get_attr(attr); + fprintf(stderr, "ibft: gateway = %s\n", s); + if(*s) { + name2inet(&config.net.gateway, s); + net_check_address(&config.net.gateway, 0); + config.net.setup |= NS_GATEWAY; + } + free(attr); - asprintf(&attr, "%s/secondary-dns", sysfs_ibft); - s = util_get_attr(attr); - fprintf(stderr, "ibft: secondary-dns = %s\n", s); - if(*s) { - name2inet(&config.net.nameserver[1], s); - net_check_address(&config.net.nameserver[1], 0); - config.net.nameservers = 2; + asprintf(&attr, "%s/primary-dns", sysfs_ibft); + s = util_get_attr(attr); + fprintf(stderr, "ibft: primary-dns = %s\n", s); + if(*s) { + name2inet(&config.net.nameserver[0], s); + net_check_address(&config.net.nameserver[0], 0); + config.net.nameservers = 1; + config.net.setup |= NS_NAMESERVER; + } + free(attr); + + asprintf(&attr, "%s/secondary-dns", sysfs_ibft); + s = util_get_attr(attr); + fprintf(stderr, "ibft: secondary-dns = %s\n", s); + if(*s) { + name2inet(&config.net.nameserver[1], s); + net_check_address(&config.net.nameserver[1], 0); + config.net.nameservers = 2; + } + free(attr); } - free(attr); } } + else { + fprintf(stderr, "ibft: mac didn't match - ignoring ibft data\n"); + iscsi_ok++; + } return use_dhcp || iscsi_ok == 3; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
