Author: locilka Date: Wed Apr 7 10:23:14 2010 New Revision: 61596 URL: http://svn.opensuse.org/viewcvs/yast?rev=61596&view=rev Log: - Searching for LiveCD license in /usr/share/doc/licenses and / directories (BNC #594042). Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP1-Branch/installation/src/clients/copy_files_finish.ycp Modified: branches/SuSE-Code-11-SP1-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/VERSION?rev=61596&r1=61595&r2=61596&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/VERSION Wed Apr 7 10:23:14 2010 @@ -1 +1 @@ -2.17.72 +2.17.73 Modified: branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes?rev=61596&r1=61595&r2=61596&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/package/yast2-installation.changes Wed Apr 7 10:23:14 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 6 17:44:25 CEST 2010 - locilka@suse.cz + +- Searching for LiveCD license in /usr/share/doc/licenses and / + directories (BNC #594042). +- 2.17.73 + +------------------------------------------------------------------- Wed Mar 24 07:44:44 UTC 2010 - lslezak@suse.cz - inst_suseconfig.ycp - do not reset UI product name Modified: branches/SuSE-Code-11-SP1-Branch/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/installation/src/clients/copy_files_finish.ycp?rev=61596&r1=61595&r2=61596&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/installation/src/clients/copy_files_finish.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/installation/src/clients/copy_files_finish.ycp Wed Apr 7 10:23:14 2010 @@ -191,21 +191,31 @@ y2milestone ("Using license dir: %1", license_dir); } - string license_file = "/license.tar.gz"; - // Copy licenses so it can be used in firstboot later - // bnc #396976 - map cmd = (map) WFM::Execute (.local.bash_output, - sformat ( - "mkdir -p '%1' && cd '%1' && rm -rf license*.txt; tar -xf '%2'", - String::Quote (license_dir), - String::Quote (license_file) - ) - ); - if (cmd["exit"]:-1 == 0) { - y2milestone ("Copying %1 to %2 was successful", license_file, license_dir); - } else { - y2error ("Copying %1 to %2 has failed: %3", license_file, license_dir, cmd); - } + // BNC #594042: Multiple license locations + list <string> license_locations = ["/usr/share/doc/licenses/", "/"]; + + foreach (string license_location, license_locations, { + license_location = sformat ("%1/license.tar.gz", license_location); + + if (! FileUtils::Exists (license_location)) return; + + // Copy licenses so it can be used in firstboot later + // bnc #396976 + map cmd = (map) WFM::Execute (.local.bash_output, + sformat ( + "mkdir -p '%1' && cd '%1' && rm -rf license*.*; cd '%1' && tar -xf '%2'", + String::Quote (license_dir), + String::Quote (license_location) + ) + ); + if (cmd["exit"]:-1 == 0) { + y2milestone ("Copying %1 to %2 was successful", license_location, license_dir); + } else { + y2error ("Copying %1 to %2 has failed: %3", license_location, license_dir, cmd); + } + + break; + }); // bugzila #328126 // Copy 70-persistent-cd.rules ... if not updating -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org