Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2014-03-11 09:24:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-02 07:43:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2014-03-11 09:24:23.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Mar 10 13:10:37 CET 2014 - [email protected] + +- add 'autoyast2' option in preparation to fate #316530 +- s390: make sure network device has been activated before + driver update (bnc #616341, bnc #862673) + +------------------------------------------------------------------- +Fri Mar 7 15:05:35 CET 2014 - [email protected] + +- fix cifs mount arguments (bnc #865267) + +------------------------------------------------------------------- Old: ---- linuxrc-4.2.11.tar.bz2 New: ---- linuxrc-4.2.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.lUlKTZ/_old 2014-03-11 09:24:24.000000000 +0100 +++ /var/tmp/diff_new_pack.lUlKTZ/_new 2014-03-11 09:24:24.000000000 +0100 @@ -25,9 +25,9 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 4.2.11 +Version: 4.2.13 Release: 0 -Source: linuxrc-4.2.11.tar.bz2 +Source: linuxrc-4.2.13.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-4.2.11.tar.bz2 -> linuxrc-4.2.13.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.11/VERSION new/linuxrc-4.2.13/VERSION --- old/linuxrc-4.2.11/VERSION 2014-02-28 14:04:43.000000000 +0100 +++ new/linuxrc-4.2.13/VERSION 2014-03-10 13:10:31.000000000 +0100 @@ -1 +1 @@ -4.2.11 +4.2.13 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.11/auto2.c new/linuxrc-4.2.13/auto2.c --- old/linuxrc-4.2.11/auto2.c 2014-02-05 15:04:42.000000000 +0100 +++ new/linuxrc-4.2.13/auto2.c 2014-03-10 13:09:19.000000000 +0100 @@ -367,6 +367,29 @@ } } + /* + * load autoyast file unless the user has specified an autoyast option + * -- ok this sounds weird but actually makes sense... + */ + if(config.autoyast2 && !config.autoyast) { + fprintf(stderr, "Downloading AutoYaST file: %s\n", config.autoyast2); + printf("Downloading AutoYaST file: %s\n", config.autoyast2); + fflush(stdout); + url = url_set(config.autoyast2); +#if defined(__s390__) || defined(__s390x__) + if(url->is.network && !config.net.configured) net_activate_s390_devs(); +#endif + err = url_read_file_anywhere(url, NULL, NULL, "/download/autoyast.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"); + // don't parse it + // file_read_info_file("file:/download/autoyast.xml", kf_cfg); + } + } + /* load & run driverupdates */ if(config.update.urls) { dud_count = config.update.count; @@ -390,6 +413,11 @@ strprintf(&path2, "%s%sdriverupdate", path1, path1[0] == 0 || path1[strlen(path1) - 1] == '/' ? "" : "/"); +#if defined(__s390__) || defined(__s390x__) + if(url->is.network && !config.net.configured) { + net_activate_s390_devs(); + } +#endif err = url_read_file_anywhere( url, NULL, NULL, file_name, NULL, URL_FLAG_UNZIP + URL_FLAG_NODIGEST + URL_FLAG_PROGRESS + (config.secure ? URL_FLAG_CHECK_SIG : 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.11/changelog new/linuxrc-4.2.13/changelog --- old/linuxrc-4.2.11/changelog 2014-02-28 14:04:45.000000000 +0100 +++ new/linuxrc-4.2.13/changelog 2014-03-10 13:10:33.000000000 +0100 @@ -1,4 +1,18 @@ -2014-02-28: HEAD +2014-03-10: HEAD + - Merge pull request #5 from openSUSE/fate316530 + - Fate316530 + - add 'autoyast2' option in preparation to fate #316530 + - The difference to 'autoyast' is that linuxrc itself downloads the file and + - passes the autoyast.xml file to yast. + - We have to use a different option name because autoyast uses it's own + - url schemes different from linuxrc. + - s390: make sure network device has been activated before + driver update (bnc #616341, bnc #862673) + +2014-03-07: 4.2.12 + - fix cifs mount arguments (bnc #865267) + +2014-02-28: 4.2.11 - calculate prefix len from netmask (bnc #865199) 2014-02-27: 4.2.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.11/file.c new/linuxrc-4.2.13/file.c --- old/linuxrc-4.2.11/file.c 2014-02-18 11:40:30.000000000 +0100 +++ new/linuxrc-4.2.13/file.c 2014-03-10 13:09:19.000000000 +0100 @@ -124,6 +124,7 @@ { key_screenmap, "Screenmap", kf_none }, { key_fontmagic, "Fontmagic", kf_none }, { key_autoyast, "AutoYaST", kf_cfg + kf_cmd_early }, + { key_autoyast2, "AutoYaST2", kf_cfg + kf_cmd_early }, { key_linuxrc, "linuxrc", kf_cfg + kf_cmd_early }, { key_forceinsmod, "ForceInsmod", kf_cfg + kf_cmd }, { key_ipaddr, "IPAddr", kf_dhcp }, @@ -830,7 +831,10 @@ case key_autoyast: str_copy(&config.autoyast, *f->value ? f->value : "default"); config.manual = 0; - config.url.autoyast = url_set(f->value); + break; + + case key_autoyast2: + str_copy(&config.autoyast2, *f->value ? f->value : NULL); break; case key_info: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.11/file.h new/linuxrc-4.2.13/file.h --- old/linuxrc-4.2.11/file.h 2014-01-31 13:17:44.000000000 +0100 +++ new/linuxrc-4.2.13/file.h 2014-03-10 13:09:19.000000000 +0100 @@ -52,7 +52,7 @@ key_ipv6, key_ipv6only, key_usesax2, key_efi, key_supporturl, key_portno, key_osahwaddr, key_zen, key_zenconfig, key_udevrule, key_dhcpfail, key_namescheme, key_ptoptions, key_is_ptoption, key_withfcoe, key_digests, - key_plymouth, key_sslcerts, key_restart, key_restarted, key_wicked + key_plymouth, key_sslcerts, key_restart, key_restarted, key_wicked, key_autoyast2 } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.11/global.h new/linuxrc-4.2.13/global.h --- old/linuxrc-4.2.11/global.h 2014-02-03 14:07:35.000000000 +0100 +++ new/linuxrc-4.2.13/global.h 2014-03-10 13:09:19.000000000 +0100 @@ -404,6 +404,7 @@ unsigned add_cmdline:1; /* parse cmdline, too */ } info; char *autoyast; /* yast autoinstall parameter */ + char *autoyast2; /* yast autoinstall parameter, loaded by linuxrc */ char *yepurl; /* just pass it to yast */ char *yepcert; /* just pass it to yast */ char *supporturl; /* just pass it to yast */ @@ -469,7 +470,6 @@ slist_t *instsys_list; /* instsys list */ url_t *install; /* install url */ url_t *instsys; /* instsys url */ - url_t *autoyast; /* autoyast url */ url_t *proxy; /* proxy url */ } url; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-4.2.11/net.c new/linuxrc-4.2.13/net.c --- old/linuxrc-4.2.11/net.c 2014-02-28 13:58:31.000000000 +0100 +++ new/linuxrc-4.2.13/net.c 2014-03-07 15:03:47.000000000 +0100 @@ -1070,11 +1070,7 @@ strcat(options, workgroup); } } else { - /* - * mount.cifs needs a username, otherwise it takes LOGNAME from - * environment. see bugzilla #20152 - */ - strcat(options, ",username=root,guest"); + strcat(options, ",guest"); } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
