Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2015-10-02 09:23:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-09-13 09:44:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2015-10-02 09:23:09.000000000 +0200 @@ -1,0 +2,26 @@ +Tue Sep 29 09:15:32 UTC 2015 - [email protected] + +- Add documentation about how the project is sent to the distribution +- 5.0.58 + +------------------------------------------------------------------- +Wed Sep 16 12:22:33 UTC 2015 - [email protected] + +- get rid of 'no job control' bash messages (bsc#945607) +- 5.0.57 + +------------------------------------------------------------------- +Tue Sep 15 17:26:10 CEST 2015 - [email protected] + +- Added hwaddr to netdevice identifier (bsc#944347) +- 5.0.56 + +------------------------------------------------------------------- +Mon Sep 14 16:21:08 CEST 2015 - [email protected] + +- further simplify module param code +- fix typo +- fix segfault when asking for module params (bsc#945608) +- 5.0.55 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.54.tar.xz New: ---- linuxrc-5.0.58.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.s1ZoO7/_old 2015-10-02 09:23:09.000000000 +0200 +++ /var/tmp/diff_new_pack.s1ZoO7/_new 2015-10-02 09:23:09.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package linuxrc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.54 +Version: 5.0.58 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ linuxrc-5.0.54.tar.xz -> linuxrc-5.0.58.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/README.md new/linuxrc-5.0.58/README.md --- old/linuxrc-5.0.54/README.md 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/README.md 2015-09-29 11:12:58.000000000 +0200 @@ -57,3 +57,6 @@ [system:install:head](https://build.opensuse.org/package/show/system:install:head/linuxrc) OBS project. From that place it is forwarded to [openSUSE Factory](https://build.opensuse.org/project/show/openSUSE:Factory). + +You can find more information about this workflow in the [linuxrc-devtools +documentation](https://github.com/openSUSE/linuxrc-devtools#opensuse-development). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/VERSION new/linuxrc-5.0.58/VERSION --- old/linuxrc-5.0.54/VERSION 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/VERSION 2015-09-29 11:12:58.000000000 +0200 @@ -1 +1 @@ -5.0.54 +5.0.58 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/changelog new/linuxrc-5.0.58/changelog --- old/linuxrc-5.0.54/changelog 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/changelog 2015-09-29 11:12:58.000000000 +0200 @@ -1,3 +1,17 @@ +2015-09-28: 5.0.58 + - Add documentation about how the project is sent to the distribution + +2015-09-16: 5.0.57 + - get rid of 'no job control' bash messages (bsc #945607) + +2015-09-15: 5.0.56 + - Added hwaddr to netdevice identifier (bsc #944347) + +2015-09-14: 5.0.55 + - further simplify module param code + - fix typo + - fix segfault when asking for module params (bsc #945608) + 2015-09-07: 5.0.54 - s390x: keep ssh active when selecting vnc (bsc #943744) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/dialog.c new/linuxrc-5.0.58/dialog.c --- old/linuxrc-5.0.54/dialog.c 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/dialog.c 2015-09-29 11:12:58.000000000 +0200 @@ -1520,7 +1520,10 @@ fflush(stdout); } - system("exec bash -l 2>&1"); + char *cmd = NULL; + strprintf(&cmd, "exec %s 2>&1", config.debugshell ?: "/bin/sh"); + system(cmd); + free(cmd); kbd_init(0); if(config.win) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/file.c new/linuxrc-5.0.58/file.c --- old/linuxrc-5.0.54/file.c 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/file.c 2015-09-29 11:12:58.000000000 +0200 @@ -307,6 +307,7 @@ { key_vlanid, "VLanID", kf_cfg + kf_cmd }, { 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 }, }; static struct { @@ -1721,6 +1722,10 @@ if(f->is.numeric) config.net.sethostname = f->nvalue; break; + case key_debugshell: + str_copy(&config.debugshell, *f->value ? f->value : NULL); + break; + default: break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/file.h new/linuxrc-5.0.58/file.h --- old/linuxrc-5.0.54/file.h 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/file.h 2015-09-29 11:12:58.000000000 +0200 @@ -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_sshkey, key_systemboot, key_sethostname, key_debugshell } file_key_t; typedef enum { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/global.h new/linuxrc-5.0.58/global.h --- old/linuxrc-5.0.54/global.h 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/global.h 2015-09-29 11:12:58.000000000 +0200 @@ -470,6 +470,7 @@ char *change_config; /* for 'change config option' input field */ char *run_command; /* for 'run command' input field */ slist_t *defaultrepo; /* default repo locations */ + char *debugshell; /* command to run if we want to start a shell for debugging */ struct { unsigned md5:1; /* support md5 */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/linuxrc.c new/linuxrc-5.0.58/linuxrc.c --- old/linuxrc-5.0.54/linuxrc.c 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/linuxrc.c 2015-09-29 11:12:58.000000000 +0200 @@ -752,6 +752,8 @@ config.setupcmd = strdup("setctsid `showconsole` inst_setup yast"); + config.debugshell = strdup("setctsid `showconsole` /bin/bash -l"); + config.update.map = calloc(1, MAX_UPDATES); config.zenconfig = strdup("settings.txt"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/module.c new/linuxrc-5.0.58/module.c --- old/linuxrc-5.0.54/module.c 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/module.c 2015-09-29 11:12:58.000000000 +0200 @@ -42,7 +42,6 @@ static int mod_types = 0; static int mod_type[MAX_MODULE_TYPES] = {}; static int mod_menu_last = 0; -static char *mod_param_text = NULL; static int mod_show_kernel_messages = 0; static void mod_update_list(void); @@ -551,34 +550,32 @@ char *mod_get_params(module_t *mod) { - char buf[256], *buf2 = NULL; + char *buf = NULL, *buf2 = NULL; slist_t *sl; + int err; - if(mod_param_text) { - strcpy(buf, mod_param_text); - } - else { - sprintf(buf, "Enter parameters for \"%s\".", mod->name); - } - - *buf2 = 0; + strprintf(&buf, "Enter parameters for \"%s\".", mod->name); if(mod->param) { - strcat(buf, "\n\nExample: "); - strcat(buf, mod->param); - if(mod->autoload) strcpy(buf2, mod->param); + strprintf(&buf, "%s\n\nExample: %s", buf, mod->param); + if(mod->autoload) str_copy(&buf2, mod->param); } sl = slist_getentry(config.module.input_params, mod->name); - if(sl && sl->value) strcpy(buf2, sl->value); + if(sl && sl->value) str_copy(&buf2, sl->value); + + err = dia_input2(buf, &buf2, 30, 0); - if(dia_input2(buf, &buf2, 30, 0)) return NULL; + str_copy(&buf, NULL); + + if(err) return NULL; if(!sl) { sl = slist_add(&config.module.input_params, slist_new()); sl->key = strdup(mod->name); } + if(sl->value) free(sl->value); sl->value = buf2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/net.c new/linuxrc-5.0.58/net.c --- old/linuxrc-5.0.54/net.c 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/net.c 2015-09-29 11:12:58.000000000 +0200 @@ -689,6 +689,8 @@ } for(item_cnt = 0, hd = hd_cards; hd; hd = hd->next) { + char* annotation = 0; + hd_res_t *res; item_hds[item_cnt] = hd; if(hd->unix_dev_name) { item_devs[item_cnt] = strdup(hd->unix_dev_name); @@ -703,7 +705,6 @@ int lcss = -1; int ccw = -1; hd_res_t* r; - char* annotation = 0; if(hd->detail && hd->detail->ccw.data) lcss = hd->detail->ccw.data->lcss; @@ -721,24 +722,26 @@ else { strprintf(&annotation, "(%1x.%1x.%04x)", lcss >> 8, lcss & 0xf, ccw); } - - if(hd->unix_dev_name) { - strprintf(items + item_cnt++, "%*s : %s %s", -width, hd->unix_dev_name, hd->model, - annotation); - } - else { - strprintf(items + item_cnt++, "%s %s", hd->model, annotation); + } +#endif + if(!annotation) { + for(res = hd->res; res; res = res->next) { + if(res->any.type == res_hwaddr) { + strprintf(&annotation, "(%s)", res->hwaddr.addr); + break; + } } - free(annotation); } -#else + if(hd->unix_dev_name) { - strprintf(items + item_cnt++, "%*s : %s", -width, hd->unix_dev_name, hd->model); + strprintf(items + item_cnt++, "%*s : %s %s", -width, hd->unix_dev_name, hd->model, + annotation); } else { - strprintf(items + item_cnt++, "%s", hd->model); + strprintf(items + item_cnt++, "%s %s", hd->model, annotation); } -#endif + free(annotation); + annotation = 0; } } @@ -751,7 +754,7 @@ choice = 1; } else { - choice = dia_list("Choose the network device.", 50, NULL, items, last_item, align_left); + choice = dia_list("Choose the network device.", 72, NULL, items, last_item, align_left); if(choice) last_item = choice; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.54/settings.c new/linuxrc-5.0.58/settings.c --- old/linuxrc-5.0.54/settings.c 2015-09-07 18:14:10.000000000 +0200 +++ new/linuxrc-5.0.58/settings.c 2015-09-29 11:12:58.000000000 +0200 @@ -598,7 +598,10 @@ fflush(stdout); } - system("PS1='\\w # ' /bin/bash 2>&1"); + char *cmd = NULL; + strprintf(&cmd, "PS1='\\w # ' %s 2>&1", config.debugshell ?: "/bin/sh"); + system(cmd); + free(cmd); kbd_init(0); if(config.win) {
