Author: ug Date: Fri Nov 9 12:03:42 2007 New Revision: 41911 URL: http://svn.opensuse.org/viewcvs/yast?rev=41911&view=rev Log: copy modified profile to the installed system too (#328837) Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/inst_autosetup.ycp trunk/autoinstallation/src/modules/AutoInstall.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=41911&r1=41910&r2=41911&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Fri Nov 9 12:03:42 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 9 12:02:40 CET 2007 - ug@suse.de + +- copy modified profile to the installed system too (#328837) + +------------------------------------------------------------------- Wed Nov 7 16:27:03 CET 2007 - ug@suse.de - some hardware information for rules was not probed (#336339) Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/inst_autosetup.ycp?rev=41911&r1=41910&r2=41911&view=diff ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autosetup.ycp Fri Nov 9 12:03:42 2007 @@ -47,7 +47,11 @@ ")); return `abort; } - string cpcmd = sformat("mv %1 %2", AutoinstConfig::modified_profile, "/tmp/profile/autoinst.xml"); + string cpcmd = sformat("mv %1 %2","/tmp/profile/autoinst.xml", "/tmp/profile/pre-autoinst.xml"); + y2milestone("moving original profile: %1",cpcmd); + SCR::Execute(.target.bash, cpcmd); + + cpcmd = sformat("mv %1 %2", AutoinstConfig::modified_profile, "/tmp/profile/autoinst.xml"); y2milestone("moving modified profile: %1",cpcmd); SCR::Execute(.target.bash, cpcmd); return `found; Modified: trunk/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoInstall.ycp?rev=41911&r1=41910&r2=41911&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstall.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstall.ycp Fri Nov 9 12:03:42 2007 @@ -126,10 +126,15 @@ } SCR::Execute(.target.bash, sformat("/bin/cp %1 %2%3", - AutoinstConfig::xml_tmpfile , destdir , AutoinstConfig::xml_file) ); + "/tmp/profile/autoinst.xml" , destdir , AutoinstConfig::xml_file) ); SCR::Execute(.target.bash, sformat("/bin/chmod 700 %1%2", destdir , AutoinstConfig::xml_file) ); + SCR::Execute(.target.bash, sformat("/bin/cp %1 %2%3", + AutoinstConfig::profile_dir+"/pre-autoinst.xml" , destdir , AutoinstConfig::cache) ); + SCR::Execute(.target.bash, sformat("/bin/chmod 700 %1%2", + destdir , AutoinstConfig::cache+"/pre-autoinst.xml") ); + return; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org