Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2014-10-05 20:27:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-28
19:58:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-10-05
20:27:20.000000000 +0200
@@ -1,0 +2,20 @@
+Mon Sep 29 15:28:15 CEST 2014 - snw...@suse.de
+
+- keep wpa_supplicant running (bnc #898977)
+- 5.0.26
+
+-------------------------------------------------------------------
+Mon Sep 29 14:20:29 CEST 2014 - snw...@suse.de
+
+- handle ifcfg options also when using dhcp (bnc #898995)
+- 5.0.25
+
+-------------------------------------------------------------------
+Mon Sep 29 10:51:49 CEST 2014 - snw...@suse.de
+
+- improve last commit a bit
+- Correct check for value of config.hwp.layer2
+- Add check for virtual NICs to not write LLADDR to ifcfg.
+- 5.0.24
+
+-------------------------------------------------------------------
Old:
----
linuxrc-5.0.23.tar.xz
New:
----
linuxrc-5.0.26.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.3PRWBR/_old 2014-10-05 20:27:21.000000000 +0200
+++ /var/tmp/diff_new_pack.3PRWBR/_new 2014-10-05 20:27:21.000000000 +0200
@@ -25,9 +25,9 @@
Summary: SUSE Installation Program
License: GPL-3.0+
Group: System/Boot
-Version: 5.0.23
+Version: 5.0.26
Release: 0
-Source: linuxrc-5.0.23.tar.xz
+Source: linuxrc-5.0.26.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ linuxrc-5.0.23.tar.xz -> linuxrc-5.0.26.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.23/VERSION new/linuxrc-5.0.26/VERSION
--- old/linuxrc-5.0.23/VERSION 2014-09-26 11:09:18.000000000 +0200
+++ new/linuxrc-5.0.26/VERSION 2014-09-29 15:27:55.000000000 +0200
@@ -1 +1 @@
-5.0.23
+5.0.26
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.23/changelog new/linuxrc-5.0.26/changelog
--- old/linuxrc-5.0.23/changelog 2014-09-26 11:09:35.000000000 +0200
+++ new/linuxrc-5.0.26/changelog 2014-09-29 15:28:13.000000000 +0200
@@ -1,3 +1,14 @@
+2014-09-29: 5.0.26
+ - keep wpa_supplicant running
+
+2014-09-29: 5.0.25
+ - handle ifcfg options also when using dhcp
+
+2014-09-29: 5.0.24
+ - improve last commit a bit
+ - Correct check for value of config.hwp.layer2
+ - Add check for virtual NICs to not write LLADDR to ifcfg.
+
2014-09-26: 5.0.23
- s390x: revert hypervisor check (bnc 887238)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.23/linuxrc.c new/linuxrc-5.0.26/linuxrc.c
--- old/linuxrc-5.0.23/linuxrc.c 2014-09-15 13:28:43.000000000 +0200
+++ new/linuxrc-5.0.26/linuxrc.c 2014-09-29 15:27:29.000000000 +0200
@@ -513,7 +513,8 @@
static char *progs[] = {
"portmap", "rpciod", "lockd", "cifsd", "mount.smbfs", "udevd",
"mount.ntfs-3g", "brld", "sbl", "wickedd", "wickedd-auto4",
"wickedd-dhcp4",
- "wickedd-dhcp6", "wickedd-nanny", "dbus-daemon", "rpc.idmapd", "sh",
"haveged"
+ "wickedd-dhcp6", "wickedd-nanny", "dbus-daemon", "rpc.idmapd", "sh",
"haveged",
+ "wpa_supplicant"
};
int i;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.23/net.c new/linuxrc-5.0.26/net.c
--- old/linuxrc-5.0.23/net.c 2014-09-26 11:07:47.000000000 +0200
+++ new/linuxrc-5.0.26/net.c 2014-09-29 14:19:25.000000000 +0200
@@ -2145,7 +2145,7 @@
char *domain = NULL; // allocated
char *vlan = NULL; // allocated
int is_dhcp = 0;
- slist_t *sl;
+ slist_t *sl, *sl2;
slist_t *sl_ifcfg = NULL;
slist_t *sl_ifroute = NULL;
slist_t *sl_global = NULL;
@@ -2257,24 +2257,35 @@
sl0 = slist_free(sl0);
}
}
+ }
- for(sl = ifcfg->flags; sl; sl = sl->next) {
- if(slist_getentry(config.ifcfg.to_global, sl->key)) {
- if(!(sl1 = slist_getentry(sl_global, sl->key))) sl1 =
slist_append(&sl_global, slist_new());
- }
- else {
- if(!(sl1 = slist_getentry(sl_ifcfg, sl->key))) sl1 =
slist_append(&sl_ifcfg, slist_new());
- }
- str_copy(&sl1->key, sl->key);
- str_copy(&sl1->value, sl->value);
+ // handle additional flags and put them either into 'ifcfg-*' or 'config'
+
+ for(sl = ifcfg->flags; sl; sl = sl->next) {
+ if(slist_getentry(config.ifcfg.to_global, sl->key)) {
+ if(!(sl2 = slist_getentry(sl_global, sl->key))) sl2 =
slist_append(&sl_global, slist_new());
+ }
+ else {
+ if(!(sl2 = slist_getentry(sl_ifcfg, sl->key))) sl2 =
slist_append(&sl_ifcfg, slist_new());
}
+ str_copy(&sl2->key, sl->key);
+ str_copy(&sl2->value, sl->value);
}
#if defined(__s390__) || defined(__s390x__)
// s390 layer2 interfaces
- if(config.hwp.layer2 && config.hwp.osahwaddr) {
- sl = slist_append_str(&sl_ifcfg, "LLADDR");
- str_copy(&sl->value, config.hwp.osahwaddr);
+ if(config.hwp.layer2 == 2 && config.hwp.osahwaddr) {
+ char *sysfs_string = NULL;
+ char *card_type;
+
+ strprintf(&sysfs_string, "/sys/bus/ccwgroup/devices/%s/card_type",
config.hwp.readchan);
+ card_type = util_get_attr(sysfs_string);
+ // exclude virtual NICs (bnc #887238)
+ if(strncmp(card_type, "Virt.NIC", sizeof "Virt.NIC" - 1)) {
+ sl = slist_append_str(&sl_ifcfg, "LLADDR");
+ str_copy(&sl->value, config.hwp.osahwaddr);
+ }
+ str_copy(&sysfs_string, NULL);
}
#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
