Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-08-20 17:53:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2014-08-16 15:37:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-08-20 17:54:00.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Aug 20 10:38:19 CEST 2014 - [email protected] + +- chroot-scripts: Install script into the chroot environment if it + will be called there. (bnc#889931) +- 3.1.56 + +------------------------------------------------------------------- +Mon Aug 18 13:46:40 CEST 2014 - [email protected] + +- Supporting registration in installation and upgrade mode while + the first stage of installation. (bnc#890073) +- 3.1.55 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.54.tar.bz2 New: ---- autoyast2-3.1.56.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.qvUFlo/_old 2014-08-20 17:54:01.000000000 +0200 +++ /var/tmp/diff_new_pack.qvUFlo/_new 2014-08-20 17:54:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.54 +Version: 3.1.56 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.54.tar.bz2 -> autoyast2-3.1.56.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.54/package/autoyast2.changes new/autoyast2-3.1.56/package/autoyast2.changes --- old/autoyast2-3.1.54/package/autoyast2.changes 2014-08-13 17:05:12.000000000 +0200 +++ new/autoyast2-3.1.56/package/autoyast2.changes 2014-08-20 11:05:17.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Aug 20 10:38:19 CEST 2014 - [email protected] + +- chroot-scripts: Install script into the chroot environment if it + will be called there. (bnc#889931) +- 3.1.56 + +------------------------------------------------------------------- +Mon Aug 18 13:46:40 CEST 2014 - [email protected] + +- Supporting registration in installation and upgrade mode while + the first stage of installation. (bnc#890073) +- 3.1.55 + +------------------------------------------------------------------- Wed Aug 13 16:35:56 CEST 2014 - [email protected] - Warning that an already existing autoyast configuration file will diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.54/package/autoyast2.spec new/autoyast2-3.1.56/package/autoyast2.spec --- old/autoyast2-3.1.54/package/autoyast2.spec 2014-08-13 17:05:12.000000000 +0200 +++ new/autoyast2-3.1.56/package/autoyast2.spec 2014-08-20 11:05:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.54 +Version: 3.1.56 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.54/src/autoyast-rnc/general.rnc new/autoyast2-3.1.56/src/autoyast-rnc/general.rnc --- old/autoyast2-3.1.54/src/autoyast-rnc/general.rnc 2014-08-13 17:05:12.000000000 +0200 +++ new/autoyast2-3.1.56/src/autoyast-rnc/general.rnc 2014-08-20 11:05:17.000000000 +0200 @@ -81,7 +81,7 @@ } semi-automatic = element semi-automatic { LIST, semi-automatic-modules* } -semi-automatic-modules = element module { "networking" | "partitioning" } +semi-automatic-modules = element module { "networking" | "partitioning" | "scc" } minimal-configuration = element minimal-configuration { BOOLEAN } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.54/src/clients/inst_autosetup.rb new/autoyast2-3.1.56/src/clients/inst_autosetup.rb --- old/autoyast2-3.1.54/src/clients/inst_autosetup.rb 2014-08-13 17:05:12.000000000 +0200 +++ new/autoyast2-3.1.56/src/clients/inst_autosetup.rb 2014-08-20 11:05:17.000000000 +0200 @@ -55,6 +55,7 @@ _("Set up language"), _("Create partition plans"), _("Configure Bootloader"), + _("Registration"), _("Configure Software selections"), _("Configure Systemd Default Target") ] @@ -65,6 +66,7 @@ _("Setting up language..."), _("Creating partition plans..."), _("Configuring Bootloader..."), + _("Registering the system..."), _("Configuring Software selections..."), _("Configuring Systemd Default Target...") ] @@ -286,6 +288,27 @@ ["Import", Ops.get_map(Profile.current, "bootloader", {})] ) + # Registration + # FIXME: There is a lot of duplicate code with inst_autoupgrade. + + return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort + Progress.NextStage + + if Profile.current["suse_register"] + return :abort unless WFM.CallFunction( + "scc_auto", + ["Import", Profile.current["suse_register"]] + ) + return :abort unless WFM.CallFunction( + "scc_auto", + ["Write"] + ) + elsif general_section["semi-automatic"] && + general_section["semi-automatic"].include?("scc") + + Call.Function("inst_scc", ["enable_next" => true]) + end + # Software return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.54/src/clients/inst_autosetup_upgrade.rb new/autoyast2-3.1.56/src/clients/inst_autosetup_upgrade.rb --- old/autoyast2-3.1.54/src/clients/inst_autosetup_upgrade.rb 2014-08-13 17:05:12.000000000 +0200 +++ new/autoyast2-3.1.56/src/clients/inst_autosetup_upgrade.rb 2014-08-20 11:05:17.000000000 +0200 @@ -51,6 +51,7 @@ _("Configure General Settings "), _("Execute pre-install user scripts"), _("Set up language"), + _("Registration"), _("Configure Software selections"), _("Configure Bootloader") ] @@ -59,6 +60,7 @@ _("Configuring general settings..."), _("Executing pre-install user scripts..."), _("Setting up language..."), + _("Registering the system..."), _("Configuring Software selections..."), _("Configuring Bootloader...") ] @@ -210,6 +212,27 @@ end end + # Registration + # FIXME: There is a lot of duplicate code with inst_autosetup. + + return :abort if Popup.ConfirmAbort(:painless) if UI.PollInput == :abort + Progress.NextStage + + general_section = Profile.current["general"] || {} + if Profile.current["suse_register"] + return :abort unless WFM.CallFunction( + "scc_auto", + ["Import", Profile.current["suse_register"]] + ) + return :abort unless WFM.CallFunction( + "scc_auto", + ["Write"] + ) + elsif general_section["semi-automatic"] && + general_section["semi-automatic"].include?("scc") + + Call.Function("inst_scc", ["enable_next" => true]) + end # Software diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.54/src/modules/AutoinstScripts.rb new/autoyast2-3.1.56/src/modules/AutoinstScripts.rb --- old/autoyast2-3.1.54/src/modules/AutoinstScripts.rb 2014-08-13 17:05:12.000000000 +0200 +++ new/autoyast2-3.1.56/src/modules/AutoinstScripts.rb 2014-08-20 11:05:18.000000000 +0200 @@ -821,7 +821,11 @@ #scriptPath = sformat("%1%2/%3", (special) ? "" : AutoinstConfig::destdir, AutoinstConfig::scripts_dir, scriptName); toks = URL.Parse(Ops.get_string(s, "location", "")) - if Ops.get_string(toks, "scheme", "") == "nfs" || !special + # special == true ---> The script has to be installed into /mnt + # because it will be called in a chroot environment. + # (bnc#889931) + # FIXME: Find out why "nfs" has a special behavior. + if special || toks["scheme"] == "nfs" scriptPath = Builtins.sformat( "%1%2/%3", AutoinstConfig.destdir, @@ -852,8 +856,8 @@ Ops.get_string(s, "source", "echo Empty script!") ) end - if special && Ops.get_string(toks, "scheme", "") == "nfs" - scriptPath = Builtins.substring(scriptPath, 4) # cut off the /mnt for later execution + if special || toks["scheme"] == "nfs" + scriptPath = scriptPath[AutoinstConfig.destdir.length..-1] # cut off the e.g. /mnt for later execution end else # disable all sources and finish target - no clue what this is good for. -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
