Author: locilka Date: Thu Oct 4 14:28:29 2007 New Revision: 41255 URL: http://svn.opensuse.org/viewcvs/yast?rev=41255&view=rev Log: - Adding missing live_save_config_finish script (#310517). - Adding new inst_live_pre-proposal script that adjusts Kernel vga parameter according to /proc/cmdline (#297612). - 2.15.13 Added: branches/SuSE-Linux-10_3-Branch/live-installer/src/inst_live_pre-proposal.ycp Modified: branches/SuSE-Linux-10_3-Branch/live-installer/VERSION branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml Modified: branches/SuSE-Linux-10_3-Branch/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-installer/VERSION?rev=41255&r1=41254&r2=41255&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/VERSION Thu Oct 4 14:28:29 2007 @@ -1 +1 @@ -2.15.12 +2.15.13 Modified: branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes?rev=41255&r1=41254&r2=41255&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes Thu Oct 4 14:28:29 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Oct 4 14:26:12 CEST 2007 - locilka@suse.cz + +- Adding missing live_save_config_finish script (#310517). +- Adding new inst_live_pre-proposal script that adjusts Kernel + vga parameter according to /proc/cmdline (#297612). +- 2.15.13 + +------------------------------------------------------------------- Wed Sep 26 17:16:13 CEST 2007 - jsrain@suse.cz - added missing step to prepare internet test (#325560) Modified: branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am?rev=41255&r1=41254&r2=41255&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/src/Makefile.am Thu Oct 4 14:28:29 2007 @@ -15,7 +15,9 @@ inst_live_full_proposal.ycp \ inst_live_simple_proposal.ycp \ inst_live_cleanup.ycp \ - inst_live_prepare_net_test.ycp + inst_live_prepare_net_test.ycp \ + live_save_config_finish.ycp \ + inst_live_pre-proposal.ycp desktop_DATA = \ live-installer.desktop Modified: branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml?rev=41255&r1=41254&r2=41255&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/src/control/live-install.xml Thu Oct 4 14:28:29 2007 @@ -163,6 +163,10 @@ --> <module> <label>Installation Settings</label> + <name>inst_live_pre-proposal</name> + </module> + <module> + <label>Installation Settings</label> <name>inst_proposal</name> <proposal>initial</proposal> </module> Added: branches/SuSE-Linux-10_3-Branch/live-installer/src/inst_live_pre-proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-installer/src/inst_live_pre-proposal.ycp?rev=41255&view=auto ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/src/inst_live_pre-proposal.ycp (added) +++ branches/SuSE-Linux-10_3-Branch/live-installer/src/inst_live_pre-proposal.ycp Thu Oct 4 14:28:29 2007 @@ -0,0 +1,51 @@ +/** + * Steps that need to be done before the installation proposal is called + */ +{ + + import "GetInstArgs"; + import "Kernel"; + + // <-- functions --> + + void SetVGAKernelParam () { + string cmldline = (string) WFM::Read (.local.string, "/proc/cmdline"); + + if (cmldline == nil) { + y2error ("No cmdline!"); + return; + } + + list <string> cmdline_args = splitstring (cmldline, " \t\n"); + + string just_parsing = ""; + + foreach (string cmdline_arg, cmdline_args, { + if (regexpmatch (cmdline_arg, "[vV][gG][aA]=.*")) { + just_parsing = cmdline_arg; + cmdline_arg = regexpsub (cmdline_arg, "[vV][gG][aA]=(.*)", "\\1"); + + if (cmdline_arg == nil || cmdline_arg == "") { + y2error ("Incorrect vga param %1", just_parsing); + break; + } else { + y2milestone ("Adjusting Kernel cmdline vga=%1", cmdline_arg); + Kernel::SetVgaType (cmdline_arg); + break; + } + } + }); + } + + // <-- functions --> + + if (GetInstArgs::going_back()) { + y2milestone ("going back..."); + return `back; + } + + // bugzilla #297612 + SetVGAKernelParam(); + + return `next; +} -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org