Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2016-06-26 23:51: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-05-23 16:36:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2016-06-26 23:51:38.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jun 22 14:40:18 UTC 2016 - [email protected] + +- document XVideo option (bsc#974821) +- 5.0.83 + +------------------------------------------------------------------- +Tue Jun 14 08:25:25 UTC 2016 - [email protected] + +- restore standard IO file descriptors when returning from external shell (bsc#983014) +- 5.0.82 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.81.tar.xz New: ---- linuxrc-5.0.83.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.0HSgRg/_old 2016-06-26 23:51:39.000000000 +0200 +++ /var/tmp/diff_new_pack.0HSgRg/_new 2016-06-26 23:51:39.000000000 +0200 @@ -25,7 +25,7 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.81 +Version: 5.0.83 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ linuxrc-5.0.81.tar.xz -> linuxrc-5.0.83.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.81/VERSION new/linuxrc-5.0.83/VERSION --- old/linuxrc-5.0.81/VERSION 2016-05-18 11:50:57.000000000 +0200 +++ new/linuxrc-5.0.83/VERSION 2016-06-22 16:37:25.000000000 +0200 @@ -1 +1 @@ -5.0.81 +5.0.83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.81/changelog new/linuxrc-5.0.83/changelog --- old/linuxrc-5.0.81/changelog 2016-05-18 11:50:57.000000000 +0200 +++ new/linuxrc-5.0.83/changelog 2016-06-22 16:37:25.000000000 +0200 @@ -1,3 +1,9 @@ +2016-06-22: 5.0.83 + - document XVideo option (bsc #974821) + +2016-06-14: 5.0.82 + - restore standard IO file descriptors when returning from external shell (bsc #983014) + 2016-05-18: 5.0.81 - activate AutoUpgrade if Upgrade + AutoYaST are set (bsc #978252) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.81/dialog.c new/linuxrc-5.0.83/dialog.c --- old/linuxrc-5.0.81/dialog.c 2016-05-18 11:50:57.000000000 +0200 +++ new/linuxrc-5.0.83/dialog.c 2016-06-22 16:37:25.000000000 +0200 @@ -1508,27 +1508,7 @@ } } else if(i == -74) { - kbd_end(0); - if(config.win) { - disp_cursor_on(); - } - if(!config.linemode) { - printf("\033c"); - if(config.utf8) printf("\033%%G"); - fflush(stdout); - } - - char *cmd = NULL; - strprintf(&cmd, "exec %s 2>&1", config.debugshell ?: "/bin/sh"); - system(cmd); - free(cmd); - - kbd_init(0); - if(config.win) { - disp_cursor_off(); - if(!config.linemode) disp_restore_screen(); - } - + util_run_debugshell(); } else { break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.81/linuxrc_yast_interface.txt new/linuxrc-5.0.83/linuxrc_yast_interface.txt --- old/linuxrc-5.0.81/linuxrc_yast_interface.txt 2016-05-18 11:50:57.000000000 +0200 +++ new/linuxrc-5.0.83/linuxrc_yast_interface.txt 2016-06-22 16:37:25.000000000 +0200 @@ -303,6 +303,17 @@ # 0: secure mode enabled Insecure: 0|1 +# xvideo option as passed at the boot prompt +# +# Option accepts a screen size ("1024x768") optionally followed by a +# screen resolution in dpi ("1024x768,100"). +# +# This is expected to only change the installer screen size and not to be +# applied to the installed system. +# +# entry is missing if no xvideo option was used +XVideo: %s + *** Note *** There may be some more entries in install.inf but they are put there by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.81/settings.c new/linuxrc-5.0.83/settings.c --- old/linuxrc-5.0.81/settings.c 2016-05-18 11:50:57.000000000 +0200 +++ new/linuxrc-5.0.83/settings.c 2016-06-22 16:37:25.000000000 +0200 @@ -587,26 +587,7 @@ break; case di_extras_shell: - kbd_end(0); - if(config.win) { - disp_cursor_on(); - } - if(!config.linemode) { - printf("\033c"); - if(config.utf8) printf("\033%%G"); - fflush(stdout); - } - - char *cmd = NULL; - strprintf(&cmd, "PS1='\\w # ' %s 2>&1", config.debugshell ?: "/bin/sh"); - system(cmd); - free(cmd); - - kbd_init(0); - if(config.win) { - disp_cursor_off(); - if(!config.linemode) disp_restore_screen(); - } + util_run_debugshell(); break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.81/util.c new/linuxrc-5.0.83/util.c --- old/linuxrc-5.0.81/util.c 2016-05-18 11:50:57.000000000 +0200 +++ new/linuxrc-5.0.83/util.c 2016-06-22 16:37:25.000000000 +0200 @@ -5457,3 +5457,40 @@ log_info("set hostname: %s\n", hostname); } + +/* + * Run debug shell. + * + * This takes care of screen settings and restoring standard file + * descriptors. + */ +void util_run_debugshell() +{ + kbd_end(1); + + if(config.win) { + disp_cursor_on(); + } + if(!config.linemode) { + printf("\033c"); + if(config.utf8) printf("\033%%G"); + fflush(stdout); + } + + char *cmd = NULL; + strprintf(&cmd, "exec %s 2>&1", config.debugshell ?: "/bin/sh"); + system(cmd); + free(cmd); + + freopen(config.console, "r", stdin); + freopen(config.console, "a", stdout); + freopen(config.console, "a", stderr); + + kbd_init(0); + + if(config.win) { + disp_cursor_off(); + if(!config.linemode) disp_restore_screen(); + } +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-5.0.81/util.h new/linuxrc-5.0.83/util.h --- old/linuxrc-5.0.81/util.h 2016-05-18 11:50:57.000000000 +0200 +++ new/linuxrc-5.0.83/util.h 2016-06-22 16:37:25.000000000 +0200 @@ -156,3 +156,4 @@ void util_perror(unsigned level, char *msg); char *util_get_caller(int skip); void util_set_hostname(char *hostname); +void util_run_debugshell(void);
