Author: locilka Date: Tue Jan 3 16:23:07 2012 New Revision: 67086 URL: http://svn.opensuse.org/viewcvs/yast?rev=67086&view=rev Log: Modified saving state of the current randomness (bnc#692799). Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/clients/umount_finish.ycp Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/instal... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Tue Jan 3 16:23:07 2012 @@ -1 +1 @@ -2.17.96 +2.17.97 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/instal... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Tue Jan 3 16:23:07 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 3 16:21:42 CET 2012 - locilka@suse.cz + +- Modified saving state of the current randomness (bnc#692799). +- 2.17.97 + +------------------------------------------------------------------- Thu Dec 8 16:45:15 CET 2011 - locilka@suse.cz - Fixed saving state of the current randomness (bnc#692799). Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/umount_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/instal... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/umount_finish.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/umount_finish.ycp Tue Jan 3 16:23:07 2012 @@ -55,7 +55,7 @@ } /** - * Preserves the current randomness state + * Preserves the current randomness state, BNC #692799 */ void preserve_randomness_state () { if (Mode::update()) { @@ -72,7 +72,8 @@ ret = true; // Copy the current state of random number generator to the installed system - if (LocalCommand (sformat ("dd if='%1' bs=1024 count=1 of='%2'", + // 4*1024 bytes as stated in BNC #692799, comment #71 + if (LocalCommand (sformat ("dd if='%1' bs=1024 count=4 of='%2'", String::Quote (random_path), String::Quote (store_to) ))) { y2milestone ("State of %1 has been successfully copied to %2", random_path, store_to); @@ -158,6 +159,9 @@ } }); + // BNC #692799: Preserve the randomness state before umounting + preserve_randomness_state(); + map<string,map> targetMap = Storage::GetTargetMap(); // first umount all file based crypto fs since they potentially @@ -182,12 +186,6 @@ umountLength = umountLength - 1; string tmp = Installation::destdir + (string) (umountList[umountLength]:""); - // This is the very last partition, actually "/" - if (umountLength == 0) { - // BNC #692799: Preserve the randomness state before umounting - preserve_randomness_state(); - } - y2milestone ("umount target: %1, %2 more to go..", tmp, umountLength); boolean umount_status = (boolean) WFM::Execute (.local.umount, tmp); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org