Author: jsrain Date: Thu Jun 28 21:34:35 2007 New Revision: 39088 URL: http://svn.opensuse.org/viewcvs/yast?rev=39088&view=rev Log: added mode for live CD installation several updates for live CD installation Modified: trunk/yast2/library/control/src/Installation.ycp trunk/yast2/library/modules/Mode.ycp trunk/yast2/library/system/src/Initrd.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/control/src/Installation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Installation.ycp?rev=39088&r1=39087&r2=39088&view=diff ============================================================================== --- trunk/yast2/library/control/src/Installation.ycp (original) +++ trunk/yast2/library/control/src/Installation.ycp Thu Jun 28 21:34:35 2007 @@ -72,6 +72,9 @@ // Update instead on New Installation global string Installation::file_update_mode = Directory::vardir + "/update_mode"; + // Live installation instead on standard Installation + global string Installation::file_live_install_mode = Directory::vardir + "/live_install_mode"; + // Second stage installation (Stage::cont()) global string Installation::restart_data_file = Directory::vardir + "/continue_installation"; Modified: trunk/yast2/library/modules/Mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Mode.ycp?rev=39088&r1=39087&r2=39088&view=diff ============================================================================== --- trunk/yast2/library/modules/Mode.ycp (original) +++ trunk/yast2/library/modules/Mode.ycp Thu Jun 28 21:34:35 2007 @@ -113,6 +113,7 @@ if (! contains ( [ "installation", "update", "normal", "repair", "autoinstallation", "autoinst_config", + "live_installation" ], new_mode)) { @@ -178,7 +179,15 @@ * we're doing a fresh installation */ global boolean installation () { - return mode () == "installation" || mode () == "autoinstallation"; + return mode () == "installation" || mode () == "autoinstallation" + || mode () == "live_installation"; +} + +/** + * we're doing a fresh installation from live CD/DVD + */ +global boolean live_installation () { + return mode () == "live_installation"; } /** Modified: trunk/yast2/library/system/src/Initrd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Initrd.ycp?rev=39088&r1=39087&r2=39088&view=diff ============================================================================== --- trunk/yast2/library/system/src/Initrd.ycp (original) +++ trunk/yast2/library/system/src/Initrd.ycp Thu Jun 28 21:34:35 2007 @@ -61,6 +61,10 @@ */ string splash = ""; /** + * Additional parameters for mkinitrd + */ + string additional_parameters = ""; + /** * List of modules which should be not added/removed to/from initrd */ list<string> modules_to_skip = nil; @@ -395,8 +399,9 @@ string param = ""; if (splash != "" && splash != nil) param = sformat ("-s %1", splash); - if ( SCR::Execute (.target.bash, sformat ("/sbin/mkinitrd %1 >> \ -%2 2>&1", param, Directory::logdir + "/y2logmkinitrd")) != 0 ) + if ( SCR::Execute (.target.bash, sformat ("/sbin/mkinitrd %1 %2 >> \ +%3 2>&1", param, additional_parameters, +Directory::logdir + "/y2logmkinitrd")) != 0 ) { string log = (string) SCR::Read (.target.string, Directory::logdir + "/y2logmkinitrd"); @@ -439,4 +444,20 @@ } } +/** + * Get additional parameters for mkinitrd + * @return string additional mkinitrd parameters + */ +global string AdditionalParameters () { + return additional_parameters; +} + +/** + * Set additional parameters for mkinitrd + * @param params string additional mkinitrd parameters + */ +global void SetAdditionalParameters (string params) { + additional_parameters = params; +} + } // end of module Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=39088&r1=39087&r2=39088&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jun 28 21:34:35 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 28 21:33:42 CEST 2007 - jsrain@suse.cz + +- added mode for live CD installation +- several updates for live CD installation + +------------------------------------------------------------------- Wed Jun 20 11:56:36 CEST 2007 - locilka@suse.cz - Extending Installation module to provide persistent information -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org