Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-08-07 08:07:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-08-06 11:42:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-08-07 08:07:40.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 6 16:19:17 CEST 2014 - [email protected] + +- add new 'sshd' option to start sshd during install but don't trigger a ssh installation +- apply netwait also to static setup +- add wicked.timeout as alias to dhcp.timeout +- extend debugwait syntax +- free screen memory only after we allocated it +- 5.0.10 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.9.tar.xz New: ---- linuxrc-5.0.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.pTxAOb/_old 2014-08-07 08:07:41.000000000 +0200 +++ /var/tmp/diff_new_pack.pTxAOb/_new 2014-08-07 08:07:41.000000000 +0200 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.9 +Version: 5.0.10 Release: 0 -Source: linuxrc-5.0.9.tar.xz +Source: linuxrc-5.0.10.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-5.0.9.tar.xz -> linuxrc-5.0.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/VERSION new/linuxrc-5.0.10/VERSION --- old/linuxrc-5.0.9/VERSION 2014-08-04 12:10:54.000000000 +0200 +++ new/linuxrc-5.0.10/VERSION 2014-08-06 16:19:02.000000000 +0200 @@ -1 +1 @@ -5.0.9 +5.0.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/changelog new/linuxrc-5.0.10/changelog --- old/linuxrc-5.0.9/changelog 2014-08-04 12:10:56.000000000 +0200 +++ new/linuxrc-5.0.10/changelog 2014-08-06 16:19:11.000000000 +0200 @@ -1,4 +1,15 @@ -2014-08-04: HEAD +2014-08-06: HEAD + - Merge pull request #19 from openSUSE/sw_0007 + - Sw 0007 + - add new 'sshd' option to start sshd during install but don't trigger a ssh installation + - apply netwait also to static setup + - add wicked.timeout as alias to dhcp.timeout + - extend debugwait syntax + - Now shell wildcard patterns are allowed and you can also match against function names. + - The debugwait option accepts comma-separated pattern list. + - free screen memory only after we allocated it + +2014-08-04: 5.0.9 - Merge pull request #18 from openSUSE/sw_0006 - Sw 0006 - explicitly set CURLOPT_IPRESOLVE to debug/workaround resolve issues (bnc #889981) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/display.c new/linuxrc-5.0.10/display.c --- old/linuxrc-5.0.9/display.c 2013-11-18 14:06:40.000000000 +0100 +++ new/linuxrc-5.0.10/display.c 2014-08-06 16:18:39.000000000 +0200 @@ -179,10 +179,13 @@ printf ("\033c"); fflush (stdout); - for (i_ii = 0; i_ii < max_y_ig; i_ii++) - free (disp_screen_aprm [i_ii]); + if (disp_screen_aprm) + { + for (i_ii = 0; i_ii < max_y_ig; i_ii++) + free (disp_screen_aprm [i_ii]); - free (disp_screen_aprm); + free (disp_screen_aprm); + } if(!config.test) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/file.c new/linuxrc-5.0.10/file.c --- old/linuxrc-5.0.9/file.c 2014-08-04 12:09:57.000000000 +0200 +++ new/linuxrc-5.0.10/file.c 2014-08-06 16:18:39.000000000 +0200 @@ -146,6 +146,7 @@ { key_proxy, "Proxy", kf_cfg + kf_cmd }, { key_usedhcp, "UseDHCP", kf_cfg + kf_cmd }, { key_dhcptimeout, "DHCPTimeout", kf_cfg + kf_cmd }, + { key_dhcptimeout, "WickedTimeout", kf_cfg + kf_cmd }, { key_tftptimeout, "TFTPTimeout", kf_cfg + kf_cmd }, { key_tmpfs, "_TmpFS", kf_cmd }, { key_netstop, "NetStop", kf_cfg + kf_cmd }, @@ -159,6 +160,7 @@ { key_vnc, "UseVNC", kf_cfg + kf_cmd }, { key_usessh, "UseSSH", kf_cfg + kf_cmd }, { key_usessh, "SSH", kf_cfg + kf_cmd }, + { key_sshd, "SSHD", kf_cfg + kf_cmd }, { key_vncpassword, "VNCPassword", kf_cfg + kf_cmd }, { key_displayip, "Display_IP", kf_cfg + kf_cmd }, { key_sshpassword, "SSHPassword", kf_cfg + kf_cmd }, @@ -775,7 +777,7 @@ } else if(*f->value) { config.debugwait = 1; - slist_append_str(&config.debugwait_list, f->value); + slist_assign_values(&config.debugwait_list, f->value); } break; @@ -846,6 +848,15 @@ break; case key_usessh: + config.sshd_only = 0; + if(f->is.numeric) config.usessh = f->nvalue; + if(config.usessh) { + config.net.do_setup |= DS_SSH; + } + break; + + case key_sshd: + config.sshd_only = 1; if(f->is.numeric) config.usessh = f->nvalue; if(config.usessh) { config.net.do_setup |= DS_SSH; @@ -1828,7 +1839,8 @@ file_write_num(f, key_vnc, config.vnc); file_write_str(f, key_vncpassword, config.net.vncpassword); file_write_inet2(f, key_displayip, &config.net.displayip, INET_WRITE_IP); - file_write_num(f, key_usessh, config.usessh); + file_write_num(f, key_usessh, config.usessh & ~config.sshd_only); + file_write_num(f, key_sshd, config.usessh); if(config.noshell) file_write_num(f, key_noshell, config.noshell); file_write_str(f, key_initrd_id, config.initrd_id); file_write_str(f, key_instsys_id, config.instsys_id); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/file.h new/linuxrc-5.0.10/file.h --- old/linuxrc-5.0.9/file.h 2014-08-04 12:09:57.000000000 +0200 +++ new/linuxrc-5.0.10/file.h 2014-08-06 16:18:39.000000000 +0200 @@ -26,7 +26,7 @@ key_rescueimage, key_vnc, key_vncpassword, key_displayip, key_sshpassword, key_sshpasswordenc, 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_setupnetif, key_netconfig, key_usessh, key_sshd, key_noshell, key_hwdetect, key_consoledevice, key_product, key_productdir, key_linuxrcstderr, key_comment, key_kbdtimeout, key_brokenmodules, key_scsibeforeusb, key_hostip, key_linemode, key_moduledelay, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/global.h new/linuxrc-5.0.10/global.h --- old/linuxrc-5.0.9/global.h 2014-08-04 12:09:57.000000000 +0200 +++ new/linuxrc-5.0.10/global.h 2014-08-06 16:18:39.000000000 +0200 @@ -92,7 +92,7 @@ #define BUTTON_SIZE_LARGE 10 #define STATUS_SIZE 50 -#define LXRC_WAIT util_wait(__FILE__, __LINE__); +#define LXRC_WAIT util_wait(__FILE__, __LINE__, __FUNCTION__); #define RAMDISK_2 "/dev/ram2" @@ -348,6 +348,7 @@ unsigned use_ramdisk:1; /* used internally */ unsigned vnc:1; /* vnc mode */ unsigned usessh:1; /* ssh mode */ + unsigned sshd_only:1; /* start only sshd */ unsigned addswap:2; /* offer to add swap if yast needs it */ unsigned aborted:1; /* yast did abort the installation */ unsigned splash:1; /* splash active */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/linuxrc.c new/linuxrc-5.0.10/linuxrc.c --- old/linuxrc-5.0.9/linuxrc.c 2014-08-04 12:09:57.000000000 +0200 +++ new/linuxrc-5.0.10/linuxrc.c 2014-08-06 16:18:39.000000000 +0200 @@ -1137,8 +1137,7 @@ net_update_ifcfg(); - util_run_script("network_setup"); - net_update_state(); + net_wicked_up("all"); if(config.manual) file_read_info_file("cmdline", kf_cmd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/net.c new/linuxrc-5.0.10/net.c --- old/linuxrc-5.0.9/net.c 2014-07-31 11:02:40.000000000 +0200 +++ new/linuxrc-5.0.10/net.c 2014-08-06 16:18:39.000000000 +0200 @@ -1133,7 +1133,6 @@ if(got_ip) { config.net.dhcp_active = 1; - if(config.net.ifup_wait) sleep(config.net.ifup_wait); } else { if(config.win && config.net.dhcpfail && !strcmp(config.net.dhcpfail, "show")) { @@ -2487,6 +2486,8 @@ if(!ifname) return; + if(config.debug) fprintf(stderr, "wicked ifup %s\n", ifname); + if(config.net.dhcp_timeout_set) { strprintf(&buf, "wicked ifup --timeout %d %s >&2", config.net.dhcp_timeout, ifname); } @@ -2496,7 +2497,7 @@ system(buf); - sleep(1); + sleep(config.net.ifup_wait + 1); LXRC_WAIT @@ -2515,6 +2516,8 @@ if(!ifname) return; + if(config.debug) fprintf(stderr, "wicked ifdown %s\n", ifname); + strprintf(&buf, "wicked ifdown %s >&2", ifname); system(buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/util.c new/linuxrc-5.0.10/util.c --- old/linuxrc-5.0.9/util.c 2014-08-04 12:09:57.000000000 +0200 +++ new/linuxrc-5.0.10/util.c 2014-08-06 16:18:39.000000000 +0200 @@ -1165,6 +1165,7 @@ add_flag(&sl0, buf, config.rescue, "rescue"); add_flag(&sl0, buf, config.vnc, "vnc"); add_flag(&sl0, buf, config.usessh, "usessh"); + add_flag(&sl0, buf, config.sshd_only, "sshd"); add_flag(&sl0, buf, config.textmode, "textmode"); add_flag(&sl0, buf, config.rebootmsg, "rebootmsg"); add_flag(&sl0, buf, config.use_ramdisk, "ramdisk"); @@ -3952,9 +3953,10 @@ * * Useful for debugging. See linuxrc.debug and debug.wait options. */ -void util_wait(const char *file, int line) +void util_wait(const char *file, int line, const char *func) { char *pos = NULL, *s; + slist_t *sl = NULL; if(!config.debugwait || config.debugwait_off) return; @@ -3962,12 +3964,15 @@ if((s = strrchr(pos, '.'))) *s = 0; strprintf(&pos, "%s:%d", pos, line); - if( - !config.debugwait_list || - slist_getentry(config.debugwait_list, pos) - ) { - fprintf(stderr, "== %s ==\n", pos); - printf("== %s ==\n(enter = next, s = shell, c = continue normally, q = quit)? ", pos); + if(config.debugwait_list) { + for(sl = config.debugwait_list; sl; sl = sl->next) { + if(!fnmatch(sl->key, pos, 0) || !fnmatch(sl->key, func, 0)) break; + } + } + + if(!config.debugwait_list || sl) { + fprintf(stderr, "== %s in %s() ==\n", pos, func); + printf("== %s in %s() ==\n(enter = next, s = shell, c = continue normally, q = quit)? ", pos, func); switch(getchar()) { case 'q': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.9/util.h new/linuxrc-5.0.10/util.h --- old/linuxrc-5.0.9/util.h 2014-07-28 16:37:52.000000000 +0200 +++ new/linuxrc-5.0.10/util.h 2014-08-06 16:18:39.000000000 +0200 @@ -134,7 +134,7 @@ int util_copy_file(char *src_dir, char *src_file, char *dst); char *new_download(void); void util_clear_downloads(void); -void util_wait(const char *file, int line); +void util_wait(const char *file, int line, const char *func); void run_braille(void); void util_setup_udevrules(void); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
