Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2014-08-13 17:07:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-11
10:07:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-08-13
17:07:55.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 11 16:02:15 CEST 2014 - snw...@suse.de
+
+- netsetup=dhcp didn't work (bnc #890874, bnc #889887)
+- reactivate netsetup=dhcp,all (bnc #891080)
+- 5.0.12
+
+-------------------------------------------------------------------
Old:
----
linuxrc-5.0.11.tar.xz
New:
----
linuxrc-5.0.12.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.m3KGpA/_old 2014-08-13 17:07:56.000000000 +0200
+++ /var/tmp/diff_new_pack.m3KGpA/_new 2014-08-13 17:07:56.000000000 +0200
@@ -25,9 +25,9 @@
Summary: SUSE Installation Program
License: GPL-3.0+
Group: System/Boot
-Version: 5.0.11
+Version: 5.0.12
Release: 0
-Source: linuxrc-5.0.11.tar.xz
+Source: linuxrc-5.0.12.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ linuxrc-5.0.11.tar.xz -> linuxrc-5.0.12.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.11/VERSION new/linuxrc-5.0.12/VERSION
--- old/linuxrc-5.0.11/VERSION 2014-08-08 11:15:33.000000000 +0200
+++ new/linuxrc-5.0.12/VERSION 2014-08-11 16:02:06.000000000 +0200
@@ -1 +1 @@
-5.0.11
+5.0.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.11/changelog new/linuxrc-5.0.12/changelog
--- old/linuxrc-5.0.11/changelog 2014-08-08 11:15:38.000000000 +0200
+++ new/linuxrc-5.0.12/changelog 2014-08-11 16:02:12.000000000 +0200
@@ -1,4 +1,10 @@
-2014-08-08: HEAD
+2014-08-11: HEAD
+ - Merge pull request #21 from openSUSE/sw_0009
+ - netsetup=dhcp didn't work (bnc #890874, bnc #889887)
+ - netsetup=dhcp didn't work (bnc #890874, bnc #889887)
+ - reactivate netsetup=dhcp,all (bnc #891080)
+
+2014-08-08: 5.0.11
- Merge pull request #20 from openSUSE/sw_0008
- Enhance linuxrc network code a bit.
- Enhance linuxrc network code a bit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.11/file.c new/linuxrc-5.0.12/file.c
--- old/linuxrc-5.0.11/file.c 2014-08-08 11:15:01.000000000 +0200
+++ new/linuxrc-5.0.12/file.c 2014-08-11 16:01:59.000000000 +0200
@@ -1093,6 +1093,10 @@
case key_netsetup:
config.net.do_setup |= DS_SETUP;
+
+ // for compatibility, see below
+ int do_all = 0;
+
if(f->is.numeric) {
config.net.setup = f->nvalue ? NS_DEFAULT : 0;
}
@@ -1120,6 +1124,7 @@
else if(!strcmp(s, "display")) i = NS_DISPLAY;
#endif
else if(!strcmp(s, "now")) i = NS_NOW;
+ else if(!strcmp(s, "all")) do_all = 1;
else if(!strncmp(s, "nameserver", sizeof "nameserver" - 1)) {
i = NS_NAMESERVER;
t = s + sizeof "nameserver" - 1;
@@ -1150,6 +1155,14 @@
slist_free(sl0);
}
+ /*
+ * for compatibility with old versions:
+ * make netsetup=dhcp,all an alias for ifcfg=*=dhcp
+ */
+ if(do_all && (config.net.setup & NS_DHCP)) {
+ ifcfg_append(&config.ifcfg.list, ifcfg_parse("*=dhcp"));
+ net_update_ifcfg();
+ }
if(!config.net.setup) config.net.do_setup = 0;
if(config.net.now) {
auto2_user_netconfig();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.11/linuxrc.c new/linuxrc-5.0.12/linuxrc.c
--- old/linuxrc-5.0.11/linuxrc.c 2014-08-08 11:15:01.000000000 +0200
+++ new/linuxrc-5.0.12/linuxrc.c 2014-08-11 16:01:59.000000000 +0200
@@ -765,7 +765,7 @@
config.net.ifconfig = 1;
config.net.ipv4 = 1;
config.net.ipv6 = 1;
- config.net.setup = NS_DEFAULT;
+ config.net.setup = NS_DHCP; /* unless we are told otherwise just go for
dhcp */
config.net.nameservers = 1;
config.explode_win = 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.11/net.c new/linuxrc-5.0.12/net.c
--- old/linuxrc-5.0.11/net.c 2014-08-08 11:15:01.000000000 +0200
+++ new/linuxrc-5.0.12/net.c 2014-08-11 16:01:59.000000000 +0200
@@ -119,7 +119,8 @@
int rc = 0;
char buf[256];
- if(!config.win && !config.manual) return 0;
+ // in manual mode, ask for everything
+ if(config.manual) config.net.setup = NS_DEFAULT;
// FIXME: not really here
net_ask_password();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.11/util.c new/linuxrc-5.0.12/util.c
--- old/linuxrc-5.0.11/util.c 2014-08-08 11:15:01.000000000 +0200
+++ new/linuxrc-5.0.12/util.c 2014-08-11 16:01:59.000000000 +0200
@@ -590,6 +590,8 @@
{
int i_ii;
+ if(config.debug) fprintf(stderr, "win on\n");
+
config.win = 1;
util_plymouth_off();
disp_set_display();
@@ -605,6 +607,8 @@
void util_disp_done()
{
+ if(config.debug) fprintf(stderr, "win off\n");
+
if (config.linemode) {
printf("\n\n");
config.win = 0;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
