Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2017-12-19 10:45:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linuxrc (Old)
and /work/SRC/openSUSE:Factory/.linuxrc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linuxrc"
Tue Dec 19 10:45:35 2017 rev:252 rq:557022 version:5.1.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2017-12-08
12:55:07.446590873 +0100
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2017-12-19
10:45:38.574554074 +0100
@@ -1,0 +2,7 @@
+Thu Dec 14 13:35:13 UTC 2017 - wfe...@opensuse.org
+
+- merge gh#openSUSE/linuxrc#161
+- fix network interface handling (bnc#1068336)
+- 5.1.2
+
+--------------------------------------------------------------------
Old:
----
linuxrc-5.1.1.tar.xz
New:
----
linuxrc-5.1.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.qV1KS9/_old 2017-12-19 10:45:39.330517581 +0100
+++ /var/tmp/diff_new_pack.qV1KS9/_new 2017-12-19 10:45:39.334517388 +0100
@@ -17,7 +17,7 @@
Name: linuxrc
-Version: 5.1.1
+Version: 5.1.2
Release: 0
Summary: SUSE Installation Program
License: GPL-3.0+
++++++ linuxrc-5.1.1.tar.xz -> linuxrc-5.1.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.1.1/VERSION new/linuxrc-5.1.2/VERSION
--- old/linuxrc-5.1.1/VERSION 2017-12-05 09:59:00.000000000 +0100
+++ new/linuxrc-5.1.2/VERSION 2017-12-14 14:35:13.000000000 +0100
@@ -1 +1 @@
-5.1.1
+5.1.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.1.1/changelog new/linuxrc-5.1.2/changelog
--- old/linuxrc-5.1.1/changelog 2017-12-05 09:59:00.000000000 +0100
+++ new/linuxrc-5.1.2/changelog 2017-12-14 14:35:13.000000000 +0100
@@ -1,3 +1,7 @@
+2017-12-14: 5.1.2
+ - merge gh#openSUSE/linuxrc#161
+ - fix network interface handling (bnc#1068336)
+
2017-12-05: 5.1.1
- merge gh#openSUSE/linuxrc#160
- read digests also from CHECKSUMS file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.1.1/url.c new/linuxrc-5.1.2/url.c
--- old/linuxrc-5.1.1/url.c 2017-12-05 09:59:00.000000000 +0100
+++ new/linuxrc-5.1.2/url.c 2017-12-14 14:35:13.000000000 +0100
@@ -66,6 +66,7 @@
static char *url_config_get_path(char *entry);
static slist_t *url_config_get_file_list(char *entry);
static hd_t *find_parent_in_list(hd_t *hd_list, hd_t *hd);
+static int same_device_name(hd_t *hd1, hd_t *hd2);
static hd_t *relink_array(hd_t *hd_array[]);
static void log_hd_list(char *label, hd_t *hd);
static hd_t *sort_a_bit(hd_t *hd_list);
@@ -2975,6 +2976,22 @@
/*
+ * Compare device names of two hardware items.
+ *
+ * Return 1 if hd1 and hd2 are both not NULL and have the same unix_dev_name
+ * entry, else 0.
+ */
+int same_device_name(hd_t *hd1, hd_t *hd2)
+{
+ if(!hd1 || !hd2) return 0;
+
+ if(!hd1->unix_dev_name || !hd2->unix_dev_name) return 0;
+
+ return !strcmp(hd1->unix_dev_name, hd2->unix_dev_name);
+}
+
+
+/*
* Turn hd_array elements into a linked list, in order.
*
* Last element in hd_array must be NULL.
@@ -3022,7 +3039,10 @@
/* 1. drop network interfaces if there's also a corresponding card */
for(u = 0, hd = hd_list; hd; hd = hd->next) {
if(
- !(hd->hw_class == hw_network && find_parent_in_list(hd_list, hd))
+ !(
+ hd->hw_class == hw_network &&
+ same_device_name(hd, find_parent_in_list(hd_list, hd))
+ )
) {
hd_array[u++] = hd;
}
