Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2016-03-18 21:37:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-02-23 16:53:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2016-03-18 21:37:38.000000000 +0100 @@ -1,0 +2,26 @@ +Mon Mar 14 10:45:15 UTC 2016 - [email protected] + +- fix network url handling (fate#318899) +- 5.0.75 + +------------------------------------------------------------------- +Mon Mar 14 10:40:15 UTC 2016 - [email protected] + +- Made the following changes for fate#320112 +- Removed all the code that asks for an OSA Portname +- If a Portname is found in the parameters, output a message saying it's deprecated +- Updated linuxrc.html to indicate that Portname is deprecated +- Updated linuxrc.html to also indicate that OsaMedium was deprecated, since people are still specifying it +- 5.0.74 + +------------------------------------------------------------------- +Mon Mar 14 10:30:18 UTC 2016 - [email protected] + +- Bring back Insecure documentation +- Simplify calculation of Insecure value in /etc/install.inf +- Writes Insecure parameter in install.inf +- Uses a string to store self.self_update_url +- Add SelfUpdate parameter (fate#319716) +- 5.0.73 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.72.tar.xz New: ---- linuxrc-5.0.75.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.gHb8bs/_old 2016-03-18 21:37:39.000000000 +0100 +++ /var/tmp/diff_new_pack.gHb8bs/_new 2016-03-18 21:37:39.000000000 +0100 @@ -25,7 +25,7 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.72 +Version: 5.0.75 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ linuxrc-5.0.72.tar.xz -> linuxrc-5.0.75.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/VERSION new/linuxrc-5.0.75/VERSION --- old/linuxrc-5.0.72/VERSION 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/VERSION 2016-03-14 11:40:28.000000000 +0100 @@ -1 +1 @@ -5.0.72 +5.0.75 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/changelog new/linuxrc-5.0.75/changelog --- old/linuxrc-5.0.72/changelog 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/changelog 2016-03-14 11:40:28.000000000 +0100 @@ -1,3 +1,20 @@ +2016-03-10: 5.0.75 + - fix network url handling (fate #318899) + +2016-02-19: 5.0.74 + - Made the following changes for FATE#320112 + - Removed all the code that asks for an OSA Portname + - If a Portname is found in the parameters, output a message saying it's deprecated + - Updated linuxrc.html to indicate that Portname is deprecated + - Updated linuxrc.html to also indicate that OsaMedium was deprecated, since people are still specifying it + +2016-03-14: 5.0.73 + - Bring back Insecure documentation + - Simplify calculation of Insecure value in /etc/install.inf + - Writes Insecure parameter in install.inf + - Uses a string to store self.self_update_url + - Add SelfUpdate parameter (FATE#319716) + 2016-02-17: 5.0.72 - fix extension handling - improve user-defined url doc (fate #318899) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/file.c new/linuxrc-5.0.75/file.c --- old/linuxrc-5.0.72/file.c 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/file.c 2016-03-14 11:40:28.000000000 +0100 @@ -308,6 +308,7 @@ { key_systemboot, "SystemBoot", kf_cfg + kf_cmd }, { key_sethostname, "SetHostname", kf_cfg + kf_cmd_early }, { key_debugshell, "DebugShell", kf_cfg + kf_cmd + kf_cmd_early }, + { key_self_update, "SelfUpdate", kf_cfg + kf_cmd }, }; static struct { @@ -1224,7 +1225,9 @@ if(*f->value) str_copy(&config.hwp.userid, f->value); break; case key_portname: - str_copy(&config.hwp.portname, f->value); + log_show("***\n"); + log_show("*** The Portname parameter is no longer needed. Please do not specify it.\n"); + log_show("***\n"); break; case key_readchan: if(*f->value) str_copy(&config.hwp.readchan, f->value); @@ -1756,6 +1759,15 @@ str_copy(&config.debugshell, *f->value ? f->value : NULL); break; + case key_self_update: + if (f->is.numeric) { + config.self_update = f->nvalue; + } else { + str_copy(&config.self_update_url, f->value); + config.self_update = 1; + } + break; + default: break; } @@ -1917,7 +1929,13 @@ file_write_num(f, key_y2gdb, config.y2gdb); file_write_num(f, key_kexec_reboot, config.kexec_reboot); file_write_num(f, key_efi, config.efi >= 0 ? config.efi : config.efi_vars); + file_write_num(f, key_insecure, !config.secure); if(config.upgrade) file_write_num(f, key_upgrade, config.upgrade); + if(config.self_update_url) + file_write_str(f, key_self_update, config.self_update_url); + else if (config.self_update == 0 || config.self_update == 1) + file_write_num(f, key_self_update, config.self_update); + else if( config.rootpassword && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/file.h new/linuxrc-5.0.75/file.h --- old/linuxrc-5.0.72/file.h 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/file.h 2016-03-14 11:40:28.000000000 +0100 @@ -54,7 +54,7 @@ key_namescheme, key_ptoptions, key_is_ptoption, key_withfcoe, key_digests, key_plymouth, key_sslcerts, key_restart, key_restarted, key_autoyast2, key_withipoib, key_upgrade, key_ifcfg, key_defaultinstall, key_nanny, key_vlanid, - key_sshkey, key_systemboot, key_sethostname, key_debugshell + key_sshkey, key_systemboot, key_sethostname, key_debugshell, key_self_update } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/global.h new/linuxrc-5.0.75/global.h --- old/linuxrc-5.0.72/global.h 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/global.h 2016-03-14 11:40:28.000000000 +0100 @@ -514,6 +514,8 @@ char *debugshell; /* command to run if we want to start a shell for debugging */ slist_t *extern_scheme; /* externally handled URL schemes */ slist_t *dia_extra_texts; /* dynamically defined dialog entries; cf. dia_get_text_id() */ + char *self_update_url; /* URL of YaST update for self-update */ + unsigned self_update:1; /* enables YaST self-update feature */ struct { unsigned md5:1; /* support md5 */ @@ -712,7 +714,6 @@ char* ccw_chan_ids; int ccw_chan_num; int protocol; - char* portname; int type; int interface; int layer2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/install.c new/linuxrc-5.0.75/install.c --- old/linuxrc-5.0.72/install.c 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/install.c 2016-03-14 11:40:28.000000000 +0100 @@ -888,6 +888,18 @@ /* path */ if(!err && dia_input2("Enter the directory on the server.", &path, 30, 0)) err = 1; + /* ensure leading "/" if mountable */ + if(!err && url_is_mountable(scheme)) { + if(path) { + if(*path != '/') { + strprintf(&path, "/%s", path); + } + } + else { + path = strdup("/"); + } + } + /* user, password */ if(!err && url_is_auth(scheme)) { if(!n_user) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/linuxrc.c new/linuxrc-5.0.75/linuxrc.c --- old/linuxrc-5.0.72/linuxrc.c 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/linuxrc.c 2016-03-14 11:40:28.000000000 +0100 @@ -791,6 +791,10 @@ config.udev_mods = 1; config.devtmpfs = 1; + // defaults for self-update feature + config.self_update_url = NULL; + config.self_update = 1; + config.scsi_rename = 0; config.scsi_before_usb = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/linuxrc.html new/linuxrc-5.0.75/linuxrc.html --- old/linuxrc-5.0.72/linuxrc.html 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/linuxrc.html 2016-03-14 11:40:28.000000000 +0100 @@ -1491,8 +1491,18 @@ </td></tr> <tr> +<td> OSAMedium </td><td> +<p><i>deprecated</i> +<p>Physical medium for OSA devices. +</p><p>This parameter is no longer needed for any OSA device +</p> +</td></tr> + +<tr> <td> Portname </td><td> +<p><i>deprecated</i> <p>Portname for OSA devices. +</p><p>No network device needs or uses a portname any longer </p> </td></tr> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/linuxrc_yast_interface.txt new/linuxrc-5.0.75/linuxrc_yast_interface.txt --- old/linuxrc-5.0.72/linuxrc_yast_interface.txt 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/linuxrc_yast_interface.txt 2016-03-14 11:40:28.000000000 +0100 @@ -293,6 +293,15 @@ # entry is missing if unset Cmdline: %s +# 1: enable self-update feature +# 0: disable self-update feature +# if a URL is given, it will be used to search for +# updates. +SelfUpdate: 0|1|%s + +# 1: secure mode disabled +# 0: secure mode enabled +Insecure: 0|1 *** Note *** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/net.c new/linuxrc-5.0.75/net.c --- old/linuxrc-5.0.72/net.c 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/net.c 2016-03-14 11:40:28.000000000 +0100 @@ -1542,14 +1542,6 @@ if((rc=dia_input2_chopspace("Device address for data channel", &config.hwp.datachan, 9, 0))) return rc; if((rc=net_check_ccw_address(config.hwp.datachan))) return rc; - if (config.hwp.type != di_390net_hsi) { - IFNOTAUTO(config.hwp.portname) - { - if((rc=dia_input2_chopspace("Portname to use", &config.hwp.portname,9,0))) return rc; - // FIXME: warn about problems related to empty portnames - } - } - IFNOTAUTO(config.hwp.layer2) { config.hwp.layer2 = dia_yesno("Enable OSI Layer 2 support?", YES) == YES ? LAYER2_YES : LAYER2_NO; @@ -1618,10 +1610,7 @@ ccmd += sprintf(ccmd, "qeth_configure "); if(config.hwp.portno) ccmd += sprintf(ccmd, "-n %d ", config.hwp.portno - 1); - ccmd += sprintf(ccmd, "%s%s%s %s %s %s %s 1", - config.hwp.portname ? "-p \"" : "", - config.hwp.portname ? config.hwp.portname : "", - config.hwp.portname ? "\"" : "", + ccmd += sprintf(ccmd, "%s %s %s %s 1", config.hwp.layer2 == LAYER2_YES ? "-l" : "", config.hwp.readchan, config.hwp.writechan, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/url.c new/linuxrc-5.0.75/url.c --- old/linuxrc-5.0.72/url.c 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/url.c 2016-03-14 11:40:28.000000000 +0100 @@ -1331,6 +1331,9 @@ log_info("disk: %s: mount failed\n", url->used.device); str_copy(&url->tmp_mount, NULL); } + else { + strprintf(&path, "%s%s", url->tmp_mount, url->path); + } } else { log_info("%s: unsupported scheme\n", url_scheme2name(url->scheme)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.72/util.c new/linuxrc-5.0.75/util.c --- old/linuxrc-5.0.72/util.c 2016-02-18 11:18:29.000000000 +0100 +++ new/linuxrc-5.0.75/util.c 2016-03-14 11:40:28.000000000 +0100 @@ -1200,8 +1200,14 @@ add_flag(&sl0, buf, config.withipoib, "ipoib"); add_flag(&sl0, buf, config.upgrade, "upgrade"); add_flag(&sl0, buf, config.net.sethostname, "hostname"); + add_flag(&sl0, buf, config.self_update, "self_update"); if(*buf) slist_append_str(&sl0, buf); + if(config.self_update_url) { + sprintf(buf, "self-update URL: %s", config.self_update_url); + slist_append_str(&sl0, buf); + } + if(config.extern_scheme) { strcpy(buf, "additional URL schemes:"); slist_append_str(&sl0, buf);
