Hello community,
here is the log from the commit of package linuxrc for openSUSE:Factory checked
in at 2014-09-18 07:12:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-20
17:54:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-09-18
07:12:34.000000000 +0200
@@ -1,0 +2,26 @@
+Wed Sep 17 10:19:33 CEST 2014 - snw...@suse.de
+
+- don't check autoinst.xml digest (bnc #895670)
+- 5.0.19
+
+-------------------------------------------------------------------
+Mon Sep 15 13:29:22 CEST 2014 - snw...@suse.de
+
+- moved edd.ko loading into udev start script (bnc #871617)
+- 5.0.18
+
+-------------------------------------------------------------------
+Fri Sep 12 11:51:02 CEST 2014 - snw...@suse.de
+
+- finalize ifcfg option parsing
+- 5.0.17
+
+-------------------------------------------------------------------
+Thu Sep 11 11:13:59 CEST 2014 - snw...@suse.de
+
+- fix missing parameter to dia_input2()
+- increased memory thrreshold for loading inst-sys to RAM (bnc #893982)
+- look for autoinst.xml and keep the name (don't use autoyast.xml internally;
fate #316530)
+- 5.0.16
+
+-------------------------------------------------------------------
Old:
----
linuxrc-5.0.15.tar.xz
New:
----
linuxrc-5.0.19.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.GETvOs/_old 2014-09-18 07:12:35.000000000 +0200
+++ /var/tmp/diff_new_pack.GETvOs/_new 2014-09-18 07:12:35.000000000 +0200
@@ -25,9 +25,9 @@
Summary: SUSE Installation Program
License: GPL-3.0+
Group: System/Boot
-Version: 5.0.15
+Version: 5.0.19
Release: 0
-Source: linuxrc-5.0.15.tar.xz
+Source: linuxrc-5.0.19.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ linuxrc-5.0.15.tar.xz -> linuxrc-5.0.19.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.15/VERSION new/linuxrc-5.0.19/VERSION
--- old/linuxrc-5.0.15/VERSION 2014-08-18 16:25:37.000000000 +0200
+++ new/linuxrc-5.0.19/VERSION 2014-09-17 10:19:26.000000000 +0200
@@ -1 +1 @@
-5.0.15
+5.0.19
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.15/auto2.c new/linuxrc-5.0.19/auto2.c
--- old/linuxrc-5.0.15/auto2.c 2014-08-18 15:17:24.000000000 +0200
+++ new/linuxrc-5.0.19/auto2.c 2014-09-17 10:19:00.000000000 +0200
@@ -369,18 +369,18 @@
printf("Downloading AutoYaST file: %s\n", config.autoyast2);
fflush(stdout);
}
- err = url_read_file_anywhere(url, NULL, NULL, "/download/autoyast.xml",
NULL, URL_FLAG_PROGRESS + URL_FLAG_NODIGEST);
+ err = url_read_file_anywhere(url, NULL, NULL, "/download/autoinst.xml",
NULL, URL_FLAG_PROGRESS + URL_FLAG_NODIGEST);
url_umount(url);
url_free(url);
if(!err) {
- fprintf(stderr, "setting AutoYaST option to
file:///download/autoyast.xml\n");
- str_copy(&config.autoyast, "file:///download/autoyast.xml");
+ fprintf(stderr, "setting AutoYaST option to
file:///download/autoinst.xml\n");
+ str_copy(&config.autoyast, "file:///download/autoinst.xml");
/* parse it:
* you can embed linuxrc options between lines with '#
{start,end}_linuxrc_conf';
* otherwise the file content is ignored
*/
fprintf(stderr, "parsing AutoYaST file\n");
- file_read_info_file("file:/download/autoyast.xml", kf_cfg);
+ file_read_info_file("file:/download/autoinst.xml", kf_cfg);
net_update_ifcfg();
}
}
@@ -828,33 +828,35 @@
void auto2_read_repo_files(url_t *url)
{
int i;
- file_t *f0, *f;
- char *dst = NULL, *file_list = NULL;
+ char *dst = NULL;
static char *default_list[][2] = {
{ "/media.1/info.txt", "/info.txt" },
{ "/license.tar.gz", "/license.tar.gz" },
{ "/part.info", "/part.info" },
- { "/control.xml", "/control.xml" }
+ { "/control.xml", "/control.xml" },
+ { "/autoinst.xml", "/tmp/autoinst.xml" }
};
- // url_read_file(url, NULL, "/media.1/installfiles", file_list =
strdup(new_download()), NULL, URL_FLAG_PROGRESS);
-
- if((f0 = file_read_file(file_list, kf_none))) {
- for(f = f0; f && !config.digests.failed; f = f->next) {
- strprintf(&dst, "/%s/%s", f->value, *f->key_str == '/' ? f->key_str + 1
: f->key_str);
- url_read_file(url, NULL, f->key_str, dst, NULL, 0 /* + URL_FLAG_PROGRESS
*/);
- }
- }
- else {
- for(i = 0; i < sizeof default_list / sizeof *default_list &&
!config.digests.failed; i++) {
- url_read_file(url, NULL, default_list[i][0], default_list[i][1], NULL, 0
/* + URL_FLAG_PROGRESS */);
- }
+ for(i = 0; i < sizeof default_list / sizeof *default_list; i++) {
+ url_read_file(url, NULL, default_list[i][0], default_list[i][1], NULL,
URL_FLAG_NODIGEST);
}
- file_free_file(f0);
-
str_copy(&dst, NULL);
- str_copy(&file_list, NULL);
+
+ if(!config.autoyast) {
+ if(util_check_exist("/tmp/autoinst.xml")) rename("/tmp/autoinst.xml",
"/autoinst.xml");
+ if(util_check_exist("/autoinst.xml")) {
+ fprintf(stderr, "setting AutoYaST option to file:///autoinst.xml\n");
+ str_copy(&config.autoyast, "file:///autoinst.xml");
+ /* parse it:
+ * you can embed linuxrc options between lines with '#
{start,end}_linuxrc_conf';
+ * otherwise the file content is ignored
+ */
+ fprintf(stderr, "parsing AutoYaST file\n");
+ file_read_info_file("file:/autoinst.xml", kf_cfg);
+ net_update_ifcfg();
+ }
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.15/changelog new/linuxrc-5.0.19/changelog
--- old/linuxrc-5.0.15/changelog 2014-08-18 16:25:43.000000000 +0200
+++ new/linuxrc-5.0.19/changelog 2014-09-17 10:19:29.000000000 +0200
@@ -1,4 +1,32 @@
-2014-08-18: HEAD
+2014-09-17: HEAD
+ - Merge pull request #29 from openSUSE/sw_0016
+ - Sw 0016
+ - remove unnecessary check
+ - don't check autoinst.xml digest (bnc #895670)
+ - remove dead code
+
+2014-09-15: 5.0.18
+ - Merge pull request #28 from openSUSE/sw_0015
+ - moved edd.ko loading into udev start script (bnc #871617)
+ - moved edd.ko loading into udev start script (bnc #871617)
+ - We need to load more modules before starting udevd. Doing this in
udev_setup
+ - now. See related change in installation-images.
+
+2014-09-12: 5.0.17
+ - Merge pull request #27 from openSUSE/sw_0014
+ - finalize ifcfg option parsing
+ - finalize ifcfg option parsing
+
+2014-09-11: 5.0.16
+ - fix missing parameter to dia_input2()
+ - Merge pull request #26 from openSUSE/sw_0013
+ - look for autoinst.xml and keep the name (don't use autoyast.xml
internal...
+ - look for autoinst.xml and keep the name (don't use autoyast.xml
internally; fate #316530)
+ - Merge pull request #25 from jsrain/master
+ - increased memory thrreshold for loading inst-sys to RAM (bnc #893982)
+ - increased memory thrreshold for loading inst-sys to RAM (bnc #893982)
+
+2014-08-18: 5.0.15
- Merge pull request #24 from openSUSE/sw_0012
- Sw 0012
- clarify return code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.15/install.c new/linuxrc-5.0.19/install.c
--- old/linuxrc-5.0.15/install.c 2014-08-18 16:24:46.000000000 +0200
+++ new/linuxrc-5.0.19/install.c 2014-09-11 11:09:38.000000000 +0200
@@ -297,7 +297,7 @@
switch(di) {
case di_display_x11:
- if(dia_input2("Enter the name of the host running the X11 server.",
&config.net.displayip, 40)) return -1;
+ if(dia_input2("Enter the name of the host running the X11 server.",
&config.net.displayip, 40, 0)) return -1;
break;
case di_display_vnc:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.15/linuxrc.c new/linuxrc-5.0.19/linuxrc.c
--- old/linuxrc-5.0.15/linuxrc.c 2014-08-18 15:17:24.000000000 +0200
+++ new/linuxrc-5.0.19/linuxrc.c 2014-09-15 13:28:43.000000000 +0200
@@ -791,7 +791,7 @@
// default memory limits
config.memoryXXX.min_free = 12 << 20;
config.memoryXXX.min_yast = 224 << 20;
- config.memoryXXX.load_image = 350 << 20;
+ config.memoryXXX.load_image = 750 << 20;
config.swap_file_size = 1024; /* 1024 MB */
@@ -906,11 +906,6 @@
mount("devpts", "/dev/pts", "devpts", 0, 0);
}
- // we might need edd for udev
- if(util_check_exist("/modules/edd.ko")) {
- system("/sbin/insmod /modules/edd.ko 2>/dev/null");
- }
-
util_set_stderr(config.stderr_name);
time_t t = time(NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.15/net.c new/linuxrc-5.0.19/net.c
--- old/linuxrc-5.0.15/net.c 2014-08-18 16:24:46.000000000 +0200
+++ new/linuxrc-5.0.19/net.c 2014-09-12 11:49:50.000000000 +0200
@@ -2014,7 +2014,18 @@
// static config must be used only once
if(ifcfg->used && !ifcfg->dhcp) continue;
- ifcfg_write(ifcfg->device, ifcfg, 1);
+ if(ifcfg->device) {
+ ifcfg_write(ifcfg->device, ifcfg, 1);
+ }
+ else {
+ /*
+ * If there's no device specified we just remember the settings.
+ * So e.g. ifcfg=1.2.3.4/12,1.1.1.1 just becomes equivalent to
+ * hostip=1.2.3.4/12 gateway=1.1.1.1.
+ */
+ ifcfg_copy(config.ifcfg.manual, ifcfg);
+ ifcfg->used = 1;
+ }
}
// 2nd, all interfaces with wildcard patterns
@@ -2467,6 +2478,28 @@
}
+/*
+ * Make a (deep) copy of an ifcfg_t struct.
+ */
+void ifcfg_copy(ifcfg_t *dst, ifcfg_t *src)
+{
+ if(!dst || !src) return;
+
+ str_copy(&dst->device, src->device);
+ str_copy(&dst->type, src->type);
+ dst->dhcp = src->dhcp;
+ dst->used = src->used;
+ dst->pattern = src->pattern;
+ dst->ptp = src->ptp;
+ dst->netmask_prefix = src->netmask_prefix;
+ str_copy(&dst->vlan, src->vlan);
+ str_copy(&dst->ip, src->ip);
+ str_copy(&dst->gw, src->gw);
+ str_copy(&dst->ns, src->ns);
+ str_copy(&dst->domain, src->domain);
+}
+
+
ifcfg_t *ifcfg_append(ifcfg_t **p0, ifcfg_t *p)
{
for(; *p0; p0 = &(*p0)->next);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/linuxrc-5.0.15/net.h new/linuxrc-5.0.19/net.h
--- old/linuxrc-5.0.15/net.h 2014-08-18 16:24:46.000000000 +0200
+++ new/linuxrc-5.0.19/net.h 2014-09-12 11:49:50.000000000 +0200
@@ -25,6 +25,7 @@
void net_update_ifcfg(void);
ifcfg_t *ifcfg_parse(char *str);
ifcfg_t *ifcfg_append(ifcfg_t **p0, ifcfg_t *p);
+void ifcfg_copy(ifcfg_t *dst, ifcfg_t *src);
char *ifcfg_print(ifcfg_t *ifcfg);
void net_update_state(void);
void net_wicked_up(char *ifname);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
