Author: ug Date: Wed Jul 2 14:09:40 2008 New Revision: 48778 URL: http://svn.opensuse.org/viewcvs/yast?rev=48778&view=rev Log: moved the DASD processing for fate #301193 Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autoinit.ycp trunk/autoinstallation/src/clients/inst_autosetup.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=48778&r1=48777&r2=48778&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jul 2 14:09:40 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 2 14:08:25 CEST 2008 - ug@suse.de + +- moved the DASD processing for fate #301193 + +------------------------------------------------------------------- Tue Jul 1 11:27:46 CEST 2008 - ug@suse.de - write to system feature added (fate#302171) Modified: trunk/autoinstallation/src/clients/inst_autoinit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/inst_autoinit.ycp?rev=48778&r1=48777&r2=48778&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoinit.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoinit.ycp Wed Jul 2 14:09:40 2008 @@ -22,7 +22,7 @@ import "Language"; import "Console"; import "Profile"; - import "Arch"; +// import "Arch"; import "Call"; import "Popup"; @@ -138,6 +138,9 @@ Progress::Title(_("Preprobing stage")); y2milestone("pre probing"); +/* // moved to autoset to fulfill fate #301193 + // the DASD section in an autoyast profile can't be changed via pre-script + // if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) { y2milestone("arch=s390 and remote_profile=true"); symbol ret = processProfile(); @@ -157,6 +160,7 @@ Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]); } } +*/ string tmp = (string)SCR::Read (.target.string, "/etc/install.inf"); if (tmp != nil && issubstring( tolower(tmp), "iscsi: 1" ) ) { WFM::CallFunction("inst_iscsi-client", []); Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/inst_autosetup.ycp?rev=48778&r1=48777&r2=48778&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autosetup.ycp Wed Jul 2 14:09:40 2008 @@ -168,6 +168,20 @@ if (Popup::ConfirmAbort (`painless)) return `abort; + // moved here from autoinit for fate #301193 + // needs testing + if( Arch::s390 () && AutoinstConfig::remoteProfile == true ) { + y2milestone("arch=s390 and remote_profile=true"); + if( haskey(Profile::current, "dasd") ) { + y2milestone("dasd found"); + Call::Function("dasd_auto", ["Import", Profile::current["dasd"]:$[] ]); + } + if( haskey(Profile::current, "zfcp") ) { + y2milestone("zfcp found"); + Call::Function("zfcp_auto", ["Import", Profile::current["zfcp"]:$[] ]); + } + } + Progress::NextStage(); // if one modifies the partition table in a pre script, we will -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org