Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2014-03-02 07:43:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-02-21
13:48:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-03-02
07:43:22.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Feb 28 14:04:48 CET 2014 - snw...@suse.de
+
+- calculate prefix len from netmask (bnc #865199)
+
+-------------------------------------------------------------------
+Thu Feb 27 14:00:09 CET 2014 - snw...@suse.de
+
+- fix language setting (bnc #865370)
+
+-------------------------------------------------------------------
Old:
----
linuxrc-4.2.9.tar.bz2
New:
----
linuxrc-4.2.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.8xZGaS/_old 2014-03-02 07:43:22.000000000 +0100
+++ /var/tmp/diff_new_pack.8xZGaS/_new 2014-03-02 07:43:22.000000000 +0100
@@ -25,9 +25,9 @@
Summary: SUSE Installation Program
License: GPL-3.0+
Group: System/Boot
-Version: 4.2.9
+Version: 4.2.11
Release: 0
-Source: linuxrc-4.2.9.tar.bz2
+Source: linuxrc-4.2.11.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ linuxrc-4.2.9.tar.bz2 -> linuxrc-4.2.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.2.9/VERSION new/linuxrc-4.2.11/VERSION
--- old/linuxrc-4.2.9/VERSION 2014-02-18 14:38:52.000000000 +0100
+++ new/linuxrc-4.2.11/VERSION 2014-02-28 14:04:43.000000000 +0100
@@ -1 +1 @@
-4.2.9
+4.2.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.2.9/changelog new/linuxrc-4.2.11/changelog
--- old/linuxrc-4.2.9/changelog 2014-02-18 14:38:53.000000000 +0100
+++ new/linuxrc-4.2.11/changelog 2014-02-28 14:04:45.000000000 +0100
@@ -1,4 +1,10 @@
-2014-02-18: HEAD
+2014-02-28: HEAD
+ - calculate prefix len from netmask (bnc #865199)
+
+2014-02-27: 4.2.10
+ - fix language setting (bnc #865370)
+
+2014-02-18: 4.2.9
- update copyright string
- write complete static network config for wicked
- make 'textmode' equivalent to textmod=1 (bnc #864316)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.2.9/net.c new/linuxrc-4.2.11/net.c
--- old/linuxrc-4.2.9/net.c 2014-02-18 14:31:46.000000000 +0100
+++ new/linuxrc-4.2.11/net.c 2014-02-28 13:58:31.000000000 +0100
@@ -3031,6 +3031,23 @@
if(!config.net.hostname.ok) return 0;
+ // calculate prefix from netmask if missing
+ if(
+ config.net.hostname.ipv4 &&
+ !config.net.hostname.prefix4 &&
+ config.net.netmask.ok &&
+ config.net.netmask.ip.s_addr
+ ) {
+ int i = 1;
+ uint32_t u = ntohl(config.net.netmask.ip.s_addr);
+
+ while(u <<= 1) i++;
+
+ if(config.debug) fprintf(stderr, "netmask to prefix: %d\n", i);
+
+ config.net.hostname.prefix4 = i;
+ }
+
if(asprintf(&fname, "/etc/sysconfig/network/ifcfg-%s", config.net.device) ==
-1) fname = NULL;
if((fp = fopen(fname, "w"))) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-4.2.9/settings.c
new/linuxrc-4.2.11/settings.c
--- old/linuxrc-4.2.9/settings.c 2014-02-03 14:05:52.000000000 +0100
+++ new/linuxrc-4.2.11/settings.c 2014-02-27 13:58:51.000000000 +0100
@@ -90,8 +90,8 @@
{ lang_uk, "Українська", "us", SMALL_FONT, UNI_FONT, 0, 1, "uk_UA", "uk", 0
},
{ lang_xh, "isiXhosa", "us", SMALL_FONT, UNI_FONT, 0, 0, "xh_ZA", "xh", 0 },
{ lang_zu, "isiZulu", "us", SMALL_FONT, UNI_FONT, 0, 0, "zu_ZA", "zu", 0 },
- // dummy for unknown language, must be last entry
- { lang_dummy, "", "us", SMALL_FONT, UNI_FONT, 0, 0, "en_US", "en_US", 0 },
+ // entry for unknown language
+ { lang_dummy, "", "us", SMALL_FONT, UNI_FONT, 0, 0, NULL, NULL, 0 },
};
#define KEYMAP_DEFAULT "us"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
