January 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63235 - in /branches/SuSE-Code-11-SP2-Branch/installation: package/yast2-installation.changes src/include/inst_inc_second.ycp
by jsrain＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsrain Date: Thu Jan 20 14:20:43 2011 New Revision: 63235 URL: http://svn.opensuse.org/viewcvs/yast?rev=63235&view=rev Log: fix initialization of AutoUpgrade for 2nd stage Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_second.ycp 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/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Thu Jan 20 14:20:43 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jan 20 14:18:41 CET 2011 - jsrain(a)suse.cz + +- fix initialization of AutoUpgrade for 2nd stage + +------------------------------------------------------------------- Wed Jan 19 15:09:24 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration (fate#310481) Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_second.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_second.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_second.ycp Thu Jan 20 14:20:43 2011 @@ -396,13 +396,15 @@ } void SetSecondStageInstallation () { - // Detect mode early to be able to setup steps correctly - if (FileUtils::Exists (Installation::destdir + Installation::file_update_mode)) { - Mode::SetMode ("update"); - } - else if (FileUtils::Exists (Installation::destdir + Installation::file_live_install_mode)) { - Mode::SetMode ("live_installation"); - } + if (! Mode::autoupgrade()) { + // Detect mode early to be able to setup steps correctly + if (FileUtils::Exists (Installation::destdir + Installation::file_update_mode)) { + Mode::SetMode ("update"); + } + else if (FileUtils::Exists (Installation::destdir + Installation::file_live_install_mode)) { + Mode::SetMode ("live_installation"); + } + } SetXENExceptions(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63234 - /branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp
by jsrain＠svn2.opensuse.org 20 Jan '11

20 Jan '11

Author: jsrain Date: Thu Jan 20 10:34:54 2011 New Revision: 63234 URL: http://svn.opensuse.org/viewcvs/yast?rev=63234&view=rev Log: added missing part of the patch Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoconfigure.ycp Thu Jan 20 10:34:54 2011 @@ -112,10 +112,13 @@ y2milestone("Order: %1", maplist(map d, deps, ``(d["res"]:""))); - if (!haskey(Profile::current , "networking") ) { - removeNetwork(); // no networking section -> no network - } else if( Profile::current["networking","keep_install_network"]:false == false ) { - removeNetwork(); // networking section without keeping the install network + // keep network on AutoYaST ugprade + if (! Mode::autoupgrade()) { + if (!haskey(Profile::current , "networking") ) { + removeNetwork(); // no networking section -> no network + } else if( Profile::current["networking","keep_install_network"]:false == false ) { + removeNetwork(); // networking section without keeping the install network + } } foreach(map r, deps, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63233 - /tags/stable-2_20_3/installation/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 15:39:26 2011 New Revision: 63233 URL: http://svn.opensuse.org/viewcvs/yast?rev=63233&view=rev Log: Created tag stable-2_20_3 for installation Added: tags/stable-2_20_3/installation/ - copied from r63232, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63232 - in /trunk/installation: VERSION package/yast2-installation.changes src/inst_finish/umount_finish.ycp
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 15:39:07 2011 New Revision: 63232 URL: http://svn.opensuse.org/viewcvs/yast?rev=63232&view=rev Log: don't delete /etc/mtab if it is a symlink (bnc#665437) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/inst_finish/umount_finish.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63232&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Jan 19 15:39:07 2011 @@ -1 +1 @@ -2.20.2 +2.20.3 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Jan 19 15:39:07 2011 @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Wed Jan 19 15:09:08 CET 2011 - jsrain(a)suse.cz +Wed Jan 19 15:38:20 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration (fate#310481) +- don't delete /etc/mtab if it is a symlink (bnc#665437) +- 2.20.3 ------------------------------------------------------------------- Wed Jan 19 12:53:00 CET 2011 - jsrain(a)suse.cz Modified: trunk/installation/src/inst_finish/umount_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/umo… ============================================================================== --- trunk/installation/src/inst_finish/umount_finish.ycp (original) +++ trunk/installation/src/inst_finish/umount_finish.ycp Wed Jan 19 15:39:07 2011 @@ -22,6 +22,7 @@ import "Vendor"; import "String"; import "Internet"; +import "FileUtils"; any ret = nil; string func = ""; @@ -74,9 +75,12 @@ } }); - // remove [Installation::destdir]/etc/mtab which was faked for %post - // scripts in inst_rpmcopy - SCR::Execute(.target.remove, "/etc/mtab"); + // symlink points to /proc, keep it (bnc#665437) + if (! FileUtils::IsLink ("/etc/mtab")) { + // remove [Installation::destdir]/etc/mtab which was faked for %post + // scripts in inst_rpmcopy + SCR::Execute(.target.remove, "/etc/mtab"); + } // Stop SCR on target WFM::SCRClose (Installation::scr_handle); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63231 - /tags/stable-2_20_4/autoinstallation/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 15:16:43 2011 New Revision: 63231 URL: http://svn.opensuse.org/viewcvs/yast?rev=63231&view=rev Log: Created tag stable-2_20_4 for autoinstallation Added: tags/stable-2_20_4/autoinstallation/ - copied from r63230, trunk/autoinstallation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63230 - in /trunk/autoinstallation: ./ package/ src/clients/ src/modules/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 15:16:35 2011 New Revision: 63230 URL: http://svn.opensuse.org/viewcvs/yast?rev=63230&view=rev Log: - adaptations for unattended migration (fate#310481) Added: trunk/autoinstallation/src/clients/inst_autosetup_upgrade.ycp trunk/autoinstallation/src/clients/inst_store_upgrade_software.ycp Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/autoyast2.spec.in trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/Makefile.am trunk/autoinstallation/src/clients/autoinst_scripts1_finish.ycp trunk/autoinstallation/src/clients/autoinst_scripts2_finish.ycp trunk/autoinstallation/src/clients/inst_autoconfigure.ycp trunk/autoinstallation/src/clients/inst_autoinit.ycp trunk/autoinstallation/src/modules/AutoInstall.ycp trunk/autoinstallation/src/modules/AutoinstConfig.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=632… ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Jan 19 15:16:35 2011 @@ -1 +1 @@ -2.20.3 +2.20.4 Modified: trunk/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/autoyast2.spec.… ============================================================================== --- trunk/autoinstallation/autoyast2.spec.in (original) +++ trunk/autoinstallation/autoyast2.spec.in Wed Jan 19 15:16:35 2011 @@ -204,6 +204,9 @@ @clientdir@/autoinst_scripts1_finish.ycp @clientdir@/autoinst_scripts2_finish.ycp @clientdir@/ayast_probe.ycp +@clientdir@/inst_autosetup_upgrade.ycp +@clientdir@/inst_store_upgrade_software.ycp + @yncludedir@/autoinstall/xml.ycp @yncludedir@/autoinstall/ask.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Jan 19 15:16:35 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 19 15:15:20 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) +- 2.20.4 + +------------------------------------------------------------------- Tue Jan 4 11:04:33 UTC 2011 - lslezak(a)suse.cz - fixed build (wrong mount call params) Modified: trunk/autoinstallation/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/Mak… ============================================================================== --- trunk/autoinstallation/src/clients/Makefile.am (original) +++ trunk/autoinstallation/src/clients/Makefile.am Wed Jan 19 15:16:35 2011 @@ -13,6 +13,8 @@ inst_autoinit.ycp \ inst_autopost.ycp \ inst_autosetup.ycp \ + inst_autosetup_upgrade.ycp \ + inst_store_upgrade_software.ycp \ report_auto.ycp \ scripts_auto.ycp \ software_auto.ycp \ Modified: trunk/autoinstallation/src/clients/autoinst_scripts1_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aut… ============================================================================== --- trunk/autoinstallation/src/clients/autoinst_scripts1_finish.ycp (original) +++ trunk/autoinstallation/src/clients/autoinst_scripts1_finish.ycp Wed Jan 19 15:16:35 2011 @@ -42,7 +42,7 @@ "steps" : 1, // progress step title "title" : _("Executing autoinstall scripts in the installation environment..."), - "when" : [ `autoinst ], + "when" : [ `autoinst, `autoupg ], ]; } else if (func == "Write") Modified: trunk/autoinstallation/src/clients/autoinst_scripts2_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aut… ============================================================================== --- trunk/autoinstallation/src/clients/autoinst_scripts2_finish.ycp (original) +++ trunk/autoinstallation/src/clients/autoinst_scripts2_finish.ycp Wed Jan 19 15:16:35 2011 @@ -40,7 +40,7 @@ "steps" : 1, // progress step title "title" : _("Executing autoinstall scripts in the installation environment..."), - "when" : [ `autoinst ], + "when" : [ `autoinst, `autoupg ], ]; } else if (func == "Write") Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Wed Jan 19 15:16:35 2011 @@ -112,10 +112,13 @@ y2milestone("Order: %1", maplist(map d, deps, ``(d["res"]:""))); - if (!haskey(Profile::current , "networking") ) { - removeNetwork(); // no networking section -> no network - } else if( Profile::current["networking","keep_install_network"]:false == false ) { - removeNetwork(); // networking section without keeping the install network + // keep network on AutoYaST ugprade + if (! Mode::autoupgrade()) { + if (!haskey(Profile::current , "networking") ) { + removeNetwork(); // no networking section -> no network + } else if( Profile::current["networking","keep_install_network"]:false == false ) { + removeNetwork(); // networking section without keeping the install network + } } foreach(map r, deps, Modified: trunk/autoinstallation/src/clients/inst_autoinit.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoinit.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoinit.ycp Wed Jan 19 15:16:35 2011 @@ -23,6 +23,7 @@ // import "Arch"; import "Call"; import "Console"; + import "Mode"; import "Popup"; @@ -165,10 +166,22 @@ } Progress::Title(_("Probing hardware...")); - WFM::CallFunction("inst_system_analysis", [] ); + + if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart)) + WFM::CallFunction("inst_system_analysis", [] ); AutoInstallRules::ProbeRules(); if( ! profileFetched ) { + + + // if profile is defined, first read it, then probe hardware + any autoinstall = SCR::Read(.etc.install_inf.AutoYaST); + if (Mode::autoupgrade() && ! (autoinstall != nil && is ( autoinstall , string ) && (string)autoinstall != "")) + { + AutoinstConfig::ParseCmdLine("file:///mnt/root/autoupg.xml"); + AutoinstConfig::ProfileInRootPart = true; + } + symbol ret = processProfile(); if( ret != `ok ) { return ret; Added: trunk/autoinstallation/src/clients/inst_autosetup_upgrade.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup_upgrade.ycp (added) +++ trunk/autoinstallation/src/clients/inst_autosetup_upgrade.ycp Wed Jan 19 15:16:35 2011 @@ -0,0 +1,434 @@ +/** + * File: clients/inst_autosetup.ycp + * Package: Auto-installation + * Summary: Setup and prepare system for auto-installation + * Authors: Anas Nashif <nashif(a)suse.de> + * Uwe Gansert <ug(a)suse.de> + * + * $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $ + */ + +{ + textdomain "autoinst"; + + import "AutoinstConfig"; + import "AutoInstall"; + import "Installation"; + import "Profile"; + import "Progress"; + import "Report"; + import "AutoinstStorage"; + import "AutoinstScripts"; + import "AutoinstGeneral"; + import "AutoinstSoftware"; + import "Bootloader"; + import "BootCommon"; + import "Popup"; + import "RunlevelEd"; + import "Arch"; + import "AutoinstLVM"; + import "AutoinstRAID"; + import "Storage"; + import "Timezone"; + import "Keyboard"; + import "Call"; + import "ProductControl"; + import "LanUdevAuto"; + import "Language"; + import "Console"; + + include "bootloader/routines/autoinstall.ycp"; + include "autoinstall/ask.ycp"; + + define symbol readModified() { + if (SCR::Read(.target.size, AutoinstConfig::modified_profile) > 0 ) { + if (! Profile::ReadXML( AutoinstConfig::modified_profile ) || Profile::current == $[] ) { + Popup::Error(_("Error while parsing the control file. +Check the log files for more details or fix the +control file and try again. +")); + return `abort; + } + string cpcmd = sformat("mv %1 %2","/tmp/profile/autoinst.xml", "/tmp/profile/pre-autoinst.xml"); + y2milestone("copy 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; + } + return `not_found; + } + + string help_text = _("Please wait while the system is prepared for autoinstallation."); + list<string> progress_stages = + [ + _("Configure General Settings "), + _("Execute pre-install user scripts"), + _("Set up language"), + _("Configure Software selections"), + ]; + + list<string> progress_descriptions = + [ + _("Configuring general settings..."), + _("Executing pre-install user scripts..."), + _("Configuring Software selections...") + ]; + + Progress::New( + _("Preparing System for Automated Installation"), + "", // progress_title + size( progress_stages ), // progress bar length + progress_stages, + progress_descriptions, + help_text ); + + + if(UI::PollInput() == `abort) + if (Popup::ConfirmAbort (`painless)) + return `abort; + Progress::NextStage(); + + + // configure general settings + + + + + + if(UI::PollInput() == `abort) + if (Popup::ConfirmAbort (`painless)) + return `abort; + + Progress::NextStage(); + + // Pre-Scripts + AutoinstScripts::Import(Profile::current["scripts"]:$[]); + AutoinstScripts::Write("pre-scripts", false); + + // Reread Profile in case it was modified in pre-script + // User has to create the new profile in a pre-defined + // location for easy processing in pre-script. + + if( readModified() == `abort ) + return `abort; + + // + // Partitioning and Storage + //////////////////////////////////////////////////////////////////////// + + boolean modified = true; + do { + askDialog(); + // Pre-Scripts + AutoinstScripts::Import(Profile::current["scripts"]:$[]); + AutoinstScripts::Write("pre-scripts", false); + symbol ret = readModified(); + if( ret == `abort ) + return `abort; + if( ret == `not_found ) + modified = false; + } while( modified == true ); + + // reimport scripts, for the case <ask> has changed them + AutoinstScripts::Import(Profile::current["scripts"]:$[]); + // + // Set Mouse and other workflow variables + // + AutoinstGeneral::Import(Profile::current["general"]:$[]); + y2milestone("general: %1", Profile::current["general"]:$[] ); + AutoinstGeneral::Write(); + + if( haskey( Profile::current, "add-on" ) ) { + Call::Function("add-on_auto", ["Import", Profile::current["add-on"]:$[]] ); + Call::Function("add-on_auto", ["Write"]); + } + + boolean use_utf8 = true; // utf8 is default + + map displayinfo = UI::GetDisplayInfo(); + if ( ! displayinfo["HasFullUtf8Support"]:true ) + { + use_utf8 = false; // fallback to ascii + } + + + // + // Set it in the Language module. + // + Progress::NextStep(); + Progress::Title(_("Configuring language...")); + Language::Import( Profile::current["language"]:$[] ); + + // + // Set Console font + // + Installation::encoding = Console::SelectFont( Language::language ); + + if (displayinfo["HasFullUtf8Support"]:true) + { + Installation::encoding = "UTF-8"; + } + + UI::SetLanguage (Language::language, Installation::encoding); + WFM::SetLanguage (Language::language, "UTF-8"); + + if( haskey( Profile::current, "timezone" ) ) + Timezone::Import(Profile::current["timezone"]:$[]); + if( haskey( Profile::current, "keyboard" ) ) + Keyboard::Import(Profile::current["keyboard"]:$[]); + + + // one can override the <confirm> option by the commandline parameter y2confirm + string tmp = (string)SCR::Read (.target.string, "/proc/cmdline"); + if (tmp != nil && contains (splitstring (tmp, " \n"), "y2confirm")) { + AutoinstConfig::Confirm = true; + y2milestone("y2confirm found and confirm turned on"); + } + + + if(UI::PollInput() == `abort) + 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(); + + Storage::ReReadTargetMap(); + + if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart)) { + if (`abort == WFM::CallFunction("inst_update_partition_auto", [])) + return `abort; + } + + + // Software + + if(UI::PollInput() == `abort) + if (Popup::ConfirmAbort (`painless)) + return `abort; + + Progress::NextStage(); + + // initialize package manager + import "Packages"; + import "PackageCallbacks"; + import "Update"; + import "RootPart"; + import "ProductFeatures"; + import "Product"; + +// FIXME FIXME FIXME copy-paste from update_proposal + map <string, any> GetUpdateConf () { + // 'nil' values are skipped, in that case, ZYPP uses own default values + map <string, boolean> ret = $[]; + +// not supported by libzypp anymore +// if (Update::deleteOldPackages != nil) { +// ret["delete_unmaintained"] = Update::deleteOldPackages; +// } + + if (Update::silentlyDowngradePackages != nil) { + ret["silent_downgrades"] = Update::silentlyDowngradePackages; + } + + y2milestone ("Using update configuration: %1", ret); + + return ret; + } + + Packages::Init(true); + + // initialize target + if (true) + { + PackageCallbacks::SetConvertDBCallbacks (); + + Pkg::TargetInit (Installation::destdir, false); + + Update::GetProductName (); + } + + // FATE #301990, Bugzilla #238488 + // Set initial update-related (packages/patches) values from control file + Update::InitUpdate(); + + // some products are listed in media control file and at least one is compatible + // with system just being updated + boolean update_not_possible = false; + + // FATE #301844 + y2milestone ("Previous '%1', New '%2' RootPart", + RootPart::previousRootPartition, RootPart::selectedRootPartition); + if (RootPart::previousRootPartition != RootPart::selectedRootPartition) { + RootPart::previousRootPartition = RootPart::selectedRootPartition; + + // check whether update is possible + // reset deleteOldPackages and onlyUpdateInstalled in respect to the selected system + Update::Reset(); + if (! Update::IsProductSupportedForUpgrade()) { + y2milestone ("Upgrade is not supported"); + update_not_possible = true; + } + } + + // this is new - override the default upgrade mode + if (Profile::current["upgrade","only_installed_packages"]:nil != nil) + Update::onlyUpdateInstalled = Profile::current["upgrade","only_installed_packages"]:true; + + // connect target with package manager + if (!Update::did_init1) + { + Update::did_init1 = true; + + if (size (Pkg::ResolvableProperties ("", `pattern, "")) > 0) + { + y2milestone ("No base selection found, but patterns found..."); + Packages::using_patterns = true; + } + + list<string> restore = []; + list<map<string,any> > selected = Pkg::ResolvableProperties ("", `product, ""); + foreach (map<string,any> s, selected, { + restore = add (restore, s["name"]:""); + }); + + Pkg::PkgApplReset (); + + // bnc #300540 + // bnc #391785 + // Drops packages after PkgApplReset, not before (that would null that) + Update::DropObsoletePackages(); + + foreach (string res, restore, { + Pkg::ResolvableInstall (res, `product); + }); + if (! Update::onlyUpdateInstalled) + { + if (Packages::using_patterns) + { + Update::SetDesktopPattern (); + } + else + { + Update::ProposeSelection (); + } + } + + if (Update::onlyUpdateInstalled) // just consider already installed packages + { + Pkg::SetSelection (""); // -> don't select any additional selections + } + else if (Packages::using_patterns) + { + if (! ProductFeatures::GetBooleanFeature ("software", + "only_update_installed")) + { + foreach (string pat, Product::patterns, { + y2milestone("Pre-select pattern %1", pat); + Pkg::ResolvableInstall( pat, `pattern ); + }); + } + + } + else // update selections too + { + Pkg::SetSelection (Update::selected_selection); // -> set the base selection (minimal, default, ....) + + if (!Update::manual_interaction) + { + // now compare installed (old) selections against available (new) selections + // and set all selections which are installed (old) and available (new) + // as 'to be installed' -> UI will show "to be updated" for these selections + + list<string> available_addons = Pkg::GetSelections (`available, ""); + list<string> installed_addons = Pkg::GetSelections (`installed, ""); + + foreach (string installed, installed_addons, + { + if (contains (available_addons, installed)) // we have a newer selection for an installed one + { + Pkg::SetSelection (installed); // update this selection too (selection solving included) + } + }); + } + } + + Packages::SelectProduct(); + Pkg::ActivateSelections (); // now go through all selected selections and select their packages + // bnc #382208 + + // bnc#582702 - do not select kernel on update, leave that on dependencies like 'zypper dup' + // therefore commented line below out +// Packages::SelectKernelPackages (); + + // FATE #301990, Bugzilla #238488 + // Control the upgrade process better + map <symbol, integer> update_sum + = Pkg::PkgUpdateAll (GetUpdateConf()); + y2milestone ("Update summary: %1", update_sum); + Update::unknown_packages = update_sum[`ProblemListSze]:0; + + list<string> sys_patterns = Packages::ComputeSystemPatternList (); + foreach (string pat, sys_patterns, { + Pkg::ResolvableInstall (pat, `pattern); + }); + // this is new, (de)select stuff from the profile + list<string> packages = Profile::current["software","packages"]:[]; + list<string> patterns = Profile::current["software","patterns"]:[]; + list<string> remove_packages = Profile::current["software","remove-packages"]:[]; + list<string> remove_patterns = Profile::current["software","remove-patterns"]:[]; + foreach (string p, remove_patterns, { + Pkg::ResolvableRemove (p, `pattern); + }); + foreach (string p, remove_packages, { + Pkg::ResolvableRemove (p, `package); + }); + foreach (string p, patterns, { + Pkg::ResolvableInstall (p, `pattern); + }); + foreach (string p, packages, { + Pkg::ResolvableInstall (p, `package); + }); + // old stuff again here + if (Pkg::PkgSolve (!Update::onlyUpdateInstalled)) + Update::solve_errors = 0; + else + { + Update::solve_errors = Pkg::PkgSolveErrors (); + if (Profile::current["upgrade","stop_on_solver_conflict"]:true) + AutoinstConfig::Confirm = true; + } + + } + + // Backup + y2internal ("Backup: %1", Profile::current["backup"]:nil); + Installation::update_backup_modified = Profile::current["backup","modified"]:true; + y2internal ("Backup modified: %1", Installation::update_backup_modified); + Installation::update_backup_sysconfig = Profile::current["backup","sysconfig"]:true; + Installation::update_remove_old_backups = Profile::current["backup","remove_old"]:false; + + AutoInstall::TurnOff(); + Progress::Finish(); + + symbol ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true); + if (ret == `next) + return `finish; + return ret; +} Added: trunk/autoinstallation/src/clients/inst_store_upgrade_software.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_store_upgrade_software.ycp (added) +++ trunk/autoinstallation/src/clients/inst_store_upgrade_software.ycp Wed Jan 19 15:16:35 2011 @@ -0,0 +1,64 @@ +{ + import "GetInstArgs"; + import "Popup"; + import "Profile"; + import "Installation"; + + if ( GetInstArgs::going_back()) + return `auto; + + // find out status of patterns + list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); + patterns = filter (map<string,any> p, patterns, { + return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; + }); + + list<string> patterns_to_remove = []; + list<string> patterns_to_install = maplist (map<string,any> p, patterns, { + if (p["status"]:nil == `selected || p["status"]:nil == `installed) + return p["name"]:""; + else if (p["status"]:nil == `removed || p["status"]:nil == `available) + patterns_to_remove = add (patterns_to_remove, p["name"]:""); + return nil; + }); + patterns_to_install = filter (string p, patterns_to_install, { + return p != nil; + }); + y2milestone ("Patterns to install: %1", patterns_to_install); + y2milestone ("Patterns to remove: %1", patterns_to_remove); + + // find out status of packages + list<map<string,any> > packages = Pkg::ResolvableProperties ("", `package, ""); + packages = filter (map<string,any> p, packages, { + return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; + }); + + list<string> packages_to_remove = []; + list<string> packages_to_install = maplist (map<string,any> p, packages, { + if (p["status"]:nil == `selected || p["status"]:nil == `installed) + return p["name"]:""; + else if (p["status"]:nil == `removed || p["status"]:nil == `available) + packages_to_remove = add (packages_to_remove, p["name"]:""); + return nil; + }); + packages_to_install = filter (string p, packages_to_install, { + return p != nil; + }); + y2milestone ("Packages to install: %1", packages_to_install); + y2milestone ("Packages to remove: %1", packages_to_remove); + + map software = $[ + "packages": packages_to_install, + "patterns": patterns_to_install, + "remove-packages": packages_to_remove, + "remove-patterns": patterns_to_remove, + ]; + + Profile::current["software"] = software; + // /root exists during upgrade + Profile::Save (Installation::destdir + "/root/autoupg_updated.xml"); + + + return `auto; +} + Modified: trunk/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstall.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstall.ycp Wed Jan 19 15:16:35 2011 @@ -162,7 +162,7 @@ */ global define boolean Save() { - if (Mode::autoinst ()) + if (Mode::autoinst () || Mode::autoupgrade()) return (Profile::SaveProfileStructure( AutoinstConfig::parsedControlFile )); else return true; Modified: trunk/autoinstallation/src/modules/AutoinstConfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstConfig.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstConfig.ycp Wed Jan 19 15:16:35 2011 @@ -167,6 +167,11 @@ // global boolean RebootMsg = false; + // + // AutoYaST profile is stored in the root partition (for upgrade) + // + global boolean ProfileInRootPart = false; + // // remote profile (invented for pre-probing of s390) @@ -369,7 +374,7 @@ */ global define void AutoinstConfig () ``{ - if (Mode::autoinst () && Stage::initial() ) + if ((Mode::autoinst ()|| Mode::autoupgrade ()) && Stage::initial() ) { any autoinstall = SCR::Read(.etc.install_inf.AutoYaST); if (autoinstall != nil && is ( autoinstall , string ) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63229 - in /branches/SuSE-Code-11-SP2-Branch/autoinstallation: ./ package/ src/clients/ src/modules/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 15:16:29 2011 New Revision: 63229 URL: http://svn.opensuse.org/viewcvs/yast?rev=63229&view=rev Log: - adaptations for unattended migration (fate#310481) Added: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autosetup_upgrade.ycp branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_store_upgrade_software.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION branches/SuSE-Code-11-SP2-Branch/autoinstallation/autoyast2.spec.in branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/Makefile.am branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/autoinst_scripts1_finish.ycp branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/autoinst_scripts2_finish.ycp branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoinit.ycp branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoInstall.ycp branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstConfig.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/VERSION Wed Jan 19 15:16:29 2011 @@ -1 +1 @@ -2.17.43 +2.17.43.0.1 Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/autoyast2.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/autoyast2.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/autoyast2.spec.in Wed Jan 19 15:16:29 2011 @@ -189,6 +189,9 @@ @clientdir@/autoinst_scripts1_finish.ycp @clientdir@/autoinst_scripts2_finish.ycp @clientdir@/ayast_probe.ycp +@clientdir@/inst_autosetup_upgrade.ycp +@clientdir@/inst_store_upgrade_software.ycp + @yncludedir@/autoinstall/xml.ycp @yncludedir@/autoinstall/ask.ycp Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/package/autoyast2.changes Wed Jan 19 15:16:29 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 19 15:15:43 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) + +------------------------------------------------------------------- Wed Nov 24 17:38:02 CET 2010 - ug(a)suse.de - clone devices by-path on s390 (bnc#591603) Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/Makefile.am Wed Jan 19 15:16:29 2011 @@ -13,6 +13,8 @@ inst_autoinit.ycp \ inst_autopost.ycp \ inst_autosetup.ycp \ + inst_autosetup_upgrade.ycp \ + inst_store_upgrade_software.ycp \ report_auto.ycp \ scripts_auto.ycp \ software_auto.ycp \ Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/autoinst_scripts1_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/autoinst_scripts1_finish.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/autoinst_scripts1_finish.ycp Wed Jan 19 15:16:29 2011 @@ -42,7 +42,7 @@ "steps" : 1, // progress step title "title" : _("Executing autoinstall scripts in the installation environment..."), - "when" : [ `autoinst ], + "when" : [ `autoinst, `autoupg ], ]; } else if (func == "Write") Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/autoinst_scripts2_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/autoinst_scripts2_finish.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/autoinst_scripts2_finish.ycp Wed Jan 19 15:16:29 2011 @@ -40,7 +40,7 @@ "steps" : 1, // progress step title "title" : _("Executing autoinstall scripts in the installation environment..."), - "when" : [ `autoinst ], + "when" : [ `autoinst, `autoupg ], ]; } else if (func == "Write") Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoinit.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoinit.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autoinit.ycp Wed Jan 19 15:16:29 2011 @@ -23,6 +23,7 @@ // import "Arch"; import "Call"; import "Console"; + import "Mode"; import "Popup"; @@ -165,10 +166,22 @@ } Progress::Title(_("Probing hardware...")); - WFM::CallFunction("inst_system_analysis", [] ); + + if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart)) + WFM::CallFunction("inst_system_analysis", [] ); AutoInstallRules::ProbeRules(); if( ! profileFetched ) { + + + // if profile is defined, first read it, then probe hardware + any autoinstall = SCR::Read(.etc.install_inf.AutoYaST); + if (Mode::autoupgrade() && ! (autoinstall != nil && is ( autoinstall , string ) && (string)autoinstall != "")) + { + AutoinstConfig::ParseCmdLine("file:///mnt/root/autoupg.xml"); + AutoinstConfig::ProfileInRootPart = true; + } + symbol ret = processProfile(); if( ret != `ok ) { return ret; Added: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autosetup_upgrade.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autosetup_upgrade.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_autosetup_upgrade.ycp Wed Jan 19 15:16:29 2011 @@ -0,0 +1,434 @@ +/** + * File: clients/inst_autosetup.ycp + * Package: Auto-installation + * Summary: Setup and prepare system for auto-installation + * Authors: Anas Nashif <nashif(a)suse.de> + * Uwe Gansert <ug(a)suse.de> + * + * $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $ + */ + +{ + textdomain "autoinst"; + + import "AutoinstConfig"; + import "AutoInstall"; + import "Installation"; + import "Profile"; + import "Progress"; + import "Report"; + import "AutoinstStorage"; + import "AutoinstScripts"; + import "AutoinstGeneral"; + import "AutoinstSoftware"; + import "Bootloader"; + import "BootCommon"; + import "Popup"; + import "RunlevelEd"; + import "Arch"; + import "AutoinstLVM"; + import "AutoinstRAID"; + import "Storage"; + import "Timezone"; + import "Keyboard"; + import "Call"; + import "ProductControl"; + import "LanUdevAuto"; + import "Language"; + import "Console"; + + include "bootloader/routines/autoinstall.ycp"; + include "autoinstall/ask.ycp"; + + define symbol readModified() { + if (SCR::Read(.target.size, AutoinstConfig::modified_profile) > 0 ) { + if (! Profile::ReadXML( AutoinstConfig::modified_profile ) || Profile::current == $[] ) { + Popup::Error(_("Error while parsing the control file. +Check the log files for more details or fix the +control file and try again. +")); + return `abort; + } + string cpcmd = sformat("mv %1 %2","/tmp/profile/autoinst.xml", "/tmp/profile/pre-autoinst.xml"); + y2milestone("copy 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; + } + return `not_found; + } + + string help_text = _("Please wait while the system is prepared for autoinstallation."); + list<string> progress_stages = + [ + _("Configure General Settings "), + _("Execute pre-install user scripts"), + _("Set up language"), + _("Configure Software selections"), + ]; + + list<string> progress_descriptions = + [ + _("Configuring general settings..."), + _("Executing pre-install user scripts..."), + _("Configuring Software selections...") + ]; + + Progress::New( + _("Preparing System for Automated Installation"), + "", // progress_title + size( progress_stages ), // progress bar length + progress_stages, + progress_descriptions, + help_text ); + + + if(UI::PollInput() == `abort) + if (Popup::ConfirmAbort (`painless)) + return `abort; + Progress::NextStage(); + + + // configure general settings + + + + + + if(UI::PollInput() == `abort) + if (Popup::ConfirmAbort (`painless)) + return `abort; + + Progress::NextStage(); + + // Pre-Scripts + AutoinstScripts::Import(Profile::current["scripts"]:$[]); + AutoinstScripts::Write("pre-scripts", false); + + // Reread Profile in case it was modified in pre-script + // User has to create the new profile in a pre-defined + // location for easy processing in pre-script. + + if( readModified() == `abort ) + return `abort; + + // + // Partitioning and Storage + //////////////////////////////////////////////////////////////////////// + + boolean modified = true; + do { + askDialog(); + // Pre-Scripts + AutoinstScripts::Import(Profile::current["scripts"]:$[]); + AutoinstScripts::Write("pre-scripts", false); + symbol ret = readModified(); + if( ret == `abort ) + return `abort; + if( ret == `not_found ) + modified = false; + } while( modified == true ); + + // reimport scripts, for the case <ask> has changed them + AutoinstScripts::Import(Profile::current["scripts"]:$[]); + // + // Set Mouse and other workflow variables + // + AutoinstGeneral::Import(Profile::current["general"]:$[]); + y2milestone("general: %1", Profile::current["general"]:$[] ); + AutoinstGeneral::Write(); + + if( haskey( Profile::current, "add-on" ) ) { + Call::Function("add-on_auto", ["Import", Profile::current["add-on"]:$[]] ); + Call::Function("add-on_auto", ["Write"]); + } + + boolean use_utf8 = true; // utf8 is default + + map displayinfo = UI::GetDisplayInfo(); + if ( ! displayinfo["HasFullUtf8Support"]:true ) + { + use_utf8 = false; // fallback to ascii + } + + + // + // Set it in the Language module. + // + Progress::NextStep(); + Progress::Title(_("Configuring language...")); + Language::Import( Profile::current["language"]:$[] ); + + // + // Set Console font + // + Installation::encoding = Console::SelectFont( Language::language ); + + if (displayinfo["HasFullUtf8Support"]:true) + { + Installation::encoding = "UTF-8"; + } + + UI::SetLanguage (Language::language, Installation::encoding); + WFM::SetLanguage (Language::language, "UTF-8"); + + if( haskey( Profile::current, "timezone" ) ) + Timezone::Import(Profile::current["timezone"]:$[]); + if( haskey( Profile::current, "keyboard" ) ) + Keyboard::Import(Profile::current["keyboard"]:$[]); + + + // one can override the <confirm> option by the commandline parameter y2confirm + string tmp = (string)SCR::Read (.target.string, "/proc/cmdline"); + if (tmp != nil && contains (splitstring (tmp, " \n"), "y2confirm")) { + AutoinstConfig::Confirm = true; + y2milestone("y2confirm found and confirm turned on"); + } + + + if(UI::PollInput() == `abort) + 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(); + + Storage::ReReadTargetMap(); + + if (! (Mode::autoupgrade() && AutoinstConfig::ProfileInRootPart)) { + if (`abort == WFM::CallFunction("inst_update_partition_auto", [])) + return `abort; + } + + + // Software + + if(UI::PollInput() == `abort) + if (Popup::ConfirmAbort (`painless)) + return `abort; + + Progress::NextStage(); + + // initialize package manager + import "Packages"; + import "PackageCallbacks"; + import "Update"; + import "RootPart"; + import "ProductFeatures"; + import "Product"; + +// FIXME FIXME FIXME copy-paste from update_proposal + map <string, any> GetUpdateConf () { + // 'nil' values are skipped, in that case, ZYPP uses own default values + map <string, boolean> ret = $[]; + +// not supported by libzypp anymore +// if (Update::deleteOldPackages != nil) { +// ret["delete_unmaintained"] = Update::deleteOldPackages; +// } + + if (Update::silentlyDowngradePackages != nil) { + ret["silent_downgrades"] = Update::silentlyDowngradePackages; + } + + y2milestone ("Using update configuration: %1", ret); + + return ret; + } + + Packages::Init(true); + + // initialize target + if (true) + { + PackageCallbacks::SetConvertDBCallbacks (); + + Pkg::TargetInit (Installation::destdir, false); + + Update::GetProductName (); + } + + // FATE #301990, Bugzilla #238488 + // Set initial update-related (packages/patches) values from control file + Update::InitUpdate(); + + // some products are listed in media control file and at least one is compatible + // with system just being updated + boolean update_not_possible = false; + + // FATE #301844 + y2milestone ("Previous '%1', New '%2' RootPart", + RootPart::previousRootPartition, RootPart::selectedRootPartition); + if (RootPart::previousRootPartition != RootPart::selectedRootPartition) { + RootPart::previousRootPartition = RootPart::selectedRootPartition; + + // check whether update is possible + // reset deleteOldPackages and onlyUpdateInstalled in respect to the selected system + Update::Reset(); + if (! Update::IsProductSupportedForUpgrade()) { + y2milestone ("Upgrade is not supported"); + update_not_possible = true; + } + } + + // this is new - override the default upgrade mode + if (Profile::current["upgrade","only_installed_packages"]:nil != nil) + Update::onlyUpdateInstalled = Profile::current["upgrade","only_installed_packages"]:true; + + // connect target with package manager + if (!Update::did_init1) + { + Update::did_init1 = true; + + if (size (Pkg::ResolvableProperties ("", `pattern, "")) > 0) + { + y2milestone ("No base selection found, but patterns found..."); + Packages::using_patterns = true; + } + + list<string> restore = []; + list<map<string,any> > selected = Pkg::ResolvableProperties ("", `product, ""); + foreach (map<string,any> s, selected, { + restore = add (restore, s["name"]:""); + }); + + Pkg::PkgApplReset (); + + // bnc #300540 + // bnc #391785 + // Drops packages after PkgApplReset, not before (that would null that) + Update::DropObsoletePackages(); + + foreach (string res, restore, { + Pkg::ResolvableInstall (res, `product); + }); + if (! Update::onlyUpdateInstalled) + { + if (Packages::using_patterns) + { + Update::SetDesktopPattern (); + } + else + { + Update::ProposeSelection (); + } + } + + if (Update::onlyUpdateInstalled) // just consider already installed packages + { + Pkg::SetSelection (""); // -> don't select any additional selections + } + else if (Packages::using_patterns) + { + if (! ProductFeatures::GetBooleanFeature ("software", + "only_update_installed")) + { + foreach (string pat, Product::patterns, { + y2milestone("Pre-select pattern %1", pat); + Pkg::ResolvableInstall( pat, `pattern ); + }); + } + + } + else // update selections too + { + Pkg::SetSelection (Update::selected_selection); // -> set the base selection (minimal, default, ....) + + if (!Update::manual_interaction) + { + // now compare installed (old) selections against available (new) selections + // and set all selections which are installed (old) and available (new) + // as 'to be installed' -> UI will show "to be updated" for these selections + + list<string> available_addons = Pkg::GetSelections (`available, ""); + list<string> installed_addons = Pkg::GetSelections (`installed, ""); + + foreach (string installed, installed_addons, + { + if (contains (available_addons, installed)) // we have a newer selection for an installed one + { + Pkg::SetSelection (installed); // update this selection too (selection solving included) + } + }); + } + } + + Packages::SelectProduct(); + Pkg::ActivateSelections (); // now go through all selected selections and select their packages + // bnc #382208 + + // bnc#582702 - do not select kernel on update, leave that on dependencies like 'zypper dup' + // therefore commented line below out +// Packages::SelectKernelPackages (); + + // FATE #301990, Bugzilla #238488 + // Control the upgrade process better + map <symbol, integer> update_sum + = Pkg::PkgUpdateAll (GetUpdateConf()); + y2milestone ("Update summary: %1", update_sum); + Update::unknown_packages = update_sum[`ProblemListSze]:0; + + list<string> sys_patterns = Packages::ComputeSystemPatternList (); + foreach (string pat, sys_patterns, { + Pkg::ResolvableInstall (pat, `pattern); + }); + // this is new, (de)select stuff from the profile + list<string> packages = Profile::current["software","packages"]:[]; + list<string> patterns = Profile::current["software","patterns"]:[]; + list<string> remove_packages = Profile::current["software","remove-packages"]:[]; + list<string> remove_patterns = Profile::current["software","remove-patterns"]:[]; + foreach (string p, remove_patterns, { + Pkg::ResolvableRemove (p, `pattern); + }); + foreach (string p, remove_packages, { + Pkg::ResolvableRemove (p, `package); + }); + foreach (string p, patterns, { + Pkg::ResolvableInstall (p, `pattern); + }); + foreach (string p, packages, { + Pkg::ResolvableInstall (p, `package); + }); + // old stuff again here + if (Pkg::PkgSolve (!Update::onlyUpdateInstalled)) + Update::solve_errors = 0; + else + { + Update::solve_errors = Pkg::PkgSolveErrors (); + if (Profile::current["upgrade","stop_on_solver_conflict"]:true) + AutoinstConfig::Confirm = true; + } + + } + + // Backup + y2internal ("Backup: %1", Profile::current["backup"]:nil); + Installation::update_backup_modified = Profile::current["backup","modified"]:true; + y2internal ("Backup modified: %1", Installation::update_backup_modified); + Installation::update_backup_sysconfig = Profile::current["backup","sysconfig"]:true; + Installation::update_remove_old_backups = Profile::current["backup","remove_old"]:false; + + AutoInstall::TurnOff(); + Progress::Finish(); + + symbol ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, true); + if (ret == `next) + return `finish; + return ret; +} Added: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_store_upgrade_software.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_store_upgrade_software.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/clients/inst_store_upgrade_software.ycp Wed Jan 19 15:16:29 2011 @@ -0,0 +1,64 @@ +{ + import "GetInstArgs"; + import "Popup"; + import "Profile"; + import "Installation"; + + if ( GetInstArgs::going_back()) + return `auto; + + // find out status of patterns + list<map<string,any> > patterns = Pkg::ResolvableProperties ("", `pattern, ""); + patterns = filter (map<string,any> p, patterns, { + return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; + }); + + list<string> patterns_to_remove = []; + list<string> patterns_to_install = maplist (map<string,any> p, patterns, { + if (p["status"]:nil == `selected || p["status"]:nil == `installed) + return p["name"]:""; + else if (p["status"]:nil == `removed || p["status"]:nil == `available) + patterns_to_remove = add (patterns_to_remove, p["name"]:""); + return nil; + }); + patterns_to_install = filter (string p, patterns_to_install, { + return p != nil; + }); + y2milestone ("Patterns to install: %1", patterns_to_install); + y2milestone ("Patterns to remove: %1", patterns_to_remove); + + // find out status of packages + list<map<string,any> > packages = Pkg::ResolvableProperties ("", `package, ""); + packages = filter (map<string,any> p, packages, { + return p["transact_by"]:nil == `user || p["transact_by"]:nil == `app_high; + }); + + list<string> packages_to_remove = []; + list<string> packages_to_install = maplist (map<string,any> p, packages, { + if (p["status"]:nil == `selected || p["status"]:nil == `installed) + return p["name"]:""; + else if (p["status"]:nil == `removed || p["status"]:nil == `available) + packages_to_remove = add (packages_to_remove, p["name"]:""); + return nil; + }); + packages_to_install = filter (string p, packages_to_install, { + return p != nil; + }); + y2milestone ("Packages to install: %1", packages_to_install); + y2milestone ("Packages to remove: %1", packages_to_remove); + + map software = $[ + "packages": packages_to_install, + "patterns": patterns_to_install, + "remove-packages": packages_to_remove, + "remove-patterns": patterns_to_remove, + ]; + + Profile::current["software"] = software; + // /root exists during upgrade + Profile::Save (Installation::destdir + "/root/autoupg_updated.xml"); + + + return `auto; +} + Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoInstall.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoInstall.ycp Wed Jan 19 15:16:29 2011 @@ -153,7 +153,7 @@ */ global define boolean Save() { - if (Mode::autoinst ()) + if (Mode::autoinst () || Mode::autoupgrade()) return (Profile::SaveProfileStructure( AutoinstConfig::parsedControlFile )); else return true; Modified: branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstConfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/autoi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstConfig.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/autoinstallation/src/modules/AutoinstConfig.ycp Wed Jan 19 15:16:29 2011 @@ -165,6 +165,11 @@ // global boolean RebootMsg = false; + // + // AutoYaST profile is stored in the root partition (for upgrade) + // + global boolean ProfileInRootPart = false; + // // remote profile (invented for pre-probing of s390) @@ -326,7 +331,7 @@ */ global define void AutoinstConfig () ``{ - if (Mode::autoinst ()) + if (Mode::autoinst () || Mode::autoupgrade ()) { any autoinstall = SCR::Read(.etc.install_inf.AutoYaST); if (autoinstall != nil && is ( autoinstall , string ) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63228 - /trunk/installation/control/examples/Makefile.am
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 15:10:56 2011 New Revision: 63228 URL: http://svn.opensuse.org/viewcvs/yast?rev=63228&view=rev Log: reverted Modified: trunk/installation/control/examples/Makefile.am Modified: trunk/installation/control/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/Ma… ============================================================================== --- trunk/installation/control/examples/Makefile.am (original) +++ trunk/installation/control/examples/Makefile.am Wed Jan 19 15:10:56 2011 @@ -9,6 +9,5 @@ EXTRA_DIST = $(xml_files) # checks only those control files that belong to this package -# checks are failing from some reason -#check-local: -# xmllint --relaxng ../control.rng --noout $(xml_files) +check-local: + xmllint --relaxng ../control.rng --noout $(xml_files) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63227 - in /trunk/installation: control/ control/examples/ package/ src/clients/ src/include/ src/inst_finish/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 15:09:58 2011 New Revision: 63227 URL: http://svn.opensuse.org/viewcvs/yast?rev=63227&view=rev Log: adaptations for unattended migration (fate#310481) Modified: trunk/installation/control/control.SLED.xml trunk/installation/control/control.SLES.xml trunk/installation/control/control.openSUSE.xml trunk/installation/control/examples/Makefile.am trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_finish.ycp trunk/installation/src/clients/inst_proposal.ycp trunk/installation/src/clients/inst_system_analysis.ycp trunk/installation/src/clients/inst_worker_initial.ycp trunk/installation/src/include/inst_inc_all.ycp trunk/installation/src/inst_finish/save_config_finish.ycp Modified: trunk/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLED.xml (original) +++ trunk/installation/control/control.SLED.xml Wed Jan 19 15:09:58 2011 @@ -483,7 +483,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <unique_id>update_initial</unique_id> @@ -1307,6 +1307,94 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + <module> + <heading>yes</heading> + <label>Update</label> + </module> + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>store_upgrade_software</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> @@ -1339,5 +1427,38 @@ </modules> </workflow> + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> </productDefines> Modified: trunk/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.SLE… ============================================================================== --- trunk/installation/control/control.SLES.xml (original) +++ trunk/installation/control/control.SLES.xml Wed Jan 19 15:09:58 2011 @@ -538,7 +538,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <unique_id>update_initial</unique_id> @@ -559,7 +559,7 @@ <proposal> <archs>s390</archs> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <unique_id>update_S390_initial</unique_id> @@ -1491,6 +1491,94 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + <module> + <heading>yes</heading> + <label>Update</label> + </module> + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>store_upgrade_software</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> @@ -1524,6 +1612,39 @@ </modules> </workflow> + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> </productDefines> Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Wed Jan 19 15:09:58 2011 @@ -545,7 +545,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <unique_id>update_initial</unique_id> @@ -1399,6 +1399,94 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + <module> + <heading>yes</heading> + <label>Update</label> + </module> + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>store_upgrade_software</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> @@ -1431,5 +1519,38 @@ </modules> </workflow> + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> </productDefines> Modified: trunk/installation/control/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/examples/Ma… ============================================================================== --- trunk/installation/control/examples/Makefile.am (original) +++ trunk/installation/control/examples/Makefile.am Wed Jan 19 15:09:58 2011 @@ -9,5 +9,6 @@ EXTRA_DIST = $(xml_files) # checks only those control files that belong to this package -check-local: - xmllint --relaxng ../control.rng --noout $(xml_files) +# checks are failing from some reason +#check-local: +# xmllint --relaxng ../control.rng --noout $(xml_files) Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Jan 19 15:09:58 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 19 15:09:08 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) + +------------------------------------------------------------------- Wed Jan 19 12:53:00 CET 2011 - jsrain(a)suse.cz - fixed progress during live installation (bnc#665413) Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Wed Jan 19 15:09:58 2011 @@ -297,7 +297,10 @@ return nil; } - if (info["when"]:nil != nil && ! contains (info["when"]:[], run_type)) + if (info["when"]:nil != nil && ! contains (info["when"]:[], run_type) && + // special hack for autoupgrade - should be as regular upgrade as possible, scripts are the only exception + (!(Mode::autoupgrade() && contains (info["when"]:[], `autoupg))) + ) return nil; y2milestone ("inst_finish client %1 will be called", s); Modified: trunk/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_pr… ============================================================================== --- trunk/installation/src/clients/inst_proposal.ycp (original) +++ trunk/installation/src/clients/inst_proposal.ycp Wed Jan 19 15:09:58 2011 @@ -65,7 +65,7 @@ symbol proposal_result = nil; // skip if not interactive mode. - if (!AutoinstConfig::Confirm && Mode::autoinst ()) { + if (!AutoinstConfig::Confirm && (Mode::autoinst () || Mode::autoupgrade ())) { return `auto; } Modified: trunk/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_sy… ============================================================================== --- trunk/installation/src/clients/inst_system_analysis.ycp (original) +++ trunk/installation/src/clients/inst_system_analysis.ycp Wed Jan 19 15:09:58 2011 @@ -32,7 +32,7 @@ include "installation/misc.ycp"; include "packager/storage_include.ycp"; - if( Mode::autoinst() ) { + if( Mode::autoinst() || Mode::autoupgrade() ) { Report::Import( $[ "messages":$[ "timeout":10 ], "errors":$[ "timeout":10 ], "warnings":$[ "timeout":10 ]]); @@ -111,7 +111,7 @@ if (size (targetMap) == 0) { if (found_controllers) { - if( !Mode::autoinst() ) { + if( !(Mode::autoinst() || Mode::autoupgrade())) { // pop-up error report Report::Error(_("No hard disks were found for the installation. Please check your hardware! Modified: trunk/installation/src/clients/inst_worker_initial.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_wo… ============================================================================== --- trunk/installation/src/clients/inst_worker_initial.ycp (original) +++ trunk/installation/src/clients/inst_worker_initial.ycp Wed Jan 19 15:09:58 2011 @@ -44,6 +44,7 @@ // All stages SetAutoinstHandling (); + SetAutoupgHandling (); SetGlobalInstallationFeatures (); // Initial stage Modified: trunk/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_all.ycp (original) +++ trunk/installation/src/include/inst_inc_all.ycp Wed Jan 19 15:09:58 2011 @@ -101,6 +101,19 @@ Report::DisplayMessages(true, 10); } + /** + * Sets autoupgrade behavior + */ + void SetAutoupgHandling () { + // if profile is defined, first read it, then probe hardware + any autoinstall = SCR::Read(.etc.install_inf.AutoYaST); + if (autoinstall != nil && is ( autoinstall , string ) && (string)autoinstall != "") + { + ProductControl::DisableModule ("system_analysis"); + ProductControl::DisableModule ("update_partition_auto"); + } + } + void ShowTextFallbackMessage () { if ( (Installation::text_fallback () || Installation::no_x11 ()) Modified: trunk/installation/src/inst_finish/save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/inst_finish/sav… ============================================================================== --- trunk/installation/src/inst_finish/save_config_finish.ycp (original) +++ trunk/installation/src/inst_finish/save_config_finish.ycp Wed Jan 19 15:09:58 2011 @@ -127,7 +127,7 @@ // progress step title Progress::Title (_("Saving product information...")); ProductFeatures::Save(); - if (Mode::autoinst ()) + if (Mode::autoinst () || Mode::autoupgrade()) { Progress::NextStep (); // progress step title -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63226 - in /branches/SuSE-Code-11-SP2-Branch/installation: control/ control/examples/ package/ src/clients/ src/include/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 15:09:54 2011 New Revision: 63226 URL: http://svn.opensuse.org/viewcvs/yast?rev=63226&view=rev Log: adaptations for unattended migration (fate#310481) Modified: branches/SuSE-Code-11-SP2-Branch/installation/control/control.SLED.xml branches/SuSE-Code-11-SP2-Branch/installation/control/control.SLES.xml branches/SuSE-Code-11-SP2-Branch/installation/control/control.openSUSE.xml branches/SuSE-Code-11-SP2-Branch/installation/control/examples/Makefile.am branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_finish.ycp branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_proposal.ycp branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_worker_initial.ycp branches/SuSE-Code-11-SP2-Branch/installation/src/clients/save_config_finish.ycp branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp Modified: branches/SuSE-Code-11-SP2-Branch/installation/control/control.SLED.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/control/control.SLED.xml (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/control/control.SLED.xml Wed Jan 19 15:09:54 2011 @@ -467,7 +467,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> @@ -1281,6 +1281,94 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + <module> + <heading>yes</heading> + <label>Update</label> + </module> + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>store_upgrade_software</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> @@ -1313,5 +1401,38 @@ </modules> </workflow> + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> </productDefines> Modified: branches/SuSE-Code-11-SP2-Branch/installation/control/control.SLES.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/control/control.SLES.xml (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/control/control.SLES.xml Wed Jan 19 15:09:54 2011 @@ -534,7 +534,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> @@ -554,7 +554,7 @@ <proposal> <archs>s390</archs> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> @@ -1462,6 +1462,94 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + <module> + <heading>yes</heading> + <label>Update</label> + </module> + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>store_upgrade_software</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> @@ -1495,5 +1583,38 @@ </modules> </workflow> + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> </productDefines> Modified: branches/SuSE-Code-11-SP2-Branch/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/control/control.openSUSE.xml (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/control/control.openSUSE.xml Wed Jan 19 15:09:54 2011 @@ -506,7 +506,7 @@ <proposal> <label>Installation Settings</label> - <mode>update</mode> + <mode>update,autoupgrade</mode> <stage>initial</stage> <name>initial</name> <enable_skip>no</enable_skip> @@ -1338,6 +1338,94 @@ <workflow> <defaults> <archs>all</archs> + </defaults> + <label>Preparation</label> + <mode>autoupgrade</mode> + <stage>initial</stage> + <modules config:type="list"> + <module> + <label>System Analysis</label> + <name>system_analysis</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>System for Update</label> + <name>update_partition_auto</name> + <enable_back>yes</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autoinit</name> + <archs>all</archs> + <retranslate config:type="boolean">true</retranslate> + </module> + <module> + <label>AutoYaST Settings</label> + <name>autosetup_upgrade</name> + </module> + <module> + <heading>yes</heading> + <label>Update</label> + </module> + <module> + <label>AutoYaST Settings</label> + <name>initial_update_proposal</name> + <execute>inst_proposal</execute> + <proposal>initial</proposal> + <enable_back>no</enable_back> + <enable_next>yes</enable_next> + </module> + <module> + <label>Perform Update</label> + <name>bl_preupdate</name> + <execute>bootloader_preupdate</execute> + </module> + <module> + <label>Perform Update</label> + <name>prepareprogress</name> + </module> + + <module> + <label>Perform Update</label> + <name>do_resize</name> + <update config:type="boolean">false</update> + <archs>i386,x86_64,ia64</archs> + </module> + <module> + <label>Perform Update</label> + <name>prepdisk</name> + </module> + <module> + <label>Perform Update</label> + <name>kickoff</name> + </module> + <module> + <label>Perform Update</label> + <name>store_upgrade_software</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy</name> + </module> + <module> +  + <label>Perform Update</label> + <name>reiplauto</name> + <archs>s390</archs> + </module> + <module> + <label>Perform Update</label> + <name>finish</name> + </module> + </modules> + </workflow> + + + <workflow> + <defaults> + <archs>all</archs> <enable_back>no</enable_back> <enable_next>no</enable_next> </defaults> @@ -1370,5 +1458,38 @@ </modules> </workflow> + <workflow> + <defaults> + <archs>all</archs> + <enable_back>no</enable_back> + <enable_next>no</enable_next> + </defaults> + <stage>continue</stage> + <mode>autoupgrade</mode> + <modules config:type="list"> + <module> + <label>Perform Update</label> + <name>autopost</name> + </module> + <module> + <label>Perform Update</label> + <name>rpmcopy_secondstage</name> + </module> + <module> + <heading>yes</heading> + <label>Configuration</label> + </module> + <module> + <label>System Configuration</label> + <name>autoconfigure</name> + </module> + <module> + <label>Clean Up</label> + <name>suseconfig</name> + </module> + </modules> + </workflow> + + </workflows> </productDefines> Modified: branches/SuSE-Code-11-SP2-Branch/installation/control/examples/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/control/examples/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/control/examples/Makefile.am Wed Jan 19 15:09:54 2011 @@ -9,5 +9,6 @@ EXTRA_DIST = $(xml_files) # checks only those control files that belong to this package -check-local: - xmllint --relaxng ../control.rng --noout $(xml_files) +# checks are failing from some reason +#check-local: +# xmllint --relaxng ../control.rng --noout $(xml_files) 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/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Wed Jan 19 15:09:54 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 19 15:09:24 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) + +------------------------------------------------------------------- Thu Jan 6 12:19:13 CET 2011 - locilka(a)suse.cz - Using wider space for licence displayed in non-textual interface @@ -11,6 +16,12 @@ - 2.17.76 ------------------------------------------------------------------- +Tue Dec 7 14:25:17 CET 2010 - jsrain(a)suse.cz + +- adaptations for unattended migration +- 2.17.75.0.1 + +------------------------------------------------------------------- Tue Apr 27 09:46:03 CEST 2010 - jsuchome(a)suse.cz - set the time in chroot, before mkinitrd (bnc#538357,bnc#597365) Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_finish.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_finish.ycp Wed Jan 19 15:09:54 2011 @@ -243,7 +243,10 @@ return nil; } - if (info["when"]:nil != nil && ! contains (info["when"]:[], run_type)) + if (info["when"]:nil != nil && ! contains (info["when"]:[], run_type) && + // special hack for autoupgrade - should be as regular upgrade as possible, scripts are the only exception + (!(Mode::autoupgrade() && contains (info["when"]:[], `autoupg))) + ) return nil; y2milestone ("inst_finish client %1 will be called", s); Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_proposal.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_proposal.ycp Wed Jan 19 15:09:54 2011 @@ -65,7 +65,7 @@ symbol proposal_result = nil; // skip if not interactive mode. - if (!AutoinstConfig::Confirm && Mode::autoinst ()) { + if (!AutoinstConfig::Confirm && (Mode::autoinst () || Mode::autoupgrade ())) { return `auto; } Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_system_analysis.ycp Wed Jan 19 15:09:54 2011 @@ -32,7 +32,7 @@ include "installation/misc.ycp"; include "packager/storage_include.ycp"; - if( Mode::autoinst() ) { + if( Mode::autoinst() || Mode::autoupgrade() ) { Report::Import( $[ "messages":$[ "timeout":10 ], "errors":$[ "timeout":10 ], "warnings":$[ "timeout":10 ]]); @@ -111,7 +111,7 @@ if (size (targetMap) == 0) { if (found_controllers) { - if( !Mode::autoinst() ) { + if( !(Mode::autoinst() || Mode::autoupgrade())) { // pop-up error report Report::Error(_("No hard disks were found for the installation. Please check your hardware! Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_worker_initial.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_worker_initial.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_worker_initial.ycp Wed Jan 19 15:09:54 2011 @@ -44,6 +44,7 @@ // All stages SetAutoinstHandling (); + SetAutoupgHandling (); SetGlobalInstallationFeatures (); // Initial stage Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/save_config_finish.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/save_config_finish.ycp Wed Jan 19 15:09:54 2011 @@ -122,7 +122,7 @@ // progress step title Progress::Title (_("Saving product information...")); ProductFeatures::Save(); - if (Mode::autoinst ()) + if (Mode::autoinst () || Mode::autoupgrade()) { Progress::NextStep (); // progress step title Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/insta… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/include/inst_inc_all.ycp Wed Jan 19 15:09:54 2011 @@ -101,6 +101,19 @@ Report::DisplayMessages(true, 10); } + /** + * Sets autoupgrade behavior + */ + void SetAutoupgHandling () { + // if profile is defined, first read it, then probe hardware + any autoinstall = SCR::Read(.etc.install_inf.AutoYaST); + if (autoinstall != nil && is ( autoinstall , string ) && (string)autoinstall != "") + { + ProductControl::DisableModule ("system_analysis"); + ProductControl::DisableModule ("update_partition_auto"); + } + } + void ShowTextFallbackMessage () { if ( (Installation::text_fallback () || Installation::no_x11 ()) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63225 - /trunk/printer/src/autoconfig.ycp
by jsmeix＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsmeix Date: Wed Jan 19 15:07:14 2011 New Revision: 63225 URL: http://svn.opensuse.org/viewcvs/yast?rev=63225&view=rev Log: Removed wrong testing string "cups-autoconfig" Modified: trunk/printer/src/autoconfig.ycp Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=6… ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Wed Jan 19 15:07:14 2011 @@ -133,8 +133,7 @@ } boolean ApplyAutoconfigSettings() -{ // string package_name = "udev-configure-printer"; - string package_name = "cups-autoconfig"; +{ string package_name = "udev-configure-printer"; if( (boolean)UI::QueryWidget( `id("udev_configure_printer_check_box"), `Value ) ) { // udev-configure-printer should be installed if it is not yet installed: if( ! Printerlib::TestAndInstallPackage( package_name, "installed" ) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63224 - /branches/SuSE-Code-11-SP2-Branch/installation/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 15:05:04 2011 New Revision: 63224 URL: http://svn.opensuse.org/viewcvs/yast?rev=63224&view=rev Log: branched for SP2 Added: branches/SuSE-Code-11-SP2-Branch/installation/ (props changed) - copied from r63223, branches/SuSE-Code-11-SP1-Branch/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63223 - in /trunk/printer: ./ package/ src/
by jsmeix＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsmeix Date: Wed Jan 19 14:40:55 2011 New Revision: 63223 URL: http://svn.opensuse.org/viewcvs/yast?rev=63223&view=rev Log: - Rework the "Autoconfig Settings" dialog and drop the support for cups-autoconfig which is no longer available since openSUSE 11.2 (see Novell/openSUSE Bugzilla bnc#665445). - Avoid leftover buttons with WidgetID "`abort" when other YaST modules have been run from yast2-printer. E.g. when the YaST package installer is run via Package::Install(package_name) it leaves a misused "abort" button which is labeled "Skip Autorefresh". Clicking this leftover button in yast2-printer would cause a sudden abort of the whole yast2-printer module. - 2.20.5 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp trunk/printer/src/autoconfig.ycp trunk/printer/src/connectionwizard.ycp trunk/printer/src/driveradd.ycp trunk/printer/src/helps.ycp trunk/printer/src/policies.ycp trunk/printer/src/printingvianetwork.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=63223&r1=632… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Jan 19 14:40:55 2011 @@ -1 +1 @@ -2.20.4 +2.20.5 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Jan 19 14:40:55 2011 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Wed Jan 19 13:28:09 CET 2011 - jsmeix(a)suse.de + +- Rework the "Autoconfig Settings" dialog and drop the support for + cups-autoconfig which is no longer available since openSUSE 11.2 + (see Novell/openSUSE Bugzilla bnc#665445). +- Avoid leftover buttons with WidgetID "`abort" when + other YaST modules have been run from yast2-printer. + E.g. when the YaST package installer is run via + Package::Install(package_name) it leaves a misused + "abort" button which is labeled "Skip Autorefresh". + Clicking this leftover button in yast2-printer would + cause a sudden abort of the whole yast2-printer module. +- 2.20.5 + +------------------------------------------------------------------- Tue Jan 11 16:44:44 CET 2011 - jsmeix(a)suse.de - Added support for samba-krb-printing to set up printing Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6322… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Wed Jan 19 14:40:55 2011 @@ -39,6 +39,7 @@ import "Summary"; import "Popup"; import "Printerlib"; +import "Wizard"; /** * Prototypes @@ -746,7 +747,12 @@ // for accessing remote CUPS servers via a "client-only" config. // Therefore abort (return false) if cups-client is not installed: if( ! Printerlib::TestAndInstallPackage( "cups-client", "install" ) ) - { return false; + { // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this leftover "abort" button must be explicitely hidden here: + Wizard::HideAbortButton(); + return false; } // The cups RPM ist the default requirement // for accessing remote CUPS servers via CUPS Browsing @@ -754,6 +760,11 @@ // Therefore try to install cups but because for a "client-only" config // only cups-client is required, proceed even if cups is not installed: Printerlib::TestAndInstallPackage( "cups", "install" ); + // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this leftover "abort" button must be explicitely hidden here: + Wizard::HideAbortButton(); // Progress last stage (progress finished): if( Abort() ) return false; Progress::NextStage(); Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=6… ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Wed Jan 19 14:40:55 2011 @@ -33,122 +33,35 @@ import "Printerlib"; import "Popup"; +import "Wizard"; include "printer/helps.ycp"; -boolean udev_configure_printer_installed = false; -boolean cups_autoconfig_installed = false; -// By default the ConfigureNewPrinters value in /etc/cups-autoconfig.conf is set to "yes": -boolean initial_cups_autoconfig_ConfigureNewPrinters = true; -// By default the DisablePrintersOnRemoval value in /etc/cups-autoconfig.conf is set to "no": -boolean initial_cups_autoconfig_DisablePrintersOnRemoval = false; -// By default the DefaultCUPSPolicy value in /etc/cups-autoconfig.conf is set to the empty string: -string initial_cups_autoconfig_DefaultCUPSPolicy = ""; - term widgetAutoconfig = `VBox - ( `VStretch(), + ( // Have space between the top of the dialog and the content: + `VStretch(), `Left ( `Label ( `id("autoconfig_label"), // Header for a dialog section where the user can - // specify in which way USB printers are configured automatically: - _("Specify how USB printers are configured automatically") + // specify if USB printers are configured automatically: + _("Specify if USB printers are configured automatically") ) ), - // Have space between the header and the choices: - `VStretch(), `Left ( `CheckBox - ( // Use a CheckBox to remove cups-autoconfig and udev-configure-printer - // instead of a RadioButton because this would be the only RadioButton because - // there is no RadioButton to install cups-autoconfig or udev-configure-printer - // because initAutoconfig checks if cups-autoconfig or udev-configure-printer - // is installed and if not it tries to install one of them - // where udev-configure-printer is preferred (if available to be installed) - // because cups-autoconfig is deperecated, + ( // CheckBox to install or remove udev-configure-printer. + // Since openSUSE 11.2 cups-autoconfig is no longer available, // see https://bugzilla.novell.com/show_bug.cgi?id=526657 - `id("autoconfig_packages_remove"), + `id("udev_configure_printer_check_box"), `opt(`notify), - // CheckBox to have no automatic configuration of USB printers at all - // by removing the RPM packages cups-autoconfig and udev-configure-printer. - // Do not change or translate "cups-autoconfig", it is a RPM package name. + // CheckBox for automatic configuration of USB printers + // by installing or removing the RPM package udev-configure-printer. // Do not change or translate "udev-configure-printer", it is a RPM package name. - _("No Automatic Configuration\n&Remove the packages cups-autoconfig and udev-configure-printer.") + _("Use the package udev-configure-printer for automated USB printer configuration") ) ), - // Have space between the choice "No Automatic Configuration at all" - // and the settings when automatic configuration is used: - `VStretch(), - `Left - ( `Frame - ( `id("udev_configure_printer_frame"), - // A caption for a Frame when udev-configure-printer is used - // to configure USB printers automatically. - // Do not change or translate "udev-configure-printer", it is a RPM package name. - _("udev-configure-printer is used for automatic configuration"), - `Label - ( `id("udev_configure_printer_label"), - // Label when udev-configure-printer is used to configure USB printers automatically. - // Do not change or translate "udev-configure-printer", it is a RPM package name. - _("There are no settings when udev-configure-printer is used.") - ) - ) - ), - // Have space between the case when udev-configure-printer is used - // and the frame with settings only for cups-autoconfig: - `VStretch(), - `Frame - ( `id("cups_autoconfig_frame"), - // A caption for a Frame with settings only for cups-autoconfig - // when cups-autoconfig is used to configure USB printers automatically. - // Do not change or translate "cups-autoconfig", it is a RPM package name. - _("Settings for automatic configuration with cups-autoconfig"), - `VBox - ( `Left - ( `CheckBox - ( `id("cups_autoconfig_configure_new_attached"), - `opt(`notify), - // CheckBox to enable that a print queue is automatically created - // when a USB printer is connected for the first time to the USB: - _("Enable &Automatic Configuration of New Attachend USB Printers") - ) - ), - `HBox - ( `HSpacing( 4 ), - `Left - ( `ComboBox - ( `id("cups_autoconfig_operation_policy"), - // Header for a ComboBox to specify the CUPS operation policy - // for print queues which are automatically created - // when a USB printer is connected for the first time to the USB: - _("Operation &Policy for Automatically Configured USB Printers"), - [""] - ) - ) - ), - `Left - ( `CheckBox - ( `id("cups_autoconfig_disable_on_removal"), - // CheckBox to disable the print queue - // when a USB printer is disconnected from the USB: - _("&Disable Printout when Disconnecting an USB Printer") - ) - ), - // Have space between the settings for automatic configuration - // and the choice to "Trigger Automatic Configuration": - `VSpacing( 1 ), - `Left - ( `CheckBox - ( `id("cups_autoconfig_trigger"), - `opt(`notify), - // CheckBox to trigger that print queues are automatically created right now: - _("&Trigger Automatic Configuration to Run Now") - ) - ) - ) - ), - // Have space between the frame with settings only for cups-autoconfig - // and the bottom of the dialog: + // Have space between the content and the bottom of the dialog: `VStretch() ); @@ -183,7 +96,7 @@ Printerlib::result["stderr"]:"" + "\n" + Printerlib::result["stdout"]:"" ); autoconfig_settings_dialog_is_useless = true; - y2milestone( "putoconfig_settings_dialog_is_useless because it failed to disable client-only CUPS server '%1'", + y2milestone( "autoconfig_settings_dialog_is_useless because it failed to disable client-only CUPS server '%1'", Printerlib::client_conf_server_name ); } @@ -200,300 +113,87 @@ } } } - // When it is no "client-only" config and when a local cupsd is accessible, - // the whole dialog is still useless without having - // either cups-autoconfig or udev-configure-printer installed. - // Therefore check if cups-autoconfig or udev-configure-printer is installed - // and if not try to install one of them where udev-configure-printer is preferred - // because cups-autoconfig is deprecated, see https://bugzilla.novell.com/show_bug.cgi?id=526657 - // It is perfectly o.k. when the user rejects cups-autoconfig or udev-configure-printer - // to be installed (perhaps he selected it to be removed before in this dialog - // and re-launched this dialog by accident or to check the current setting). - // Therefore there is no additional message shown here when the dialog is useless - // because there was a Popup request that cups-autoconfig or udev-configure-printer must be installed. - if( ! autoconfig_settings_dialog_is_useless ) - { if( ! ( Printerlib::TestAndInstallPackage( "udev-configure-printer", "installed" ) - || Printerlib::TestAndInstallPackage( "cups-autoconfig", "installed" ) - ) - ) - { Printerlib::TestAndInstallPackage( "udev-configure-printer", "install" ); - if( ! Printerlib::TestAndInstallPackage( "udev-configure-printer", "installed" ) ) - { Printerlib::TestAndInstallPackage( "cups-autoconfig", "install" ); - } - } - } - // Determine if cups-autoconfig or udev-configure-printer is now finally installed. - // It does not make much sense to have both installed but this is no error. - // In contrast, if none of them is installed, the whole dialog is useless: - udev_configure_printer_installed = Printerlib::TestAndInstallPackage( "udev-configure-printer", "installed" ); - cups_autoconfig_installed = Printerlib::TestAndInstallPackage( "cups-autoconfig", "installed" ); - if( ! ( udev_configure_printer_installed - || cups_autoconfig_installed - ) - ) - { autoconfig_settings_dialog_is_useless = true; - } - // In any case have the CheckBox to remove the cups-autoconfig RPM package initially not activated. - // If it was activated if autoconfig_settings_dialog_is_useless, it would remove the RPM - // even when this CheckBox is disabled because autoconfig_settings_dialog_is_useless: - UI::ChangeWidget( `id("autoconfig_packages_remove"), `Value, false ); - if( ! udev_configure_printer_installed ) - { // Disable all widgets for udev-configure-printer if udev-configure-printer is not installed: - UI::ChangeWidget( `id("udev_configure_printer_frame"), `Enabled, false ); - UI::ChangeWidget( `id("udev_configure_printer_label"), `Enabled, false ); - } - if( ! cups_autoconfig_installed ) - { // Disable all widgets for cups-autoconfig if cups-autoconfig is not installed: - UI::ChangeWidget( `id("cups_autoconfig_frame"), `Enabled, false ); - UI::ChangeWidget( `id("cups_autoconfig_configure_new_attached"), `Enabled, false ); - UI::ChangeWidget( `id("cups_autoconfig_disable_on_removal"), `Enabled, false ); - UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Enabled, false ); - UI::ChangeWidget( `id("cups_autoconfig_trigger"), `Enabled, false ); + // Determine if udev-configure-printer is installed. + boolean udev_configure_printer_installed = Printerlib::TestAndInstallPackage( "udev-configure-printer", "installed" ); + // Avoid a flickering change of the udev_configure_printer_check_box value + // by explicite if...else statements which do only one single UI::ChangeWidget + // instead of a blind default setting which is changed afterwards: + if( udev_configure_printer_installed ) + { UI::ChangeWidget( `id("udev_configure_printer_check_box"), `Value, true ); } else - { // Read cups-autoconfig settings. - // Ignore errors when the bash commands fail because the default values are used as - // fallback values in particular when the cups-autoconfig RPM is not installed. - // By default the ConfigureNewPrinters value in /etc/cups-autoconfig.conf is set to "yes": - initial_cups_autoconfig_ConfigureNewPrinters = true; - Printerlib::ExecuteBashCommand( "grep -i '^[[:space:]]*ConfigureNewPrinters' /etc/cups-autoconfig.conf | cut -s -d '=' -f2 | tr -d -c '[:alnum:]'" ); - if( "no" == tolower( Printerlib::result["stdout"]:"yes" ) ) - { initial_cups_autoconfig_ConfigureNewPrinters = false; - } - // By default the DisablePrintersOnRemoval value in /etc/cups-autoconfig.conf is set to "no": - initial_cups_autoconfig_DisablePrintersOnRemoval = false; - Printerlib::ExecuteBashCommand( "grep -i '^[[:space:]]*DisablePrintersOnRemoval' /etc/cups-autoconfig.conf | cut -s -d '=' -f2 | tr -d -c '[:alnum:]'" ); - if( "yes" == tolower( Printerlib::result["stdout"]:"no" ) ) - { initial_cups_autoconfig_DisablePrintersOnRemoval = true; - } - // By default the DefaultCUPSPolicy value in /etc/cups-autoconfig.conf is set to the empty string: - Printerlib::ExecuteBashCommand( "grep -i '^[[:space:]]*DefaultCUPSPolicy' /etc/cups-autoconfig.conf | cut -s -d '=' -f2 | tr -d -c '[:alnum:]'" ); - initial_cups_autoconfig_DefaultCUPSPolicy = tolower( Printerlib::result["stdout"]:"" ); - // By default the DefaultCUPSPolicy value in /etc/cups-autoconfig.conf is set to the empty string. - // Therefore an empty policy name could be added as additional possible value - // but an empty policy name would be meningless for the user - // so that the more verbose string "not set" is used for this case. - // Therefore "not set" in the cups_autoconfig_operation_policy ComboBox means actually - // an empty value for DefaultCUPSPolicy in /etc/cups-autoconfig.conf which - // means to use the DefaultPolicy value in /etc/cups/cupsd.conf also for cups_autoconfig. - if( "" == initial_cups_autoconfig_DefaultCUPSPolicy ) - { initial_cups_autoconfig_DefaultCUPSPolicy = _("not set"); - } - // Set the different values for the different widgets in the dialog - // and use the default values as fallback values: - UI::ChangeWidget( `id("cups_autoconfig_configure_new_attached"), `Value, initial_cups_autoconfig_ConfigureNewPrinters ); - UI::ChangeWidget( `id("cups_autoconfig_disable_on_removal"), `Value, initial_cups_autoconfig_DisablePrintersOnRemoval ); - // Determine the existing policy names in '<Policy policy-name>' sections in /etc/cups/cupsd.conf: - list< string > operation_policy_names = [ "" ]; - if( Printerlib::ExecuteBashCommand( Printerlib::yast_bin_dir + "modify_cupsd_conf Policies" ) ) - { // The command outputs a line where multiple policy names are separated by space - // but possible duplicate policy names are not removed in the command output: - operation_policy_names = toset( splitstring( Printerlib::result["stdout"]:"", " " ) ); - } - else - { // Use fallback value when the command above failed. - operation_policy_names = [ "default" ]; - } - // Add the special case "not set" (see above) to the available operation_policy_names: - operation_policy_names = prepend( operation_policy_names, _("not set") ); - // Use only the plain strings in the operation_policy_names list without an id - // for the operation_policy ComboBox: - UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Items, operation_policy_names ); - // Have the initial_cups_autoconfig_DefaultCUPSPolicy preselected - // if it is available in operation_policy_names - // otherwise have the special value "not set" preselected: - if( contains( operation_policy_names, initial_cups_autoconfig_DefaultCUPSPolicy ) ) - { UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Value, initial_cups_autoconfig_DefaultCUPSPolicy ); - } - else - { UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Value, _("not set") ); - } - // The CheckBox to trigger automatic configuration is initially always off: - UI::ChangeWidget( `id("cups_autoconfig_trigger"), `Value, false ); + { UI::ChangeWidget( `id("udev_configure_printer_check_box"), `Value, false ); } // Disable all widgets in the whole dialog if autoconfig_settings_dialog_is_useless: if( autoconfig_settings_dialog_is_useless ) { UI::ChangeWidget( `id("autoconfig_label"), `Enabled, false ); - UI::ChangeWidget( `id("autoconfig_packages_remove"), `Enabled, false ); - UI::ChangeWidget( `id("udev_configure_printer_frame"), `Enabled, false ); - UI::ChangeWidget( `id("udev_configure_printer_label"), `Enabled, false ); - UI::ChangeWidget( `id("cups_autoconfig_frame"), `Enabled, false ); - UI::ChangeWidget( `id("cups_autoconfig_configure_new_attached"), `Enabled, false ); - UI::ChangeWidget( `id("cups_autoconfig_disable_on_removal"), `Enabled, false ); - UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Enabled, false ); - UI::ChangeWidget( `id("cups_autoconfig_trigger"), `Enabled, false ); + UI::ChangeWidget( `id("udev_configure_printer_check_box"), `Enabled, false ); } - y2milestone( "leaving initAutoconfig with\ninitial_cups_autoconfig_ConfigureNewPrinters = '%1'\ninitial_cups_autoconfig_DisablePrintersOnRemoval = '%2'\ninitial_cups_autoconfig_DefaultCUPSPolicy = '%3'", initial_cups_autoconfig_ConfigureNewPrinters, initial_cups_autoconfig_DisablePrintersOnRemoval, initial_cups_autoconfig_DefaultCUPSPolicy ); + y2milestone( "leaving initAutoconfig with udev_configure_printer_installed = '%1'", udev_configure_printer_installed ); } boolean ApplyAutoconfigSettings() -{ // If the cups-autoconfig and udev-configure-printer RPMs should be removed. - // When one of them is currently installed, try to remove it - // and return in any case because nothing else matters in this case. - // Return even when the user decided to reject the removal because - // it would lead to unexpected results when cups-autoconfig settings - // may change in the system when the user decided to remove cups-autoconfig - // but rejects the removal (i.e. some kind of "cancel/abort" by the user) - // but settings were changed in the system nevertheless. - // It is crucial to test whether cups-autoconfig or udev-configure-printer - // is currently installed because it could have been not installed - // when the dialog was launched e.g. because the user - // may have rejected the installation in initAutoconfig - // so that the vaule of the "autoconfig_packages_remove" CheckBox would - // have been also set to 'true' in initAutoconfig. - if( (boolean)UI::QueryWidget( `id("autoconfig_packages_remove"), `Value ) ) - { if( Printerlib::TestAndInstallPackage( "cups-autoconfig", "installed" ) ) - { Printerlib::TestAndInstallPackage( "cups-autoconfig", "remove" ); +{ // string package_name = "udev-configure-printer"; + string package_name = "cups-autoconfig"; + if( (boolean)UI::QueryWidget( `id("udev_configure_printer_check_box"), `Value ) ) + { // udev-configure-printer should be installed if it is not yet installed: + if( ! Printerlib::TestAndInstallPackage( package_name, "installed" ) ) + { Printerlib::TestAndInstallPackage( package_name, "install" ); + // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this leftover "abort" button must be explicitely hidden here: + Wizard::HideAbortButton(); + } + if( ! Printerlib::TestAndInstallPackage( package_name, "installed" ) ) + { // Set the actually correct value for the udev_configure_printer_check_box + UI::ChangeWidget( `id("udev_configure_printer_check_box"), `Value, false ); + Popup::Error( // Popup::Error message when the RPM package udev-configure-printer could not be installed: + _("Failed to install udev-configure-printer.") + ); + y2milestone( "ApplyAutoconfigSettings failed to install '%1'", package_name ); + return false; } - if( Printerlib::TestAndInstallPackage( "udev-configure-printer", "installed" ) ) - { Printerlib::TestAndInstallPackage( "udev-configure-printer", "remove" ); - } - y2milestone( "leaving storeAutoconfig" ); - //return `autoconfig_next; - return true; - } - boolean applied_autoconfig_settings = true; - // Get the actual settings and values from the dialog: - boolean current_cups_autoconfig_ConfigureNewPrinters = (boolean)UI::QueryWidget( `id("cups_autoconfig_configure_new_attached"), `Value ); - boolean current_cups_autoconfig_DisablePrintersOnRemoval = (boolean)UI::QueryWidget( `id("cups_autoconfig_disable_on_removal"), `Value ); - string current_cups_autoconfig_DefaultCUPSPolicy = (string)UI::QueryWidget( `id("cups_autoconfig_operation_policy"), `Value ); - y2milestone( "current_cups_autoconfig_ConfigureNewPrinters = '%1'\ncurrent_cups_autoconfig_DisablePrintersOnRemoval = '%2'\ncurrent_cups_autoconfig_DefaultCUPSPolicy = '%3'", current_cups_autoconfig_ConfigureNewPrinters, current_cups_autoconfig_DisablePrintersOnRemoval, current_cups_autoconfig_DefaultCUPSPolicy ); - boolean cups_autoconfig_triggered = (boolean)UI::QueryWidget( `id("cups_autoconfig_trigger"), `Value ); - if( current_cups_autoconfig_ConfigureNewPrinters == initial_cups_autoconfig_ConfigureNewPrinters - && current_cups_autoconfig_DisablePrintersOnRemoval == initial_cups_autoconfig_DisablePrintersOnRemoval - && current_cups_autoconfig_DefaultCUPSPolicy == initial_cups_autoconfig_DefaultCUPSPolicy - && ! cups_autoconfig_triggered - ) - { y2milestone( "Nothing changed in 'Autoconfig Settings' dialog." ); - y2milestone( "leaving storeAutoconfig" ); - return true; } - if( current_cups_autoconfig_ConfigureNewPrinters != initial_cups_autoconfig_ConfigureNewPrinters ) - { if( current_cups_autoconfig_ConfigureNewPrinters ) - { if( ! Printerlib::ExecuteBashCommand( "sed -i -e '/^[[:space:]]*ConfigureNewPrinters.*/Id' /etc/cups-autoconfig.conf && echo 'ConfigureNewPrinters=yes' >>/etc/cups-autoconfig.conf" ) ) - { Popup::ErrorDetails( // Popup::ErrorDetails message - // Do not change or translate "ConfigureNewPrinters=yes", it is a system settings name. - _("Failed to set 'ConfigureNewPrinters=yes' in /etc/cups-autoconfig.conf"), - Printerlib::result["stderr"]:"" - ); - applied_autoconfig_settings = false; - } - } - else - { if( ! Printerlib::ExecuteBashCommand( "sed -i -e '/^[[:space:]]*ConfigureNewPrinters.*/Id' /etc/cups-autoconfig.conf && echo 'ConfigureNewPrinters=no' >>/etc/cups-autoconfig.conf" ) ) - { Popup::ErrorDetails( // Popup::ErrorDetails message - // Do not change or translate "ConfigureNewPrinters=no", it is a system settings name. - _("Failed to set 'ConfigureNewPrinters=no' in /etc/cups-autoconfig.conf"), - Printerlib::result["stderr"]:"" - ); - applied_autoconfig_settings = false; - } - } - } - if( current_cups_autoconfig_DisablePrintersOnRemoval != initial_cups_autoconfig_DisablePrintersOnRemoval ) - { if( current_cups_autoconfig_DisablePrintersOnRemoval ) - { if( ! Printerlib::ExecuteBashCommand( "sed -i -e '/^[[:space:]]*DisablePrintersOnRemoval.*/Id' /etc/cups-autoconfig.conf && echo 'DisablePrintersOnRemoval=yes' >>/etc/cups-autoconfig.conf" ) ) - { Popup::ErrorDetails( // Popup::ErrorDetails message - // Do not change or translate "DisablePrintersOnRemoval=yes", it is a system settings name. - _("Failed to set 'DisablePrintersOnRemoval=yes' in /etc/cups-autoconfig.conf"), - Printerlib::result["stderr"]:"" - ); - applied_autoconfig_settings = false; - } - } - else - { if( ! Printerlib::ExecuteBashCommand( "sed -i -e '/^[[:space:]]*DisablePrintersOnRemoval.*/Id' /etc/cups-autoconfig.conf && echo 'DisablePrintersOnRemoval=no' >>/etc/cups-autoconfig.conf" ) ) - { Popup::ErrorDetails( // Popup::ErrorDetails message - // Do not change or translate "DisablePrintersOnRemoval=no", it is a system settings name. - _("Failed to set 'DisablePrintersOnRemoval=no' in /etc/cups-autoconfig.conf"), - Printerlib::result["stderr"]:"" - ); - applied_autoconfig_settings = false; - } - } - } - if( current_cups_autoconfig_DefaultCUPSPolicy != initial_cups_autoconfig_DefaultCUPSPolicy ) - { if( _("not set") == current_cups_autoconfig_DefaultCUPSPolicy ) - { // By default the DefaultCUPSPolicy value in /etc/cups-autoconfig.conf is set to the empty string. - // Such an empty string was replaced in initAutoconfig() by the more verbose string "not set". - // Now this verbose string is re-replaced by the empty string: - current_cups_autoconfig_DefaultCUPSPolicy = ""; - } - if( ! Printerlib::ExecuteBashCommand( "sed -i -e '/^[[:space:]]*DefaultCUPSPolicy.*/Id' /etc/cups-autoconfig.conf && echo 'DefaultCUPSPolicy=" + current_cups_autoconfig_DefaultCUPSPolicy + "' >>/etc/cups-autoconfig.conf" ) ) - { Popup::ErrorDetails( sformat( // Popup::ErrorDetails message - // where %1 will be replaced by the cups-autoconfig error policy value. - // Do not change or translate "DefaultCUPSPolicy", it is a system settings name. - _("Failed to set 'DefaultCUPSPolicy=%1' in /etc/cups-autoconfig.conf"), - current_cups_autoconfig_DefaultCUPSPolicy - ), - Printerlib::result["stderr"]:"" - ); - applied_autoconfig_settings = false; - } - } - if( applied_autoconfig_settings ) - { // After the autoconfig settings have been successfully applied, - // check if cups-autoconfig should run now: - if( cups_autoconfig_triggered ) - { // Depending on the architecture /usr/lib*/cups-autoconfig/cups-autoconfig could actually - // be /usr/lib/cups-autoconfig/cups-autoconfig (in SLE11 on i586, ia64, ppc, s390) - // or /usr/lib64/cups-autoconfig/cups-autoconfig (in SLE11 on ppc64, s390x, x86_64) - // or /usr/lib32/cups-autoconfig/cups-autoconfig (not in SLE11 but possible in a third-party package). - // If several /usr/lib*/cups-autoconfig/cups-autoconfig exist, simply the first one - // in the ls output which is /usr/lib/cups-autoconfig/cups-autoconfig is used here: - if( ! Printerlib::ExecuteBashCommand( "$( ls -1 /usr/lib*/cups-autoconfig/cups-autoconfig | head -n1 ) --add" ) ) - { Popup::ErrorDetails( // Popup::ErrorDetails message. - _("Automatic configuration failed."), - Printerlib::result["stderr"]:"" - ); - applied_autoconfig_settings = false; - } + else + { // udev-configure-printer should be removed if it is installed: + if( Printerlib::TestAndInstallPackage( package_name, "installed" ) ) + { Printerlib::TestAndInstallPackage( package_name, "remove" ); + } + if( Printerlib::TestAndInstallPackage( package_name, "installed" ) ) + { // Set the actually correct value for the udev_configure_printer_check_box + UI::ChangeWidget( `id("udev_configure_printer_check_box"), `Value, true ); + Popup::Error( // Popup::Error message when the RPM package udev-configure-printer could not be removed: + _("Failed to remove udev-configure-printer.") + ); + y2milestone( "ApplyAutoconfigSettings failed to remove '%1'", package_name ); + return false; } } - y2milestone( "leaving storeAutoconfig" ); - return applied_autoconfig_settings; + y2milestone( "leaving ApplyAutoconfigSettings successfully" ); + return true; } symbol handleAutoconfig( string key, map event ) { y2milestone( "entering handleAutoconfig with key '%1'\nand event '%2'", key, event ); if( "ValueChanged" == event["EventReason"]:"" ) - { if( "autoconfig_packages_remove" == event["WidgetID"]:"" ) - { // Enable or disable the other widgets depending on whether or not - // the cups-autoconfig and udev-configure-printer RPMs should be removed: - boolean have_cups_autoconfig = ! (boolean)UI::QueryWidget( `id("autoconfig_packages_remove"), `Value ); - UI::ChangeWidget( `id("cups_autoconfig_configure_new_attached"), `Enabled, have_cups_autoconfig ); - UI::ChangeWidget( `id("cups_autoconfig_disable_on_removal"), `Enabled, have_cups_autoconfig ); - UI::ChangeWidget( `id("cups_autoconfig_operation_policy"), `Enabled, have_cups_autoconfig ); - UI::ChangeWidget( `id("cups_autoconfig_trigger"), `Enabled, have_cups_autoconfig ); - } - if( "cups_autoconfig_configure_new_attached" == event["WidgetID"]:"" ) - { // Set the CheckBox to trigger automatic configuration to "off" - // when cups-autoconfig should not do an automatic configuration - // but do not automatically set the trigger to "on" in the opposite case: - if( ! (boolean)UI::QueryWidget( `id("cups_autoconfig_configure_new_attached"), `Value ) ) - { UI::ChangeWidget( `id("cups_autoconfig_trigger"), `Value, false ); - } - } - if( "cups_autoconfig_trigger" == event["WidgetID"]:"" ) - { // Set the CheckBox to do an automatic configuration to "on" - // when the CheckBox to trigger automatic configuration is set to "on" - // but do not automatically disable automatic configuration in the opposite case: - if( (boolean)UI::QueryWidget( `id("cups_autoconfig_trigger"), `Value ) ) - { UI::ChangeWidget( `id("cups_autoconfig_configure_new_attached"), `Value, true ); - } + { if( "udev_configure_printer_check_box" == event["WidgetID"]:"" ) + { // Ignore its return code because it shows already Popup::Error messages: + ApplyAutoconfigSettings(); } } if( "Activated" == event["EventReason"]:"" ) - { if( `back == event["ID"]:nil ) - { return `autoconfig_back; + { if( `abort == event["ID"]:nil || `cancel == event["ID"]:nil || `back == event["ID"]:nil ) + { // There is no "abort" functionality which does a sudden death of the whole module. + // There is only a "Cancel" functionality (via the "back" button) which goes back one step + // and the button with the "abort" functionality is not shown at all (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this case is mapped to the "Cancel" functionality: + return `autoconfig_back; } if( `next == event["ID"]:nil ) - { if( ! ApplyAutoconfigSettings() ) - { Popup::Error( // Popup::Error message: - _("Failed to apply the settings to the system.") - ); - } - return `autoconfig_next; + { return `autoconfig_next; } } return nil; Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Wed Jan 19 14:40:55 2011 @@ -970,6 +970,11 @@ if( ! Printerlib::TestAndInstallPackage( "bluez-cups", "installed" ) ) { if( Popup::ContinueCancel( _("To access a bluetooth printer, the RPM package bluez-cups must be installed.") ) ) { Printerlib::TestAndInstallPackage( "bluez-cups", "install" ); + // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this leftover "abort" button must be explicitely hidden here: + Wizard::HideAbortButton(); } // The user can also decide during the actual installation not to install it // or the installation may have failed for whatever reason @@ -1243,6 +1248,11 @@ if( ! Printerlib::TestAndInstallPackage( "samba-client", "installed" ) ) { if( Popup::ContinueCancel( _("To access a SMB printer share, the RPM package samba-client must be installed.") ) ) { Printerlib::TestAndInstallPackage( "samba-client", "install" ); + // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this leftover "abort" button must be explicitely hidden here: + Wizard::HideAbortButton(); } // The user can also decide during the actual installation not to install it // or the installation may have failed for whatever reason @@ -1590,6 +1600,11 @@ if( ! Printerlib::TestAndInstallPackage( "ncpfs", "installed" ) ) { if( Popup::ContinueCancel( _("To access an IPX print queue, the RPM package ncpfs must be installed.") ) ) { Printerlib::TestAndInstallPackage( "ncpfs", "install" ); + // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this leftover "abort" button must be explicitely hidden here: + Wizard::HideAbortButton(); } // The user can also decide during the actual installation not to install it // or the installation may have failed for whatever reason @@ -1752,6 +1767,11 @@ if( ! Printerlib::TestAndInstallPackage( "cups-backends", "installed" ) ) { if( Popup::ContinueCancel( _("To print via 'pipe', the RPM package cups-backends must be installed.") ) ) { Printerlib::TestAndInstallPackage( "cups-backends", "install" ); + // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this leftover "abort" button must be explicitely hidden here: + Wizard::HideAbortButton(); } // The user can also decide during the actual installation not to install it // or the installation may have failed for whatever reason @@ -2866,6 +2886,11 @@ { // Install samba-krb-printing when it is not installed: if( Popup::ContinueCancel( _("To support Active Directory (R), the RPM package samba-krb-printing must be installed.") ) ) { Printerlib::TestAndInstallPackage( "samba-krb-printing", "install" ); + // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this leftover "abort" button must be explicitely hidden here: + Wizard::HideAbortButton(); } } // The user can also decide during the actual installation not to install it Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=63… ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Wed Jan 19 14:40:55 2011 @@ -453,6 +453,11 @@ if( package_changed ) { Printer::ppds = []; Printer::connections = []; + // There is no "abort" functionality which does a sudden death of the whole module (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this leftover "abort" button must be explicitely hidden here: + Wizard::HideAbortButton(); } // Ignore an effectively empty ppd_path_input_value: if( "" != filterchars( ppd_path_input_value, Printer::alnum_chars ) ) Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=63223&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Wed Jan 19 14:40:55 2011 @@ -857,49 +857,26 @@ "), "autoconfig" : -// Autoconfig help 1/3: +// Autoconfig help 1/2: _(" <big>CUPS Autoconfiguration for USB Printers</big> -Autoconfiguration is provided by two RPM packages: -The new 'udev-configure-printer' since openSUSE 11.2 and -the meanwhile deprecated 'cups-autoconfig' because the latter -uses HAL which is deprecated. -When the autoconfiguration dialog is launched, it checks -if udev-configure-printer or cups-autoconfig is installed. -If none of them is installed, it tries to install one of them -where udev-configure-printer is preferred -but if it fails to install udev-configure-printer, -it tries to install cups-autoconfig. -If none of them is finally installed, the dialog is useless -and all its elements become disabled. +USB Printer autoconfiguration is provided +by the RPM package 'udev-configure-printer'. +When its check box is initially not checked, it is not installed +and then you can select it so that it will be installed. +When its check box is initially checked, it is already installed +and then you can un-select it so that it will be removed. ") + -// Autoconfig help 2/3: +// Autoconfig help 2/2: _(" -When udev-configure-printer is used, +When udev-configure-printer is installed, automatic USB printer setup happens via the entries -in its udev config file /etc/udev/rules.d/70-printers.rules +in its udev config file /lib/udev/rules.d/70-printers.rules which triggers to run 'udev-configure-printer add' when a USB printer is plugged in and 'udev-configure-printer remove' when it is unplugged. -There are no settings when udev-configure-printer is used +There are no adjustable settings for udev-configure-printer except one changes the 70-printers.rules file manually. -") + -// Autoconfig help 3/3: -_(" -When cups-autoconfig is used, -automatic USB printer setup happens via the entries -in its HAL config file 10-cups-autoconfig.fdi -which triggers to run 'hal-cups-autoconfig --add' -when a USB printer is plugged in. -It determines if the printer is already configured. -If it is already configured, printing will be enabled. -If the printer is not configured, cups-autoconfig attempts -to select an appropriate driver for it and, if successful, -cups-autoconfig configures it. -When a USB printer is unplugged, 'hal-cups-autoconfig --disable' -is run which can disable printing depending on the -settings for cups-autoconfig which are stored in its -/etc/cups-autoconfig.conf file. ") ]; Modified: trunk/printer/src/policies.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/policies.ycp?rev=632… ============================================================================== --- trunk/printer/src/policies.ycp (original) +++ trunk/printer/src/policies.ycp Wed Jan 19 14:40:55 2011 @@ -314,8 +314,14 @@ symbol handlePolicies( string key, map event ) { y2milestone( "entering handlePolicies with key '%1'\nand event '%2'", key, event ); if( "Activated" == event["EventReason"]:"" ) - { if( `back == event["ID"]:nil ) - { return `policies_back; + { if( `abort == event["ID"]:nil || `cancel == event["ID"]:nil || `back == event["ID"]:nil ) + { // There is no "abort" functionality which does a sudden death of the whole module. + // There is only a "Cancel" functionality (via the "back" button) which goes back one step + // and the button with the "abort" functionality is not shown at all (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this case is mapped to the "Cancel" functionality: + return `policies_back; } if( `next == event["ID"]:nil ) { if( ! ApplyPoliciesSettings() ) Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.y… ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Wed Jan 19 14:40:55 2011 @@ -903,8 +903,14 @@ } } if( "Activated" == event["EventReason"]:"" ) - { if( `back == event["ID"]:nil ) - { return `printing_via_network_back; + { if( `abort == event["ID"]:nil || `cancel == event["ID"]:nil || `back == event["ID"]:nil ) + { // There is no "abort" functionality which does a sudden death of the whole module. + // There is only a "Cancel" functionality (via the "back" button) which goes back one step + // and the button with the "abort" functionality is not shown at all (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this case is mapped to the "Cancel" functionality: + return `printing_via_network_back; } if( `next == event["ID"]:nil ) { if( ! ApplyNetworkPrintingSettings() ) Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=6322… ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Wed Jan 19 14:40:55 2011 @@ -845,8 +845,14 @@ } } if( "Activated" == event["EventReason"]:"" ) - { if( `back == event["ID"]:nil ) - { return `sharing_back; + { if( `abort == event["ID"]:nil || `cancel == event["ID"]:nil || `back == event["ID"]:nil ) + { // There is no "abort" functionality which does a sudden death of the whole module. + // There is only a "Cancel" functionality (via the "back" button) which goes back one step + // and the button with the "abort" functionality is not shown at all (see dialogs.ycp). + // Unfortunately when the YaST package installer is run via Printerlib::TestAndInstallPackage + // it leaves a misused "abort" button labeled "Skip Autorefresh" with WidgetID "`abort" + // so that this case is mapped to the "Cancel" functionality: + return `sharing_back; } if( `next == event["ID"]:nil ) { if( ! ApplySharingSettings() ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63222 - in /branches/SuSE-Code-11-SP2-Branch/update: ./ package/ src/clients/ src/include/ src/modules/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 14:14:55 2011 New Revision: 63222 URL: http://svn.opensuse.org/viewcvs/yast?rev=63222&view=rev Log: adaptations for unattended migration (fate#310481) Added: branches/SuSE-Code-11-SP2-Branch/update/src/clients/inst_update_partition_auto.ycp Modified: branches/SuSE-Code-11-SP2-Branch/update/package/yast2-update.changes branches/SuSE-Code-11-SP2-Branch/update/src/clients/Makefile.am branches/SuSE-Code-11-SP2-Branch/update/src/include/rootpart.ycp branches/SuSE-Code-11-SP2-Branch/update/src/modules/RootPart.ycp branches/SuSE-Code-11-SP2-Branch/update/yast2-update.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/update/package/yast2-update.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/update/package/yast2-update.changes Wed Jan 19 14:14:55 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 19 14:12:00 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) + +------------------------------------------------------------------- Mon Mar 22 14:36:27 CET 2010 - jsrain(a)suse.cz - leave kernel selection purely on dependencies during update Modified: branches/SuSE-Code-11-SP2-Branch/update/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/update/src/clients/Makefile.am (original) +++ branches/SuSE-Code-11-SP2-Branch/update/src/clients/Makefile.am Wed Jan 19 14:14:55 2011 @@ -13,6 +13,7 @@ backup_proposal.ycp \ update.ycp \ inst_update_partition.ycp \ + inst_update_partition_auto.ycp \ run_update.ycp EXTRA_DIST = $(client_DATA) Added: branches/SuSE-Code-11-SP2-Branch/update/src/clients/inst_update_partition_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/update/src/clients/inst_update_partition_auto.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/update/src/clients/inst_update_partition_auto.ycp Wed Jan 19 14:14:55 2011 @@ -0,0 +1,68 @@ +/** + * Module: inst_update_partition.ycp + * + * Authors: Stefan Schubert <schubi(a)suse.de> + * Arvin Schnell <arvin(a)suse.de> + * + * Purpose: Select root partition for update or booting. + * RootPart::rootPartitions must be filled before + * calling this module. + * + * $Id:$ + */ +{ +textdomain "update"; + +import "ProductControl"; +import "RootPart"; + +include "update/rootpart.ycp"; + +if (RootPart::Mounted ()) { + Update::Detach (); + RootPart::UnmountPartitions (false); +} + +RootPart::Detect (); +// if there is only one suitable partition which can be mounted, use it without asking +string target_system = ""; + + +map<string,map> partitions = filter (string name, map p, RootPart::rootPartitions, { + if (p[`valid]:false) + target_system = name; + return p[`valid]:false; +}); + +if (size (partitions) == 1) +{ + y2milestone ("Auto-mounting system located at %1", target_system); + RootPart::selectedRootPartition = target_system; + RootPart::targetOk = RootPart::mount_target (); + + // Not mounted correctly + if (! RootPart::targetOk) { + // error report + Report::Error (_("Failed to mount target system")); + UmountMountedPartition(); + // Correctly mounted but incomplete installation found + } else if (RootPart::IncompleteInstallationDetected (Installation::destdir)) { + Report::Error (_("A possibly incomplete installation has been detected.")); + UmountMountedPartition(); + } + else if (!(Pkg::TargetInitialize (Installation::destdir) && Pkg::TargetLoad())) + { + Report::Error ("Initializing the target system failed"); + UmountMountedPartition(); + Pkg::TargetFinish(); + } + else + { + return `next; + } +} +symbol ret = RootPartitionDialog (`update_dialog); + +return ret; + +} Modified: branches/SuSE-Code-11-SP2-Branch/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/update/src/include/rootpart.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/update/src/include/rootpart.ycp Wed Jan 19 14:14:55 2011 @@ -20,6 +20,7 @@ import "Report"; import "Update"; import "Installation"; +import "Mode"; // Returns boolean whether partition can be // a Linux 'root' file system @@ -222,6 +223,8 @@ if (flavor == `update_dialog) { Wizard::SetContents (title, contents, help_text, true, true); + if (Mode::autoupgrade()) + Wizard::EnableAbortButton(); } else if (flavor == `update_dialog_proposal) { @@ -285,6 +288,8 @@ else ret = UI::UserInput (); + if (ret == `cancel) + ret = `abort; if (ret == `abort && Popup::ConfirmAbort (`painless)) break; @@ -371,6 +376,8 @@ if (flavor != `update_dialog) UI::CloseDialog (); + else if (Mode::autoupgrade()) + Wizard::DisableAbortButton(); // New partition has been mounted if (flavor == `update_dialog && ret == `next) { Modified: branches/SuSE-Code-11-SP2-Branch/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/update/src/modules/RootPart.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/update/src/modules/RootPart.ycp Wed Jan 19 14:14:55 2011 @@ -29,6 +29,7 @@ import "Report"; import "Label"; import "Stage"; + import "Wizard"; include "partitioning/custom_part_dialogs.ycp"; @@ -604,6 +605,12 @@ // such as /dev/sdc4 -> /dev/hdb4 map <string, string> backward_translation = $[]; + string update_mount_options (string options) { + if (regexpmatch (options, "^$.*,$\?hotplug$,.*$\?$")) + return regexpsub (options, "^$.*,$\?hotplug$,.*$\?$", "\\1nofail\\2"); + return options; + } + /** * Translates FS or Cryptotab (old devices to new ones). * Such as /dev/hda5 to /dev/sda5. @@ -652,6 +659,8 @@ translate[i, key_preserve_as] = default_val; backward_translation[new_val] = default_val; + translate[i, "mntops"] = update_mount_options (translate[i, "mntops"]:""); + i = i + 1; }; @@ -1398,10 +1407,16 @@ if (FstabUsesKernelDeviceNameForHarddisks(fstab)) { y2warning("fstab on %1 uses kernel device name for hard disks", root_device_current); - Popup::Warning(sformat(_("Some partitions in the system on %1 are mounted by kernel-device name. This is + string warning = sformat(_("Some partitions in the system on %1 are mounted by kernel-device name. This is not reliable for the update since kernel-device names are unfortunately not persistent. It is strongly recommended to start the old system and change the -mount-by method to any other method for all partitions."), root_device_current)); +mount-by method to any other method for all partitions."), root_device_current); + + if (Mode::autoupgrade()) { + Popup::TimedWarning(warning, 10); + } else { + Popup::Warning(warning); + } } if (size (fstab) == 0) Modified: branches/SuSE-Code-11-SP2-Branch/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/updat… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/update/yast2-update.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/update/yast2-update.spec.in Wed Jan 19 14:14:55 2011 @@ -73,6 +73,7 @@ @clientdir@/packages_proposal.ycp @clientdir@/backup_proposal.ycp @clientdir@/inst_update_partition.ycp +@clientdir@/inst_update_partition_auto.ycp @clientdir@/rootpart_check_keyboard.ycp @yncludedir@/update -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63221 - /trunk/update/src/clients/inst_update_partition_auto.ycp
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 14:14:01 2011 New Revision: 63221 URL: http://svn.opensuse.org/viewcvs/yast?rev=63221&view=rev Log: missing file Added: trunk/update/src/clients/inst_update_partition_auto.ycp Added: trunk/update/src/clients/inst_update_partition_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_update_p… ============================================================================== --- trunk/update/src/clients/inst_update_partition_auto.ycp (added) +++ trunk/update/src/clients/inst_update_partition_auto.ycp Wed Jan 19 14:14:01 2011 @@ -0,0 +1,68 @@ +/** + * Module: inst_update_partition.ycp + * + * Authors: Stefan Schubert <schubi(a)suse.de> + * Arvin Schnell <arvin(a)suse.de> + * + * Purpose: Select root partition for update or booting. + * RootPart::rootPartitions must be filled before + * calling this module. + * + * $Id:$ + */ +{ +textdomain "update"; + +import "ProductControl"; +import "RootPart"; + +include "update/rootpart.ycp"; + +if (RootPart::Mounted ()) { + Update::Detach (); + RootPart::UnmountPartitions (false); +} + +RootPart::Detect (); +// if there is only one suitable partition which can be mounted, use it without asking +string target_system = ""; + + +map<string,map> partitions = filter (string name, map p, RootPart::rootPartitions, { + if (p[`valid]:false) + target_system = name; + return p[`valid]:false; +}); + +if (size (partitions) == 1) +{ + y2milestone ("Auto-mounting system located at %1", target_system); + RootPart::selectedRootPartition = target_system; + RootPart::targetOk = RootPart::mount_target (); + + // Not mounted correctly + if (! RootPart::targetOk) { + // error report + Report::Error (_("Failed to mount target system")); + UmountMountedPartition(); + // Correctly mounted but incomplete installation found + } else if (RootPart::IncompleteInstallationDetected (Installation::destdir)) { + Report::Error (_("A possibly incomplete installation has been detected.")); + UmountMountedPartition(); + } + else if (!(Pkg::TargetInitialize (Installation::destdir) && Pkg::TargetLoad())) + { + Report::Error ("Initializing the target system failed"); + UmountMountedPartition(); + Pkg::TargetFinish(); + } + else + { + return `next; + } +} +symbol ret = RootPartitionDialog (`update_dialog); + +return ret; + +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63220 - in /trunk/update: package/yast2-update.changes src/clients/Makefile.am src/include/rootpart.ycp src/modules/RootPart.ycp yast2-update.spec.in
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 14:13:47 2011 New Revision: 63220 URL: http://svn.opensuse.org/viewcvs/yast?rev=63220&view=rev Log: adaptations for unattended migration (fate#310481) Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/Makefile.am trunk/update/src/include/rootpart.ycp trunk/update/src/modules/RootPart.ycp trunk/update/yast2-update.spec.in Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Jan 19 14:13:47 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 19 14:11:44 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) +- 2.20.0. + +------------------------------------------------------------------- Thu Oct 28 14:34:16 CEST 2010 - ug(a)suse.de - replaced a Popup:: by a Report:: for autoinstallation Modified: trunk/update/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/Makefile.am?r… ============================================================================== --- trunk/update/src/clients/Makefile.am (original) +++ trunk/update/src/clients/Makefile.am Wed Jan 19 14:13:47 2011 @@ -13,6 +13,7 @@ backup_proposal.ycp \ update.ycp \ inst_update_partition.ycp \ + inst_update_partition_auto.ycp \ run_update.ycp EXTRA_DIST = $(client_DATA) Modified: trunk/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/include/rootpart.ycp?… ============================================================================== --- trunk/update/src/include/rootpart.ycp (original) +++ trunk/update/src/include/rootpart.ycp Wed Jan 19 14:13:47 2011 @@ -21,6 +21,7 @@ import "Update"; import "Installation"; import "FileSystems"; +import "Mode"; // Returns boolean whether partition can be // a Linux 'root' file system @@ -223,6 +224,8 @@ if (flavor == `update_dialog) { Wizard::SetContents (title, contents, help_text, true, true); + if (Mode::autoupgrade()) + Wizard::EnableAbortButton(); } else if (flavor == `update_dialog_proposal) { @@ -286,6 +289,8 @@ else ret = UI::UserInput (); + if (ret == `cancel) + ret = `abort; if (ret == `abort && Popup::ConfirmAbort (`painless)) break; @@ -372,6 +377,8 @@ if (flavor != `update_dialog) UI::CloseDialog (); + else if (Mode::autoupgrade()) + Wizard::DisableAbortButton(); // New partition has been mounted if (flavor == `update_dialog && ret == `next) { Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Wed Jan 19 14:13:47 2011 @@ -585,6 +585,12 @@ // such as /dev/sdc4 -> /dev/hdb4 map <string, string> backward_translation = $[]; + string update_mount_options (string options) { + if (regexpmatch (options, "^$.*,$\?hotplug$,.*$\?$")) + return regexpsub (options, "^$.*,$\?hotplug$,.*$\?$", "\\1nofail\\2"); + return options; + } + /** * Translates FS or Cryptotab (old devices to new ones). * Such as /dev/hda5 to /dev/sda5. @@ -633,6 +639,8 @@ translate[i, key_preserve_as] = default_val; backward_translation[new_val] = default_val; + translate[i, "mntops"] = update_mount_options (translate[i, "mntops"]:""); + i = i + 1; }; @@ -1383,10 +1391,15 @@ if (FstabUsesKernelDeviceNameForHarddisks(fstab)) { y2warning("fstab on %1 uses kernel device name for hard disks", root_device_current); - Report::Warning(sformat(_("Some partitions in the system on %1 are mounted by kernel-device name. This is + string warning = sformat(_("Some partitions in the system on %1 are mounted by kernel-device name. This is not reliable for the update since kernel-device names are unfortunately not persistent. It is strongly recommended to start the old system and change the -mount-by method to any other method for all partitions."), root_device_current)); +mount-by method to any other method for all partitions."), root_device_current); + if (Mode::autoupgrade()) { + Popup::TimedWarning(warning, 10); + } else { + Popup::Warning(warning); + } } if (size (fstab) == 0) Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Wed Jan 19 14:13:47 2011 @@ -79,6 +79,7 @@ @clientdir@/packages_proposal.ycp @clientdir@/backup_proposal.ycp @clientdir@/inst_update_partition.ycp +@clientdir@/inst_update_partition_auto.ycp @clientdir@/rootpart_check_keyboard.ycp @yncludedir@/update -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63219 - /branches/SuSE-Code-11-SP2-Branch/update/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 14:08:14 2011 New Revision: 63219 URL: http://svn.opensuse.org/viewcvs/yast?rev=63219&view=rev Log: branched for SP2 Added: branches/SuSE-Code-11-SP2-Branch/update/ (props changed) - copied from r63218, branches/SuSE-Code-11-SP1-Branch/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63218 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClient.ycp src/iscsi-client_auto.ycp
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 14:04:47 2011 New Revision: 63218 URL: http://svn.opensuse.org/viewcvs/yast?rev=63218&view=rev Log: adaptations for unattended migration (fate#310481) Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClient.ycp trunk/iscsi-client/src/iscsi-client_auto.ycp Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=63218&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Wed Jan 19 14:04:47 2011 @@ -1 +1 @@ -2.19.7 +2.20.0 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Jan 19 14:04:47 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 19 14:03:26 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) +- 2.20.0 + +------------------------------------------------------------------- Fri Jul 30 11:19:48 CEST 2010 - mzugec(a)suse.cz - login into multipath (bnc#599818) Modified: trunk/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClient.ycp… ============================================================================== --- trunk/iscsi-client/src/IscsiClient.ycp (original) +++ trunk/iscsi-client/src/IscsiClient.ycp Wed Jan 19 14:04:47 2011 @@ -230,12 +230,12 @@ /* Progress stage 2/2 */ _("Set up service status") ]; - if (!Mode::autoinst()) descr=remove(descr, 0); + if (!(Mode::autoinst() || Mode::autoupgrade())) descr=remove(descr, 0); // TODO FIXME Names of real stages // We do not set help text here, because it was set outside Progress::New(caption, " ", size(descr), descr, [], ""); - if (Mode::autoinst()){ + if (Mode::autoinst() || Mode::autoupgrade()){ if(Abort()) return false; Progress::NextStage(); IscsiClientLib::autoyastPrepare(); Modified: trunk/iscsi-client/src/iscsi-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/iscsi-client_au… ============================================================================== --- trunk/iscsi-client/src/iscsi-client_auto.ycp (original) +++ trunk/iscsi-client/src/iscsi-client_auto.ycp Wed Jan 19 14:04:47 2011 @@ -88,6 +88,7 @@ boolean progress_orig = Progress::set (false); IscsiClient::write_only = true; ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); + IscsiClientLib::autoyastPrepare(); SCR::Execute(.background.run_output_err, "iscsid"); ret = IscsiClient::Write(); Progress::set (progress_orig); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63217 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClient.ycp src/iscsi-client_auto.ycp
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 14:04:31 2011 New Revision: 63217 URL: http://svn.opensuse.org/viewcvs/yast?rev=63217&view=rev Log: - adaptations for unattended migration (fate#310481) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClient.ycp branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/iscsi-client_auto.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Wed Jan 19 14:04:31 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 19 14:03:01 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) + +------------------------------------------------------------------- Fri Jul 30 11:39:40 CEST 2010 - mzugec(a)suse.de - login into multipath (bnc#599818) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClient.ycp Wed Jan 19 14:04:31 2011 @@ -230,12 +230,12 @@ /* Progress stage 2/2 */ _("Set up service status") ]; - if (!Mode::autoinst()) descr=remove(descr, 0); + if (!(Mode::autoinst() || Mode::autoupgrade())) descr=remove(descr, 0); // TODO FIXME Names of real stages // We do not set help text here, because it was set outside Progress::New(caption, " ", size(descr), descr, [], ""); - if (Mode::autoinst()){ + if (Mode::autoinst() || Mode::autoupgrade()){ if(Abort()) return false; Progress::NextStage(); IscsiClientLib::autoyastPrepare(); Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/iscsi-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/iscsi-client_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/iscsi-client_auto.ycp Wed Jan 19 14:04:31 2011 @@ -88,6 +88,7 @@ boolean progress_orig = Progress::set (false); IscsiClient::write_only = true; ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); + IscsiClientLib::autoyastPrepare(); SCR::Execute(.background.run_output_err, "iscsid"); ret = IscsiClient::Write(); Progress::set (progress_orig); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63216 - /branches/SuSE-Code-11-SP2-Branch/iscsi-client/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 14:01:31 2011 New Revision: 63216 URL: http://svn.opensuse.org/viewcvs/yast?rev=63216&view=rev Log: branched for SP2 Added: branches/SuSE-Code-11-SP2-Branch/iscsi-client/ (props changed) - copied from r63215, branches/SuSE-Code-11-SP1-Branch/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63215 - /tags/stable-2_20_11/yast2/
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 13:54:53 2011 New Revision: 63215 URL: http://svn.opensuse.org/viewcvs/yast?rev=63215&view=rev Log: Created tag stable-2_20_11 for yast2 Added: tags/stable-2_20_11/yast2/ (props changed) - copied from r63214, trunk/yast2/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63214 - in /trunk/yast2: VERSION package/yast2.changes
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 13:54:41 2011 New Revision: 63214 URL: http://svn.opensuse.org/viewcvs/yast?rev=63214&view=rev Log: bump Modified: trunk/yast2/VERSION trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=63214&r1=63213… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Wed Jan 19 13:54:41 2011 @@ -1 +1 @@ -2.20.10 +2.20.11 Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Jan 19 13:54:41 2011 @@ -2,6 +2,7 @@ Wed Jan 19 13:49:18 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration (fate#310481) +- 2.20.11 ------------------------------------------------------------------- Tue Jan 18 16:37:53 CET 2011 - aschnell(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63213 - in /trunk/yast2: library/modules/Mode.ycp library/system/src/ModuleLoading.ycp library/wizard/src/Confirm.ycp package/yast2.changes
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 13:50:51 2011 New Revision: 63213 URL: http://svn.opensuse.org/viewcvs/yast?rev=63213&view=rev Log: - adaptations for unattended migration (fate#310481) Modified: trunk/yast2/library/modules/Mode.ycp trunk/yast2/library/system/src/ModuleLoading.ycp trunk/yast2/library/wizard/src/Confirm.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/modules/Mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Mode.ycp?r… ============================================================================== --- trunk/yast2/library/modules/Mode.ycp (original) +++ trunk/yast2/library/modules/Mode.ycp Wed Jan 19 13:50:51 2011 @@ -88,6 +88,12 @@ { _mode ="repair"; } + // FIXME according to what Linuxrc really writes + boolean autoupgrade = SCR::Read (.etc.install_inf.AutoUpgrade) != nil; + if (autoupgrade) + { + _mode = "autoupgrade"; + } } } @@ -113,7 +119,7 @@ if (! contains ( [ "installation", "update", "normal", "repair", "autoinstallation", "autoinst_config", - "live_installation" + "live_installation", "autoupgrade" ], new_mode)) { @@ -196,7 +202,7 @@ * we're doing an update */ global boolean update () { - return mode () == "update"; + return mode () == "update" || mode () == "autoupgrade"; } global boolean Depeche () { @@ -225,6 +231,13 @@ } /** + * doing auto-upgrade + */ +global boolean autoupgrade () { + return mode () == "autoupgrade"; +} + +/** * configuration for auto-installation, only in running system */ global boolean config () { Modified: trunk/yast2/library/system/src/ModuleLoading.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/ModuleL… ============================================================================== --- trunk/yast2/library/system/src/ModuleLoading.ycp (original) +++ trunk/yast2/library/system/src/ModuleLoading.ycp Wed Jan 19 13:50:51 2011 @@ -132,7 +132,7 @@ return `dont; } - if (ask_before_loading && !Mode::autoinst()) + if (ask_before_loading && (!Mode::autoinst()) && (!Mode::autoupgrade())) { UI::OpenDialog(`opt(`decorated, `centered), Modified: trunk/yast2/library/wizard/src/Confirm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Confirm… ============================================================================== --- trunk/yast2/library/wizard/src/Confirm.ycp (original) +++ trunk/yast2/library/wizard/src/Confirm.ycp Wed Jan 19 13:50:51 2011 @@ -40,7 +40,7 @@ if(Linuxrc::manual () != true) return true; // L3: no interaction in AY, just re-probe (bnc#568653) - if(Mode::autoinst () == true) return true; + if(Mode::autoinst () == true || Mode::autoupgrade() == true) return true; if(Arch::s390()) return true; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Wed Jan 19 13:50:51 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 19 13:49:18 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) + +------------------------------------------------------------------- Tue Jan 18 16:37:53 CET 2011 - aschnell(a)suse.de - call snapper from yast2 script -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63212 - in /branches/SuSE-Code-11-SP2-Branch/yast2: library/modules/Mode.ycp library/system/src/ModuleLoading.ycp library/wizard/src/Confirm.ycp package/yast2.changes
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 13:50:20 2011 New Revision: 63212 URL: http://svn.opensuse.org/viewcvs/yast?rev=63212&view=rev Log: - adaptations for unattended migration (fate#310481) Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Mode.ycp branches/SuSE-Code-11-SP2-Branch/yast2/library/system/src/ModuleLoading.ycp branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Confirm.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Mode.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Mode.ycp Wed Jan 19 13:50:20 2011 @@ -88,6 +88,12 @@ { _mode ="repair"; } + // FIXME according to what Linuxrc really writes + boolean autoupgrade = SCR::Read (.etc.install_inf.AutoUpgrade) != nil; + if (autoupgrade) + { + _mode = "autoupgrade"; + } } } @@ -113,7 +119,7 @@ if (! contains ( [ "installation", "update", "normal", "repair", "autoinstallation", "autoinst_config", - "live_installation" + "live_installation", "autoupgrade" ], new_mode)) { @@ -196,7 +202,7 @@ * we're doing an update */ global boolean update () { - return mode () == "update"; + return mode () == "update" || mode () == "autoupgrade"; } global boolean Depeche () { @@ -225,6 +231,13 @@ } /** + * doing auto-upgrade + */ +global boolean autoupgrade () { + return mode () == "autoupgrade"; +} + +/** * configuration for auto-installation, only in running system */ global boolean config () { Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/system/src/ModuleLoading.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/system/src/ModuleLoading.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/system/src/ModuleLoading.ycp Wed Jan 19 13:50:20 2011 @@ -132,7 +132,7 @@ return `dont; } - if (ask_before_loading && !Mode::autoinst()) + if (ask_before_loading && (!Mode::autoinst()) && (!Mode::autoupgrade())) { UI::OpenDialog(`opt(`decorated, `centered), Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Confirm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Confirm.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Confirm.ycp Wed Jan 19 13:50:20 2011 @@ -40,7 +40,7 @@ if(Linuxrc::manual () != true) return true; // L3: no interaction in AY, just re-probe (bnc#568653) - if(Mode::autoinst () == true) return true; + if(Mode::autoinst () == true || Mode::autoupgrade() == true) return true; if(Arch::s390()) return true; Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Wed Jan 19 13:50:20 2011 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Jan 19 13:49:48 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration (fate#310481) + +------------------------------------------------------------------- +Wed Jan 19 13:45:05 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration + +------------------------------------------------------------------- Thu Oct 7 11:08:42 UTC 2010 - lslezak(a)suse.cz - removed textdomain change (not needed, breaks translations) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63211 - in /trunk/installation: VERSION package/yast2-installation.changes src/modules/ImageInstallation.ycp
by jsrain＠svn2.opensuse.org 19 Jan '11

19 Jan '11

Author: jsrain Date: Wed Jan 19 12:54:13 2011 New Revision: 63211 URL: http://svn.opensuse.org/viewcvs/yast?rev=63211&view=rev Log: fixed progress during live installation (bnc#665413) Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=63211&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Jan 19 12:54:13 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Jan 19 12:54:13 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 19 12:53:00 CET 2011 - jsrain(a)suse.cz + +- fixed progress during live installation (bnc#665413) +- 2.20.2 + +------------------------------------------------------------------- Fri Jan 7 13:43:01 CET 2011 - jsrain(a)suse.cz - update XFCE desktop definition Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Wed Jan 19 12:54:13 2011 @@ -898,7 +898,7 @@ y2milestone ("Output: %1", out); string total_str = out["stdout"]:""; total_str = splitstring(total_str, "\n")[1]:""; - integer total_mb = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0"); + integer total_mb = tointeger (filter (string s, splitstring (total_str, " "), {return s != "";})[2]:"0") / 1024; /* Using df-based progress estimation, is rather faster may be less precise @@ -911,7 +911,7 @@ integer total_mb = tointeger (total_str); */ if (total_mb == 0) - total_mb = 1024*1024*1024; // should be big enough + total_mb = 1024; // should be big enough string tmp_pipe1 = (string)SCR::Read (.target.tmpdir) + "/system_clone_fifo_1"; string tmp_pipe2 = (string)SCR::Read (.target.tmpdir) + "/system_clone_fifo_2"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63210 - in /trunk/backup/testsuite/tests: RestoreBackupProfile.out RestoreBackupSettings.out
by locilka＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: locilka Date: Tue Jan 18 17:13:06 2011 New Revision: 63210 URL: http://svn.opensuse.org/viewcvs/yast?rev=63210&view=rev Log: I did it my way Modified: trunk/backup/testsuite/tests/RestoreBackupProfile.out trunk/backup/testsuite/tests/RestoreBackupSettings.out Modified: trunk/backup/testsuite/tests/RestoreBackupProfile.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/testsuite/tests/RestoreBa… ============================================================================== --- trunk/backup/testsuite/tests/RestoreBackupProfile.out (original) +++ trunk/backup/testsuite/tests/RestoreBackupProfile.out Tue Jan 18 17:13:06 2011 @@ -3,4 +3,4 @@ Return true Return true Return nil -Dump $["test profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_helper_scripts:[], `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs", "none"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144]] +Dump $["final":$[`all_rpms_content:false, `archive_name:"/tmp/ahoj.tar", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_helper_scripts:[], `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$["cron_changed":false, "cronfile":""], `default_dir:["/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache"], `description:"", `detected_ext2:nil, `detected_fs:["devpts", "nfs", "proc", "reiserfs", "rootfs", "shm"], `dir_list:["/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/usr", "/home", "/local", "/etc", "/var", "/opt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["bdev", "devpts", "futexfs", "iso9660", "nfs", "pipefs", "proc", "ramfs", "rootfs", "shm", "sockfs", "tmpfs", "usbfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `us er_volume_size:"", `user_volume_unit:`B, `volume_size:`fd144]] Modified: trunk/backup/testsuite/tests/RestoreBackupSettings.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/testsuite/tests/RestoreBa… ============================================================================== --- trunk/backup/testsuite/tests/RestoreBackupSettings.out (original) +++ trunk/backup/testsuite/tests/RestoreBackupSettings.out Tue Jan 18 17:13:06 2011 @@ -1,2 +1,2 @@ Dump $[] -Dump $["test profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_helper_scripts:[], `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144]] +Dump $["test profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_helper_scripts:[], `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs", "none"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144]] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63209 - /branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/WriteBackupProfiles.out
by locilka＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: locilka Date: Tue Jan 18 17:07:19 2011 New Revision: 63209 URL: http://svn.opensuse.org/viewcvs/yast?rev=63209&view=rev Log: One more test Modified: branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/WriteBackupProfiles.out Modified: branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/WriteBackupProfiles.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/WriteBackupProfiles.out (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/WriteBackupProfiles.out Tue Jan 18 17:07:19 2011 @@ -1,2 +1,2 @@ Dump $[] -Dump $["default profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144], "empty profile":$[`all_rpms_content:false, `archive_name:"Does not work", `archive_type:nil, `autoprofile:true, `backup_all_ext2 :nil, `backup_none_ext2:nil, `backup_pt:nil, `backup_selected_ext2:nil, `cron_settings:$[], `default_dir:nil, `description:"Does not work - profile", `detected_ext2:nil, `detected_fs:nil, `dir_list:nil, `display:nil, `do_md5_test:nil, `ext2_backup:nil, `fs_exclude:nil, `include_dirs:["/"], `mail_summary:true, `multi_volume:nil, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:nil, `system:nil, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `user_volume_size:nil, `user_volume_unit:nil, `volume_size:nil]] +Dump $["default profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs", "none"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144], "empty profile":$[`all_rpms_content:false, `archive_name:"Does not work", `arc hive_type:nil, `autoprofile:true, `backup_all_ext2:nil, `backup_none_ext2:nil, `backup_pt:nil, `backup_selected_ext2:nil, `cron_settings:$[], `default_dir:nil, `description:"Does not work - profile", `detected_ext2:nil, `detected_fs:nil, `dir_list:nil, `display:nil, `do_md5_test:nil, `ext2_backup:nil, `fs_exclude:nil, `include_dirs:["/"], `mail_summary:true, `multi_volume:nil, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:nil, `system:nil, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `user_volume_size:nil, `user_volume_unit:nil, `volume_size:nil]] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63208 - /trunk/printer/src/helps.ycp
by jsmeix＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: jsmeix Date: Tue Jan 18 17:04:39 2011 New Revision: 63208 URL: http://svn.opensuse.org/viewcvs/yast?rev=63208&view=rev Log: Included one more reference to the trademark ownership. Modified: trunk/printer/src/helps.ycp Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=63208&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Tue Jan 18 17:04:39 2011 @@ -766,7 +766,9 @@ or when you must access a network printer directly, or when you use another kind of print server e.g. when printing via a Windows (R) or Samba server -or when printing via a traditional Unix server. +or when printing via a traditional Unix server. +'Windows' is a registered trademark +of Microsoft Corporation in the United States and/or other countries. "), "sharing_dialog" : -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63207 - /trunk/printer/src/helps.ycp
by jsmeix＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: jsmeix Date: Tue Jan 18 16:58:43 2011 New Revision: 63207 URL: http://svn.opensuse.org/viewcvs/yast?rev=63207&view=rev Log: Included a reference to the trademark ownership as specified on http://www.microsoft.com/about/legal/en/us/IntellectualProperty/Trademarks/… Modified: trunk/printer/src/helps.ycp Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=63207&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Tue Jan 18 16:58:43 2011 @@ -628,6 +628,8 @@ smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B For more information have a look at <tt>man smbspool</tt> and http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share +'Windows' and 'Active Directory' are registered trademarks +of Microsoft Corporation in the United States and/or other countries. Traditional UNIX Server (LPR) A Line Printer Daemon (LPD) runs on a traditional UNIX server and provides one or more LPD queues. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63206 - /branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/RestoreBackupSettings.out
by locilka＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: locilka Date: Tue Jan 18 16:58:09 2011 New Revision: 63206 URL: http://svn.opensuse.org/viewcvs/yast?rev=63206&view=rev Log: Maybe this time? Modified: branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/RestoreBackupSettings.out Modified: branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/RestoreBackupSettings.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/RestoreBackupSettings.out (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/RestoreBackupSettings.out Tue Jan 18 16:58:09 2011 @@ -1,2 +1,2 @@ Dump $[] -Dump $["testâprofile":$[`all_rpms_content:false,â`archive_name:"",â`archive_type:`tgz,â`autoprofile:true,â`backup_all_ext2:false,â`backup_none_ext2:true,â`backup_pt:true,â`backup_selected_ext2:false,â`cron_settings:$[],â`default_dir:["/media",â"/tmp",â"/var/lock",â"/var/run",â"/var/tmp",â"/var/cache",â"/sys",â"/windows",â"/mnt",â"/var/lib/ntp/proc"],â`description:"",â`detected_ext2:nil,â`detected_fs:nil,â`dir_list:["/media",â"/tmp",â"/var/lock",â"/var/run",â"/var/tmp",â"/var/cache",â"/sys",â"/windows",â"/mnt",â"/var/lib/ntp/proc"],â`display:false,â`do_md5_test:true,â`ext2_backup:[],â`fs_exclude:["iso9660",â"ntfs",â"none"],â`include_dirs:["/"],â`mail_summary:true,â`multi_volume:false,â`nfsexport:"",â`nfsserver:"",â`perms:true,â`regexp_list:[],â`searc h:true,â`system:false,â`target_type:`file,â`tmp_dir:"/tmp",â`unselected_files:[],â`user_volume_size:"",â`user_volume_unit:nil,â`volume_size:`fd144]] +Dump $["test profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs", "none"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144]] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63205 - in /trunk/printer/src: connectionwizard.ycp helps.ycp
by jsmeix＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: jsmeix Date: Tue Jan 18 16:51:59 2011 New Revision: 63205 URL: http://svn.opensuse.org/viewcvs/yast?rev=63205&view=rev Log: Using right poper names "Active Directory (R)" and "Windows (R)", see bnc#661845#c19 Modified: trunk/printer/src/connectionwizard.ycp trunk/printer/src/helps.ycp Modified: trunk/printer/src/connectionwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/connectionwizard.ycp… ============================================================================== --- trunk/printer/src/connectionwizard.ycp (original) +++ trunk/printer/src/connectionwizard.ycp Tue Jan 18 16:51:59 2011 @@ -1324,7 +1324,7 @@ // readlink is in the coreutils RPM so that it is available in any case. Printerlib::ExecuteBashCommand( "readlink " + Printerlib::result["stdout"]:"" + " | tr -d '[:space:]'" ); // Only if /usr/lib[64]/cups/backend/smb -> /usr/bin/get_printing_ticket - // there is support for Windows Active Directory: + // there is support for Active Directory (R): if( "/usr/bin/get_printing_ticket" == Printerlib::result["stdout"]:"" ) { active_directory_support = true; } @@ -1365,11 +1365,6 @@ // TRANSLATORS: Text entry for samba domain _("&Workgroup (Domain Name)"), [ URIpercentDecoding( domain ) ] - //), - //PushButton - //( `id(`scan_domain), - // _("Scan for Windows Share Domains") - //) ) ) ), @@ -1411,8 +1406,8 @@ ( `CheckBox ( `id(`active_directory_check_box), `opt(`notify), - // A CheckBox to support Windows Active Directory: - _("Support for &Windows Active Directory"), + // A CheckBox to support Active Directory (R): + _("Support for &Active Directory (R)"), active_directory_support ) ) @@ -1962,7 +1957,7 @@ _("Print Via Print Server Machine"), true, [ // TRANSLATORS: Tree widget item - `item( `id(`smb), _("Microsoft Windows/SAMBA (SMB/CIFS)") ), + `item( `id(`smb), _("Windows (R) or Samba (SMB/CIFS)") ), // TRANSLATORS: Tree widget item `item( `id(`lpr), _("Traditional UNIX Server (LPR/LPD)") ), // `item( `id(`iprint), _("iPrint (Novell OES)") ), @@ -2670,8 +2665,8 @@ boolean active_directory = (boolean)UI::QueryWidget( `active_directory_check_box, `Value ); if( active_directory ) { if( ! Popup::ContinueCancel( // Body of a Popup::ContinueCancel when testing a SMB connection is not possible - // because there is authentication via Windows Active Directory required: - _("This is only a generic test which may untruly report failures\nif authentication via Windows Active Directory is required.\nIn this case a particular user who is allowed to print via Active Directory\nshould log in and test by himself if he can print from Gnome or KDE.") + // because there is authentication via Active Directory (R) required: + _("This is only a generic test which may untruly report failures\nif authentication via Active Directory (R) is required.\nIn this case a user who is allowed to print via Active Directory (R)\nshould log in and test by himself if he can print from Gnome or KDE.") ) ) { return true; @@ -2869,7 +2864,7 @@ { // The active_directory_check_box is checked: if( ! Printerlib::TestAndInstallPackage( "samba-krb-printing", "installed" ) ) { // Install samba-krb-printing when it is not installed: - if( Popup::ContinueCancel( _("To support Windows Active Directory, the RPM package samba-krb-printing must be installed.") ) ) + if( Popup::ContinueCancel( _("To support Active Directory (R), the RPM package samba-krb-printing must be installed.") ) ) { Printerlib::TestAndInstallPackage( "samba-krb-printing", "install" ); } } @@ -2888,10 +2883,10 @@ { // The active_directory_check_box is not checked: Printerlib::ExecuteBashCommand( smb_backend_link_target_commandline ); if( "/usr/bin/get_printing_ticket" == Printerlib::result["stdout"]:"" ) - { // Currently there is support for Windows Active Directory. + { // Currently there is support for Active Directory (R). // Show a user notification before it gets disabled: - Popup::Warning( // Popup::Warning message before Windows Active Directory support gets disabled: - _("Windows Active Directory support will be disabled for all SMB print queues.") + Popup::Warning( // Popup::Warning message before Active Directory (R) support gets disabled: + _("Active Directory (R) support will be disabled for all SMB print queues.") ); } // Regardless if samba-krb-printing is installed or not, @@ -2901,7 +2896,7 @@ } // Detremine and set the actually right state of the active_directory_check_box: // Only if the /usr/lib[64]/cups/backend/smb link points to /usr/bin/get_printing_ticket - // there is support for Windows Active Directory for SMB print queues. + // there is support for Active Directory (R) for SMB print queues. Printerlib::ExecuteBashCommand( smb_backend_link_target_commandline ); if( "/usr/bin/get_printing_ticket" == Printerlib::result["stdout"]:"" ) { UI::ChangeWidget( `id(`active_directory_check_box), `Value, true ); Modified: trunk/printer/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/helps.ycp?rev=63205&… ============================================================================== --- trunk/printer/src/helps.ycp (original) +++ trunk/printer/src/helps.ycp Tue Jan 18 16:51:59 2011 @@ -583,7 +583,7 @@ Access happens via various different network protocols. Ask your network administrator what which print server machine provides in your particular network: -Microsoft Windows/SAMBA (SMB/CIFS) +Windows (R) or Samba (SMB/CIFS) To access a SMB printer share, the RPM package samba-client must be installed. The package provides the CUPS backend 'smb' which is a link to the <tt>/usr/bin/smbspool</tt> program which actually sends the data @@ -594,7 +594,7 @@ Have in mind that spaces and special characters in those values must be percent-encoded (see above). By default CUPS runs backends (here smbspool) as user 'lp'. -When printing in a Windows Active Directory (AD) environment +When printing in an Active Directory (R) environment (AD) the user 'lp' is not allowed to print in this environment so that the traditional way to print via smbspool as user 'lp' would not work. @@ -759,11 +759,12 @@ ") + // PrintingViaNetworkDialog help 4/4: _(" -If there is no CUPS server in your network or if you must additionally use -another kind of print server (e.g. print via a Windows/SMB server -or print via a traditional Unix LPR server) or if you must access -a network printer directly, you have to set up an appropriate print queue -on your host. +You have to set up an appropriate print queue on your host +if there is no CUPS server in your network, +or when you must access a network printer directly, +or when you use another kind of print server +e.g. when printing via a Windows (R) or Samba server +or when printing via a traditional Unix server. "), "sharing_dialog" : -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63204 - in /branches/SuSE-Code-11-SP1-Branch/backup: package/yast2-backup.changes testsuite/tests/RestoreBackupSettings.out
by locilka＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: locilka Date: Tue Jan 18 16:40:46 2011 New Revision: 63204 URL: http://svn.opensuse.org/viewcvs/yast?rev=63204&view=rev Log: Fixed testsuite Modified: branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/RestoreBackupSettings.out Modified: branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/package/yast2-backup.changes Tue Jan 18 16:40:46 2011 @@ -3,6 +3,7 @@ - Excluding '/var/lib/ntp/proc' directory and filesystem type 'none' by default (BNC #624826) +- Adapted testsuite - 2.17.9 ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/RestoreBackupSettings.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/RestoreBackupSettings.out (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/RestoreBackupSettings.out Tue Jan 18 16:40:46 2011 @@ -1,2 +1,2 @@ Dump $[] -Dump $["test profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144]] +Dump $["testâprofile":$[`all_rpms_content:false,â`archive_name:"",â`archive_type:`tgz,â`autoprofile:true,â`backup_all_ext2:false,â`backup_none_ext2:true,â`backup_pt:true,â`backup_selected_ext2:false,â`cron_settings:$[],â`default_dir:["/media",â"/tmp",â"/var/lock",â"/var/run",â"/var/tmp",â"/var/cache",â"/sys",â"/windows",â"/mnt",â"/var/lib/ntp/proc"],â`description:"",â`detected_ext2:nil,â`detected_fs:nil,â`dir_list:["/media",â"/tmp",â"/var/lock",â"/var/run",â"/var/tmp",â"/var/cache",â"/sys",â"/windows",â"/mnt",â"/var/lib/ntp/proc"],â`display:false,â`do_md5_test:true,â`ext2_backup:[],â`fs_exclude:["iso9660",â"ntfs",â"none"],â`include_dirs:["/"],â`mail_summary:true,â`multi_volume:false,â`nfsexport:"",â`nfsserver:"",â`perms:true,â`regexp_list:[],â`searc h:true,â`system:false,â`target_type:`file,â`tmp_dir:"/tmp",â`unselected_files:[],â`user_volume_size:"",â`user_volume_unit:nil,â`volume_size:`fd144]] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63203 - in /trunk/yast2: data/sysconfig.yast2 package/yast2.changes scripts/yast2
by aschnell＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: aschnell Date: Tue Jan 18 16:39:08 2011 New Revision: 63203 URL: http://svn.opensuse.org/viewcvs/yast?rev=63203&view=rev Log: - call snapper from yast2 script Modified: trunk/yast2/data/sysconfig.yast2 trunk/yast2/package/yast2.changes trunk/yast2/scripts/yast2 Modified: trunk/yast2/data/sysconfig.yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/data/sysconfig.yast2?rev=6… ============================================================================== --- trunk/yast2/data/sysconfig.yast2 (original) +++ trunk/yast2/data/sysconfig.yast2 Tue Jan 18 16:39:08 2011 @@ -62,3 +62,8 @@ # summary - display an installation summary dialog, there user can decide whether to finish or restart # The summary dialog is always displayed when an installation error has occured. PKGMGR_ACTION_AT_EXIT="close" + +## Type: list(yes,no) +## Default: "yes" +# Enable use of snapper for YaST. +USE_SNAPPER="yes" Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Jan 18 16:39:08 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 18 16:37:53 CET 2011 - aschnell(a)suse.de + +- call snapper from yast2 script + +------------------------------------------------------------------- Tue Jan 4 13:42:54 UTC 2011 - lslezak(a)suse.cz - check PackageKit status, suggest to quit the daemon if it is Modified: trunk/yast2/scripts/yast2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/yast2?rev=63203&r1… ============================================================================== --- trunk/yast2/scripts/yast2 (original) +++ trunk/yast2/scripts/yast2 Tue Jan 18 16:39:08 2011 @@ -17,7 +17,7 @@ # allow for a different prefix # strip the basename off $0, which can be: (bnc#382216, bnc#458385) -# /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin//yast2 (PATH=/sbin/:...) +# /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin/yast2 (PATH=/sbin/:...) shopt -s extglob mydir=${0%%*(/)[YyZz]a[Ss][Tt]?(2)} if [[ -z "$mydir" || "$mydir" = /sbin ]]; then @@ -208,6 +208,28 @@ fi } + +SNAPPERBIN=/usr/bin/snapper + +snapshot_pre() +{ + if [ "$1" != "menu" ] ; then + if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then + SNAPSHOT_NUMBER=`$SNAPPERBIN --print-number create pre "yast2 $1"` + fi + fi +} + +snapshot_post() +{ + if [ "$1" != "menu" ] ; then + if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then + $SNAPPERBIN create post $SNAPSHOT_NUMBER + fi + fi +} + + TEMP=`/usr/bin/getopt -o hlg:s:Si --long help,list,kcontrol,geometry:,style:,strings,install,update,remove,fullscreen,noborder,qt,gtk,ncurses \ -n 'yast2' -- "$@"` @@ -388,6 +410,7 @@ # all other cases when YaST has to be restarted *) REDO_FILE=/var/lib/YaST2/restart_yast ;; esac + snapshot_pre $module # break out on errors, #343258 while [ $exit_code = 0 ]; do $ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2UI_ARGS @@ -396,6 +419,7 @@ break fi done + snapshot_post $module fi if [ "$UID" = 0 ]; then -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63202 - /branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/ExcludeNodevFS.out
by locilka＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: locilka Date: Tue Jan 18 16:24:20 2011 New Revision: 63202 URL: http://svn.opensuse.org/viewcvs/yast?rev=63202&view=rev Log: Partly fixed testsuite Modified: branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/ExcludeNodevFS.out Modified: branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/ExcludeNodevFS.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/backu… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/ExcludeNodevFS.out (original) +++ branches/SuSE-Code-11-SP1-Branch/backup/testsuite/tests/ExcludeNodevFS.out Tue Jan 18 16:24:20 2011 @@ -1,9 +1,9 @@ Read .proc.filesystems nil Return nil -Dump ["iso9660", "ntfs"] +Dump ["iso9660", "ntfs", "none"] Read .proc.filesystems $["afs":"nodev", "iso9660":"\t", "minix":"\t", "nfs":"nodev", "pipefs":"nodev", "proc":"nodev", "ramfs":"nodev", "reiserfs":"\t", "rootfs":"nodev"] Return nil -Dump ["afs", "iso9660", "nfs", "ntfs", "pipefs", "proc", "ramfs", "rootfs"] +Dump ["afs", "iso9660", "nfs", "none", "ntfs", "pipefs", "proc", "ramfs", "rootfs"] Read .proc.filesystems nil Return nil Dump [] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63201 - in /trunk/backup: package/yast2-backup.changes testsuite/tests/ExcludeNodevFS.out testsuite/tests/RestoreBackupProfile.out testsuite/tests/WriteBackupProfiles.out
by locilka＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: locilka Date: Tue Jan 18 16:12:21 2011 New Revision: 63201 URL: http://svn.opensuse.org/viewcvs/yast?rev=63201&view=rev Log: Fixed testsuite Modified: trunk/backup/package/yast2-backup.changes trunk/backup/testsuite/tests/ExcludeNodevFS.out trunk/backup/testsuite/tests/RestoreBackupProfile.out trunk/backup/testsuite/tests/WriteBackupProfiles.out Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Tue Jan 18 16:12:21 2011 @@ -2,6 +2,7 @@ Mon Jan 10 16:35:19 CET 2011 - locilka(a)suse.cz - Fixed adjusting temporary directory for backup (BNC #658150). +- Adapted testsuite. - 2.20.2 ------------------------------------------------------------------ Modified: trunk/backup/testsuite/tests/ExcludeNodevFS.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/testsuite/tests/ExcludeNo… ============================================================================== --- trunk/backup/testsuite/tests/ExcludeNodevFS.out (original) +++ trunk/backup/testsuite/tests/ExcludeNodevFS.out Tue Jan 18 16:12:21 2011 @@ -1,9 +1,9 @@ Read .proc.filesystems nil Return nil -Dump ["iso9660", "ntfs"] +Dump ["iso9660", "ntfs", "none"] Read .proc.filesystems $["afs":"nodev", "iso9660":"\t", "minix":"\t", "nfs":"nodev", "pipefs":"nodev", "proc":"nodev", "ramfs":"nodev", "reiserfs":"\t", "rootfs":"nodev"] Return nil -Dump ["afs", "iso9660", "nfs", "ntfs", "pipefs", "proc", "ramfs", "rootfs"] +Dump ["afs", "iso9660", "nfs", "none", "ntfs", "pipefs", "proc", "ramfs", "rootfs"] Read .proc.filesystems nil Return nil Dump [] Modified: trunk/backup/testsuite/tests/RestoreBackupProfile.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/testsuite/tests/RestoreBa… ============================================================================== --- trunk/backup/testsuite/tests/RestoreBackupProfile.out (original) +++ trunk/backup/testsuite/tests/RestoreBackupProfile.out Tue Jan 18 16:12:21 2011 @@ -3,4 +3,4 @@ Return true Return true Return nil -Dump $["final":$[`all_rpms_content:false, `archive_name:"/tmp/ahoj.tar", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_helper_scripts:[], `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$["cron_changed":false, "cronfile":""], `default_dir:["/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache"], `description:"", `detected_ext2:nil, `detected_fs:["devpts", "nfs", "proc", "reiserfs", "rootfs", "shm"], `dir_list:["/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/usr", "/home", "/local", "/etc", "/var", "/opt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["bdev", "devpts", "futexfs", "iso9660", "nfs", "pipefs", "proc", "ramfs", "rootfs", "shm", "sockfs", "tmpfs", "usbfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `us er_volume_size:"", `user_volume_unit:`B, `volume_size:`fd144]] +Dump $["test profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_helper_scripts:[], `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs", "none"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144]] Modified: trunk/backup/testsuite/tests/WriteBackupProfiles.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/testsuite/tests/WriteBack… ============================================================================== --- trunk/backup/testsuite/tests/WriteBackupProfiles.out (original) +++ trunk/backup/testsuite/tests/WriteBackupProfiles.out Tue Jan 18 16:12:21 2011 @@ -1,2 +1,2 @@ Dump $[] -Dump $["default profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_helper_scripts:[], `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144], "empty profile":$[`all_rpms_content:false, `archive_name:"Does not work", `archive_type:nil, `autopro file:true, `backup_all_ext2:nil, `backup_helper_scripts:[], `backup_none_ext2:nil, `backup_pt:nil, `backup_selected_ext2:nil, `cron_settings:$[], `default_dir:nil, `description:"Does not work - profile", `detected_ext2:nil, `detected_fs:nil, `dir_list:nil, `display:nil, `do_md5_test:nil, `ext2_backup:nil, `fs_exclude:nil, `include_dirs:["/"], `mail_summary:true, `multi_volume:nil, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:nil, `system:nil, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `user_volume_size:nil, `user_volume_unit:nil, `volume_size:nil]] +Dump $["default profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_helper_scripts:[], `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `cron_settings:$[], `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt", "/var/lib/ntp/proc"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs", "none"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144], "empty profile":$[`all_rpms_content:false, `archive _name:"Does not work", `archive_type:nil, `autoprofile:true, `backup_all_ext2:nil, `backup_helper_scripts:[], `backup_none_ext2:nil, `backup_pt:nil, `backup_selected_ext2:nil, `cron_settings:$[], `default_dir:nil, `description:"Does not work - profile", `detected_ext2:nil, `detected_fs:nil, `dir_list:nil, `display:nil, `do_md5_test:nil, `ext2_backup:nil, `fs_exclude:nil, `include_dirs:["/"], `mail_summary:true, `multi_volume:nil, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:nil, `system:nil, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `user_volume_size:nil, `user_volume_unit:nil, `volume_size:nil]] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63200 - /trunk/storage/storage/src/modules/StorageUpdate.ycp
by fehr＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: fehr Date: Tue Jan 18 15:25:43 2011 New Revision: 63200 URL: http://svn.opensuse.org/viewcvs/yast?rev=63200&view=rev Log: add version check Modified: trunk/storage/storage/src/modules/StorageUpdate.ycp Modified: trunk/storage/storage/src/modules/StorageUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageUpdate.ycp (original) +++ trunk/storage/storage/src/modules/StorageUpdate.ycp Tue Jan 18 15:25:43 2011 @@ -86,10 +86,10 @@ } -global define void UpdateFstabOptions() +global define void UpdateFstabHotplugOption() { - y2milestone( "UpdateFstabOptions" ); - string tabpath = PathToDestdir( "/etc/fstab" ); + y2milestone( "UpdateFstabHotplugOption" ); + string tabpath = Storage::PathToDestdir( "/etc/fstab" ); map fstab = Partitions::GetFstab( tabpath ); integer line = 0; string n = ""; @@ -386,7 +386,10 @@ UpdateFstabPersistentNames(); } - UpdateFstabOptions(); + if( oldv["major"]:0<=10 ) + { + UpdateFstabHotplugOption(); + } // remove EVMS // FIXME add appropriate condition if needed (does not seem so) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63199 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/StorageUpdate.ycp
by fehr＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: fehr Date: Tue Jan 18 15:02:09 2011 New Revision: 63199 URL: http://svn.opensuse.org/viewcvs/yast?rev=63199&view=rev Log: adaptations for unattended migration Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/StorageUpdate.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Jan 18 15:02:09 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 18 14:49:17 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration + +------------------------------------------------------------------- Mon Jan 17 17:28:51 CET 2011 - fehr(a)suse.de - allow floating point value in reserved block percentage and Modified: trunk/storage/storage/src/modules/StorageUpdate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageUpdate.ycp (original) +++ trunk/storage/storage/src/modules/StorageUpdate.ycp Tue Jan 18 15:02:09 2011 @@ -86,6 +86,27 @@ } +global define void UpdateFstabOptions() + { + y2milestone( "UpdateFstabOptions" ); + string tabpath = PathToDestdir( "/etc/fstab" ); + map fstab = Partitions::GetFstab( tabpath ); + integer line = 0; + string n = ""; + while( line<=AsciiFile::NumLines( fstab ) ) + { + map l = AsciiFile::GetLine( fstab, line ); + string options = l["fields", 3]:""; + if (regexpmatch (options, "^$.*,$\?hotplug$,.*$\?$")) { + options = regexpsub (options, "^$.*,$\?hotplug$,.*$\?$", "\\1nofail\\2"); + AsciiFile::ChangeLineField( fstab, line, 3, options ); + } + line = line+1; + } + AsciiFile::RewriteFile( fstab, tabpath ); + } + + void UpdateFstabPersistentNames() { y2milestone( "UpdateFstabPersistentDevNames updating to SLES10 names" ); @@ -365,6 +386,8 @@ UpdateFstabPersistentNames(); } + UpdateFstabOptions(); + // remove EVMS // FIXME add appropriate condition if needed (does not seem so) UpdateFstabEvms2Lvm(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63198 - in /branches/SuSE-Code-11-SP2-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: fehr Date: Tue Jan 18 14:52:12 2011 New Revision: 63198 URL: http://svn.opensuse.org/viewcvs/yast?rev=63198&view=rev Log: adaptations for unattended migration Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Jan 18 14:52:12 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 18 14:49:17 CET 2011 - jsrain(a)suse.cz + +- adaptations for unattended migration + +------------------------------------------------------------------- Mon Jan 17 17:10:56 CET 2011 - aschnell(a)suse.de - fix for mmcblk devices (bnc #663528) Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Tue Jan 18 14:52:12 2011 @@ -319,7 +319,7 @@ any env = LibStorage::Environment::new("LibStorage::Environment", readonly); LibStorage::Environment::swig_testmode_set(env, Mode::test()); LibStorage::Environment::swig_autodetect_set(env, true); - LibStorage::Environment::swig_instsys_set(env, Mode::installation() || Mode::repair()); + LibStorage::Environment::swig_instsys_set(env, Stage::initial() || Mode::repair()); integer locker_pid = 0; sint = LibStorage::createStorageInterfacePid(env, locker_pid); @@ -5164,6 +5164,25 @@ } } +global define void UpdateFstabOptions() { + y2milestone( "UpdateFstabOptions" ); + string tabpath = PathToDestdir( "/etc/fstab" ); + map fstab = Partitions::GetFstab( tabpath ); + integer line = 0; + string n = ""; + while( line<=AsciiFile::NumLines( fstab ) ) + { + map l = AsciiFile::GetLine( fstab, line ); + string options = l["fields", 3]:""; + if (regexpmatch (options, "^$.*,$\?hotplug$,.*$\?$")) { + options = regexpsub (options, "^$.*,$\?hotplug$,.*$\?$", "\\1nofail\\2"); + AsciiFile::ChangeLineField( fstab, line, 3, options ); + } + line = line+1; + } + AsciiFile::RewriteFile( fstab, tabpath ); +} + global string HdToIseries( string input ) ``{ string ret = input; @@ -5550,6 +5569,10 @@ UpdateFstabPersistentNames(); } + + // FIXME: proper fix + UpdateFstabOptions(); + // remove EVMS // FIXME add appropriate condition if needed (does not seem so) UpdateFstabEvms2Lvm(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63197 - in /trunk/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/modules/FileSystems.ycp
by fehr＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: fehr Date: Tue Jan 18 12:11:36 2011 New Revision: 63197 URL: http://svn.opensuse.org/viewcvs/yast?rev=63197&view=rev Log: allow floating point value in reserved block percentage and set default to reserve about 1Gig, but <= 5.0% and >= 0.1% (bnc #661953) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/modules/FileSystems.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Jan 18 12:11:36 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 17 17:28:51 CET 2011 - fehr(a)suse.de + +- allow floating point value in reserved block percentage and + set default to reserve about 1Gig, but <= 5.0% and >= 0.1% + (bnc #661953) + +------------------------------------------------------------------- Thu Dec 23 17:40:50 CET 2010 - fehr(a)suse.de - changes for improved btrfs support Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Tue Jan 18 12:11:36 2011 @@ -266,6 +266,7 @@ ``{ symbol ret = `ok; list between = entry[`between]:[]; + integer below = entry[`below]:0; string valid_chars = entry[`valid_chars]:""; integer str_length = entry[`str_length]:0; @@ -279,7 +280,15 @@ ret = `error; } } - + if( below != 0 && (size(query)>0 || !entry[`empty_allowed]:false)) + { + y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); + if( below < tofloat(query) ) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } + } if( valid_chars != "" && size(query)>0 && ret != `error ) { if( nil != findfirstnotof( query, valid_chars )) Modified: trunk/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/File… ============================================================================== --- trunk/storage/storage/src/modules/FileSystems.ycp (original) +++ trunk/storage/storage/src/modules/FileSystems.ycp Tue Jan 18 12:11:36 2011 @@ -550,14 +550,14 @@ `query_key : "opt_reserved_blocks", `option_str : "-m", //`default : 5, - `between : [ 0 , 99 ], // -> -1 = infinite - `str_length : 2, - `valid_chars : "0123456789", + `below : 99, + `str_length : 6, + `valid_chars : "0123456789.", // popup text - `error_text : _("The \"Percentage of blocks reserved for root\" value is incorrect.\nPlease use a value between 0 and 99."), + `error_text : _("The \"Percentage of blocks reserved for root\" value is incorrect.\nAllowed are float numbers not larger than 99. (e.g. 0.5)"), // xgettext: no-c-format // help text, richtext format - `help_text : _("Percentage of blocks reserved for root: Specify the percentage of blocks reserved for the super user. This value defaults to 5%.") + `help_text : _("Percentage of blocks reserved for root: Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.") ], $[ // checkbox text @@ -1329,6 +1329,21 @@ ret["opt_blocksize"] = $[ "option_str" : "-b", "option_value" : "4096" ]; } + if( contains( [`ext2, `ext3, `ext4], fsys ) ) + { + if( Arch::s390() ) + { + ret["opt_blocksize"] = $[ "option_str" : "-b", + "option_value" : "4096" ]; + } + float f = (1048576.0 / (part["size_k"]:0)) * 100; + if( f > 5 ) + f = 5; + if( f < 0.1 ) + f = 0.1; + ret["opt_reserved_blocks"] = $[ "option_str" : "-m", + "option_value" : tostring( f, 1 ) ]; + } } y2milestone( "DefaultFormatOptions fsys %1 fmt %2 is %3", fsys, part["format"]:false, ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63196 - in /branches/SuSE-Linux-11_4-Branch/storage: package/yast2-storage.changes storage/src/include/custom_part_dialogs.ycp storage/src/modules/FileSystems.ycp
by fehr＠svn2.opensuse.org 18 Jan '11

18 Jan '11

Author: fehr Date: Tue Jan 18 12:10:13 2011 New Revision: 63196 URL: http://svn.opensuse.org/viewcvs/yast?rev=63196&view=rev Log: allow floating point value in reserved block percentage and set default to reserve about 1Gig, but <= 5.0% and >= 0.1% (bnc #661953) Modified: branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/custom_part_dialogs.ycp branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/FileSystems.ycp Modified: branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes Tue Jan 18 12:10:13 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 17 17:28:51 CET 2011 - fehr(a)suse.de + +- allow floating point value in reserved block percentage and + set default to reserve about 1Gig, but <= 5.0% and >= 0.1% + (bnc #661953) + +------------------------------------------------------------------- Thu Oct 21 14:14:10 CEST 2010 - aschnell(a)suse.de - fixed desktop file (bnc #647261) Modified: branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/custom_part_dialogs.ycp Tue Jan 18 12:10:13 2011 @@ -266,6 +266,7 @@ ``{ symbol ret = `ok; list between = entry[`between]:[]; + integer below = entry[`below]:0; string valid_chars = entry[`valid_chars]:""; integer str_length = entry[`str_length]:0; @@ -279,7 +280,15 @@ ret = `error; } } - + if( below != 0 && (size(query)>0 || !entry[`empty_allowed]:false)) + { + y2milestone( "DoInputChecks entry:%1 query:\"%2\"", entry, query ); + if( below < tofloat(query) ) + { + Popup::Error(entry[`error_text]:""); + ret = `error; + } + } if( valid_chars != "" && size(query)>0 && ret != `error ) { if( nil != findfirstnotof( query, valid_chars )) Modified: branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/FileSystems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/FileSystems.ycp (original) +++ branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/FileSystems.ycp Tue Jan 18 12:10:13 2011 @@ -550,14 +550,14 @@ `query_key : "opt_reserved_blocks", `option_str : "-m", //`default : 5, - `between : [ 0 , 99 ], // -> -1 = infinite - `str_length : 2, - `valid_chars : "0123456789", + `below : 99, + `str_length : 6, + `valid_chars : "0123456789.", // popup text - `error_text : _("The \"Percentage of blocks reserved for root\" value is incorrect.\nPlease use a value between 0 and 99."), + `error_text : _("The \"Percentage of blocks reserved for root\" value is incorrect.\nAllowed are float numbers not larger than 99. (e.g. 0.5)"), // xgettext: no-c-format // help text, richtext format - `help_text : _("Percentage of blocks reserved for root: Specify the percentage of blocks reserved for the super user. This value defaults to 5%.") + `help_text : _("Percentage of blocks reserved for root: Specify the percentage of blocks reserved for the super user. The default is computed so that normally 1 Gig is reserved. Upper limit for reserved default is 5.0, lowest reserved default is 0.1.") ], $[ // checkbox text @@ -1329,6 +1329,21 @@ ret["opt_blocksize"] = $[ "option_str" : "-b", "option_value" : "4096" ]; } + if( contains( [`ext2, `ext3, `ext4], fsys ) ) + { + if( Arch::s390() ) + { + ret["opt_blocksize"] = $[ "option_str" : "-b", + "option_value" : "4096" ]; + } + float f = (1048576.0 / (part["size_k"]:0)) * 100; + if( f > 5 ) + f = 5; + if( f < 0.1 ) + f = 0.1; + ret["opt_reserved_blocks"] = $[ "option_str" : "-m", + "option_value" : tostring( f, 1 ) ]; + } } y2milestone( "DefaultFormatOptions fsys %1 fmt %2 is %3", fsys, part["format"]:false, ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63195 - /tags/branch-Code-11-SP1-2_17_99_1/storage/
by aschnell＠svn2.opensuse.org 17 Jan '11

17 Jan '11

Author: aschnell Date: Mon Jan 17 17:23:01 2011 New Revision: 63195 URL: http://svn.opensuse.org/viewcvs/yast?rev=63195&view=rev Log: Created tag branch-Code-11-SP1-2_17_99_1 for storage Added: tags/branch-Code-11-SP1-2_17_99_1/storage/ (props changed) - copied from r63194, branches/SuSE-Code-11-SP1-Branch/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63194 - /tags/branch-Code-11-SP1-2_17_99_1/
by aschnell＠svn2.opensuse.org 17 Jan '11

17 Jan '11

Author: aschnell Date: Mon Jan 17 17:23:00 2011 New Revision: 63194 URL: http://svn.opensuse.org/viewcvs/yast?rev=63194&view=rev Log: Created tag branch-Code-11-SP1-2_17_99_1 Added: tags/branch-Code-11-SP1-2_17_99_1/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63193 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/Disk.cc package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn2.opensuse.org 17 Jan '11

17 Jan '11

Author: aschnell Date: Mon Jan 17 17:21:43 2011 New Revision: 63193 URL: http://svn.opensuse.org/viewcvs/yast?rev=63193&view=rev Log: - fix for mmcblk devices (bnc #663528) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Disk.cc Mon Jan 17 17:21:43 2011 @@ -1001,8 +1001,7 @@ } } string reg = diskname; - if( !reg.empty() && reg.find( '/' )!=string::npos && - isdigit(reg[reg.length()-1]) ) + if( !reg.empty() && isdigit(reg[reg.length()-1]) ) reg += "p"; reg += "[0-9]+"; list<string> ps = pp.getMatchingEntries( reg ); @@ -1151,6 +1150,11 @@ { return true; } + static Regex mmcblkpart( "mmcblk[0123456789]+$" ); + if ( mmcblkpart.match( disk ) == true ) + { + return true; + } while( !need_p && i<lengthof(p_disks) ) { string::size_type p = disk.find(p_disks[i]); Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Mon Jan 17 17:21:43 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 17 17:10:56 CET 2011 - aschnell(a)suse.de + +- fix for mmcblk devices (bnc #663528) + +------------------------------------------------------------------- Tue Oct 05 10:21:24 CEST 2010 - aschnell(a)suse.de - do not read /var/run/mdadm/map since the UUID is "reversed" Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Mon Jan 17 17:21:43 2011 @@ -612,6 +612,15 @@ else dlen = pos; } + else if( search( device, "/dev/mmcblk" )==0 && size(ls)==2 ) + { + integer pos = find(device, "p"); + y2milestone("device:%1 pos:%2", device, pos); + if (pos == -1) + dlen = size(device); + else + dlen = pos; + } else if( search( device, "/dev/loop" )==0 ) { dlen = 9; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63192 - in /branches/SuSE-Code-11-SP1-Branch/storage: VERSION libstorage/src/Disk.cc package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn2.opensuse.org 17 Jan '11

17 Jan '11

Author: aschnell Date: Mon Jan 17 17:21:28 2011 New Revision: 63192 URL: http://svn.opensuse.org/viewcvs/yast?rev=63192&view=rev Log: - fix for mmcblk devices (bnc #663528) Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/VERSION Mon Jan 17 17:21:28 2011 @@ -1 +1 @@ -2.17.99 +2.17.99.1 Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc Mon Jan 17 17:21:28 2011 @@ -963,8 +963,7 @@ } } string reg = diskname; - if( !reg.empty() && reg.find( '/' )!=string::npos && - isdigit(reg[reg.length()-1]) ) + if( !reg.empty() && isdigit(reg[reg.length()-1]) ) reg += "p"; reg += "[0-9]+"; list<string> ps = pp.getMatchingEntries( reg ); @@ -1109,6 +1108,11 @@ { return true; } + static Regex mmcblkpart( "mmcblk[0123456789]+$" ); + if ( mmcblkpart.match( disk ) == true ) + { + return true; + } while( !need_p && i<lengthof(p_disks) ) { string::size_type p = disk.find(p_disks[i]); Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Mon Jan 17 17:21:28 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 17 17:10:56 CET 2011 - aschnell(a)suse.de + +- fix for mmcblk devices (bnc #663528) +- 2.17.99.1 + +------------------------------------------------------------------- Wed May 5 16:27:23 CEST 2010 - fehr(a)suse.de - call xfs_check instead of fsck -n -t xfs since /sbin/fsck is Modified: branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/storage/src/modules/Storage.ycp Mon Jan 17 17:21:28 2011 @@ -604,6 +604,15 @@ else dlen = pos; } + else if( search( device, "/dev/mmcblk" )==0 && size(ls)==2 ) + { + integer pos = find(device, "p"); + y2milestone("device:%1 pos:%2", device, pos); + if (pos == -1) + dlen = size(device); + else + dlen = pos; + } else if( search( device, "/dev/loop" )==0 ) { dlen = 9; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63191 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 17 Jan '11

17 Jan '11

Author: coolo Date: Mon Jan 17 15:39:29 2011 New Revision: 63191 URL: http://svn.opensuse.org/viewcvs/yast?rev=63191&view=rev Log: give minimal another shot to be really minimal (bnc#577791) Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Jan 17 15:39:29 2011 @@ -329,7 +329,7 @@ <cursor>DMZ</cursor> <packages>xorg-x11</packages> <order config:type="integer">8</order> - <patterns>enhanced_base</patterns> + <patterns>base</patterns> <icon>yast-sshd</icon> </one_supported_desktop> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63190 - in /trunk/network: package/yast2-network.changes src/modules/Lan.ycp
by mvidner＠svn2.opensuse.org 17 Jan '11

17 Jan '11

Author: mvidner Date: Mon Jan 17 15:12:04 2011 New Revision: 63190 URL: http://svn.opensuse.org/viewcvs/yast?rev=63190&view=rev Log: fixed progress messages being out of sync when writing LAN config (reported by bmwiedemann) Modified: trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Jan 17 15:12:04 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 17 14:10:10 UTC 2011 - mvidner(a)novell.com + +- fixed progress messages being out of sync when writing LAN config + (reported by bmwiedemann) + +------------------------------------------------------------------- Thu Dec 23 00:32:23 CET 2010 - mzugec(a)suse.cz - ifcfg-ethX.Y style config files for VLAN(fate#309240) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Jan 17 15:12:04 2011 @@ -448,6 +448,7 @@ ProgressNextStage(_("Writing routing configuration...")); boolean orig = Progress::set (false); Routing::Write(); + Progress::set (orig); sleep(sl); if(Abort()) return false; @@ -455,6 +456,7 @@ ProgressNextStage(_("Writing hostname and DNS configuration...")); // write resolv.conf after change from dhcp to static (#327074) // reload/restart network before this to put correct resolv.conf from dhcp-backup + orig = Progress::set (false); DNS::Write(); Host::EnsureHostnameResolvable(); Host::Write(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63189 - /branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes
by tgoettlicher＠svn2.opensuse.org 17 Jan '11

17 Jan '11

Author: tgoettlicher Date: Mon Jan 17 15:08:37 2011 New Revision: 63189 URL: http://svn.opensuse.org/viewcvs/yast?rev=63189&view=rev Log: fixed changes file Modified: branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes Modified: branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/qt/pa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/qt/package/yast2-qt.changes Mon Jan 17 15:08:37 2011 @@ -2,7 +2,7 @@ Fri Jan 14 11:37:21 CET 2011 - tgoettlicher(a)suse.de - Fixed hanging browse dialogs (bnc #580143) -- V 2.19.13 +- V 2.18.13 ------------------------------------------------------------------- Wed Nov 24 14:25:12 CET 2010 - tgoettlicher(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63188 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 17 Jan '11

17 Jan '11

Author: coolo Date: Mon Jan 17 13:05:52 2011 New Revision: 63188 URL: http://svn.opensuse.org/viewcvs/yast?rev=63188&view=rev Log: add debug update repo too (bnc#633628) Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Jan 17 13:05:52 2011 @@ -236,6 +236,16 @@ <priority config:type="integer">99</priority> </extra_url> <extra_url> + <baseurl>http://download.opensuse.org/debug/update/11.4/</baseurl> + <alias>repo-debug-update</alias> + <name>openSUSE-11.4-Update-Debug</name> + <prod_dir>/</prod_dir> + <enabled config:type="boolean">false</enabled> + <autorefresh config:type="boolean">true</autorefresh> + <priority config:type="integer">99</priority> + </extra_url> + + <extra_url> <baseurl>http://download.opensuse.org/source/distribution/11.4/repo/oss/</baseurl> <alias>repo-source</alias> <name>openSUSE-11.4-Source</name> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63187 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQLogView.cc
by tgoettlicher＠svn2.opensuse.org 17 Jan '11

17 Jan '11

Author: tgoettlicher Date: Mon Jan 17 11:52:10 2011 New Revision: 63187 URL: http://svn.opensuse.org/viewcvs/yast?rev=63187&view=rev Log: fixed scroller Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQLogView.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=63187&r1=63… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Mon Jan 17 11:52:10 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "7") +SET(VERSION_PATCH "8") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Mon Jan 17 11:52:10 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 17 11:50:38 CET 2011 - tgoettlicher(a)suse.de + +- Fixed LogView's scroller +- V 2.19.8 + +------------------------------------------------------------------- Fri Jan 14 11:25:33 CET 2011 - tgoettlicher(a)suse.de - Fixed hanging browse dialogs (bnc #580143) Modified: trunk/qt/src/YQLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQLogView.cc?rev=63187&r1… ============================================================================== --- trunk/qt/src/YQLogView.cc (original) +++ trunk/qt/src/YQLogView.cc Mon Jan 17 11:52:10 2011 @@ -98,8 +98,8 @@ bool atEnd = sb->value() == sb->maximum(); - if (newString.startsWith(_lastText)) { - _qt_text->append(newString.mid(_lastText.length() + 1 )); + if (newString.startsWith(_lastText) && !_lastText.isEmpty() ) { + _qt_text->append(newString.mid(_lastText.length() + 1 )); } else { _qt_text->setPlainText( newString ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r63186 - /branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes
by charlesa＠svn2.opensuse.org 14 Jan '11

14 Jan '11

Author: charlesa Date: Fri Jan 14 18:00:14 2011 New Revision: 63186 URL: http://svn.opensuse.org/viewcvs/yast?rev=63186&view=rev Log: Minor white space change. Modified: branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes Modified: branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/vm/pac… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/vm/package/yast2-vm.changes Fri Jan 14 18:00:14 2011 @@ -8,8 +8,8 @@ ------------------------------------------------------------------- Wed Apr 1 08:59:31 MDT 2009 - carnold(a)novell.com -- bnc#488598 - chkconfig and insserv fail on init scripts that - depend on /etc/init.d/boot.clock in Xen domU +- bnc#488598 - chkconfig and insserv fail on init scripts that + depend on /etc/init.d/boot.clock in Xen domU ------------------------------------------------------------------- Thu Apr 3 15:06:18 MDT 2008 - carnold(a)novell.com -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0