Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2012-11-02 17:44:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation", Maintainer is "jsuch...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2012-10-26 17:38:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2012-11-02 17:44:53.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 31 08:16:46 CET 2012 - jsuch...@suse.cz + +- removed fonts_finish, its only action was to call obsolete + SuSEconfig script +- removed inst_suseconfig client (fate#100011) +- 2.23.2 + +------------------------------------------------------------------- Old: ---- yast2-installation-2.23.1.tar.bz2 New: ---- yast2-installation-2.23.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.yEbBK9/_old 2012-11-02 17:44:55.000000000 +0100 +++ /var/tmp/diff_new_pack.yEbBK9/_new 2012-11-02 17:44:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 2.23.1 +Version: 2.23.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-2.23.1.tar.bz2 -> yast2-installation-2.23.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/VERSION new/yast2-installation-2.23.2/VERSION --- old/yast2-installation-2.23.1/VERSION 2012-10-26 08:45:49.000000000 +0200 +++ new/yast2-installation-2.23.2/VERSION 2012-10-31 08:19:28.000000000 +0100 @@ -1 +1 @@ -2.23.1 +2.23.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/clients/inst_automatic_configuration.ycp new/yast2-installation-2.23.2/src/clients/inst_automatic_configuration.ycp --- old/yast2-installation-2.23.1/src/clients/inst_automatic_configuration.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/clients/inst_automatic_configuration.ycp 2012-10-26 11:01:04.000000000 +0200 @@ -65,14 +65,6 @@ y2milestone ("automatic_configuration started"); -// list <map <string, any> > proposal_scripts_to_call = [ -// $[ -// "label":_("Finishing configuration..."), -// "type":"scripts", -// "items":["addon_update_sources", "inst_extrasources", "suseconfig", "save_hardware_status"] -// ], -// ]; - list <map <string, any> > proposal_scripts_to_call = []; map <string, any> globals_features = ProductFeatures::GetSection ("globals"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/clients/inst_finish.ycp new/yast2-installation-2.23.2/src/clients/inst_finish.ycp --- old/yast2-installation-2.23.1/src/clients/inst_finish.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/clients/inst_finish.ycp 2012-10-31 08:14:46.000000000 +0100 @@ -154,7 +154,6 @@ (Mode::live_installation() ? "live_save_config":""), "runlevel", "desktop", - "fonts", "storage", "iscsi-client", "kernel", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/clients/inst_suseconfig.ycp new/yast2-installation-2.23.2/src/clients/inst_suseconfig.ycp --- old/yast2-installation-2.23.1/src/clients/inst_suseconfig.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/clients/inst_suseconfig.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,282 +0,0 @@ -/* ------------------------------------------------------------------------------ - * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. - * - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of version 2 of the GNU General Public License as published by the - * Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, contact Novell, Inc. - * - * To contact Novell about this file by physical or electronic mail, you may find - * current contact information at www.novell.com. - * ------------------------------------------------------------------------------ - */ - -/** - * File: clients/inst_suseconfig.ycp - * Package: Installation - * Summary: Run SUSEconfig - * Authors: Andreas Schwab <sch...@suse.de> - * Stefan Hundhammer <s...@suse.de> - * - * $Id$ - * - * Purpose: - * - shows the "Finishing the installation" frame - * - runs "SuSEconfig" - * - runs "init" to reread inittab, which has been changed by SuSEconfig. - * - shows the loginname which can be used. - */ - -{ - - textdomain "installation"; - - import "Arch"; - import "Directory"; - import "Installation"; - import "Mode"; - import "Stage"; - import "Popup"; - import "Wizard"; - import "Kernel"; - import "GetInstArgs"; - - // bugzilla #241553 comment #7 - // import "Product"; // ugly, because of initializing the &product; macro - - if ( GetInstArgs::going_back()) // going backwards? - return `auto; // don't execute this once more - - // automatic configuration has its own progress - // do not set an UI if possible - boolean automatic_configuration = GetInstArgs::automatic_configuration(); - y2milestone ("Script AutoConf: %1", automatic_configuration); - - boolean reread_inittab = false; - - integer current_step = 0; // Required by logStep() - - string log_destination = ">> " + Directory::logdir + "/y2log.SuSEconfig"; // Required by doStep() - - if ( Stage::cont () ) - { - reread_inittab = true; - } - - /** - * Display a step in the LogView widget and increment the progress bar. - * Uses global variable 'current_step'. - * - * @param step_descr description of the step. - */ - define void logStep( string step_descr ) ``{ - current_step = current_step + 1; - - if (! automatic_configuration && !Mode::commandline ()) { - UI::ChangeWidget( `id(`progress), `Value, current_step ); - UI::ChangeWidget( `id(`log), `LastLine, step_descr + "\n" ); - } - }; - - - /** - * Run a step on the target and log its output to the globally specified - * 'log_destination'. - * - * @param step command to execute in this step - */ - define void runStep( string step ) ``{ - - string command = sformat( "HOME=%1 %2 %3 2>&1", Directory::tmpdir, step, log_destination ); - // Setting $HOME to Directory::tmpdir to avoid cluttering '/' with spurious files - bug #13204 - - // automatic configuration doesn't have UI - // the very same approach uses testsuite - if (Mode::test () && ! automatic_configuration) - { - y2milestone( "Test mode - NOT executing '%1'", command ); - sleep( 300 ); - } - else - { - y2milestone( "Executing '%1'", command ); - SCR::Execute( .target.bash, command ); - } - }; - - - //////////////////////////////////////////////////////////////////////////////// - // Main Dialog - //////////////////////////////////////////////////////////////////////////////// - - - /* Help text for SUSEconfig dialog */ - string help = _("<p><tt>SuSEconfig</tt> must write the configuration -of your &product; system. Depending on the CPU and the amount of memory, -this process can take some time.</p> -"); - - // BNC #429146 - list <string> tmp_modules = (list<string>) SCR::Read (.target.dir, "/sbin/conf.d/"); - list <string> modules = []; - integer counter = -1; - - foreach (string one_module, tmp_modules, { - if (! regexpmatch (one_module, "^SuSEconfig\\.")) - return; - - if (regexpmatch (one_module, "\\.(swp|bak|sav|save|orig|rpmorig|rpmsave|rpmnew)$")) - return; - - one_module = regexpsub (one_module, "^SuSEconfig\\.(.*)", "\\1"); - counter = counter + 1; - modules[counter] = one_module; - }); - - y2milestone ("SuSEconfig scripts to call: %1", modules); - - integer max_steps = size( modules ) + 1; // + ldconfig - - if ( reread_inittab ) - { - max_steps = max_steps + 1; // restart 'init' - } - - term contents = `VBox( - `LogView(`id(`log), "", 10, 0 ), - - // Progress bar that displays overall progress in this dialog - `ProgressBar(`id(`progress), _("Progress"), max_steps, 0 ) - ); - - if (! automatic_configuration && !Mode::commandline ()) { - Wizard::SetContents( - // Dialog title for SuSEconfig dialog - _("Writing the system configuration..."), - contents, help, GetInstArgs::enable_back(), GetInstArgs::enable_next()); - Wizard::DisableAbortButton(); - } - - - // -------------------------------------------------------------- - // Put config of installed kernel into kernel sources - - y2debug( "Testmode: %1", Mode::test () ); - - // - // Preliminary 'ldconfig' - this takes a long time at first run. - // - // SusEconfig calls this internally, too, but we want to avoid giving the - // impression the very first SuSEconfig module takes that long: It's - // simply not true, it's 'ldconfig' that takes this long. So make this fact - // transparent by explicitly calling it (and informing the user about that) - // prior to calling any SuSEconfig module. - // - - logStep( _("Setting up linker cache...") ); - runStep( "/sbin/ldconfig" ); - - // This is the same as: - // runStep( "/sbin/SuSEconfig --verbose --module aaa_at_first" ); - // but that "aaa_at_first" module will go away soon. Or so it is said. ;-) - - - if ( Stage::initial () || Stage::cont () - || tolower( (string) SCR::Read(.sysconfig.suseconfig.ENABLE_SUSECONFIG) ) == "yes" ) - { - // - // Call each SuSEconfig module individually - // - - foreach (string mod, modules, ``{ - // inform user about current SuSEconfig step - logStep( sformat (_("Running SuSEconfig.%1"), mod)); - runStep( "/sbin/SuSEconfig --verbose --module " + mod ); - }); - - if (! Mode::test () && ! automatic_configuration) - { - SCR::Execute (.target.remove, "/var/lib/YaST2/run_suseconfig"); - } - - - // - // Call "all the rest" of the SuSEconfig main program - // - - // inform user that SuSEconfig has finished - logStep( _("Finishing SuSEconfig") ); - runStep( "/sbin/SuSEconfig --verbose --nomodule" ); - } - else - { - // inform user that SuSEconfig has been disabled - logStep( _("SuSEconfig disabled in /etc/sysconfig/suseconfig") ); - y2milestone( "SuSEconfig disabled in /etc/sysconfig/suseconfig" ); - } - - - - // - // Tell init to reread inittab which might have been changed by SuSEconfig. - // - - if ( reread_inittab ) - { - runStep( "/sbin/init q" ); - } - - - // The final LogView line to be displayed after SuSEconfig etc. is done. - if (!automatic_configuration && !Mode::commandline ()) - UI::ChangeWidget( `id(`log), `LastLine, "\n" + _("Done.") + "\n" ); - - - if (Mode::test () && ! automatic_configuration && !Mode::commandline ()) - { - UI::MakeScreenShot(); // doesn't work manually - not widget with keyboard focus! - sleep( 5*1000 ); - } - - if ( Kernel::GetInformAboutKernelChange () ) - { - // inform the user that he/she has to reboot to activate new kernel - Popup::Message(_("Reboot your system -to activate the new kernel. -")); - } - - // ... - // Migrate configuration from XFree86 3.x to XFree86 4.x - // if possible - // --- - if ( Mode::update () ) - { - if (SCR::Read(.target.size, "/etc/X11/XF86Config")!= -1) { - integer flag = (integer) - SCR::Execute (.target.bash, - "/usr/bin/tail -n 1 /etc/X11/XF86Config | grep -q '#3x'" - ); - if (flag == 0) - { - SCR::Execute (.target.bash, Directory::ybindir + "/xmigrate.pl"); - } - } - } - - if ( Mode::update () ) - { - return `next; - } - else - { - return `auto; - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/inst_finish/fonts_finish.ycp new/yast2-installation-2.23.2/src/inst_finish/fonts_finish.ycp --- old/yast2-installation-2.23.1/src/inst_finish/fonts_finish.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/inst_finish/fonts_finish.ycp 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ -/* ------------------------------------------------------------------------------ - * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. - * - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of version 2 of the GNU General Public License as published by the - * Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, contact Novell, Inc. - * - * To contact Novell about this file by physical or electronic mail, you may find - * current contact information at www.novell.com. - * ------------------------------------------------------------------------------ - */ - -/** - * File: - * fonts_finish.ycp - * - * Module: - * Step of base installation finish - * - * Authors: - * Jiri Srain <jsr...@suse.cz> - * - * $Id$ - * - */ - -{ - -textdomain "installation"; - -import "FileUtils"; - -any ret = nil; -string func = ""; -map param = $[]; - -/* Check arguments */ -if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { - func = (string)WFM::Args(0); - if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) - param = (map)WFM::Args(1); -} - -y2milestone ("starting fonts_finish"); -y2debug("func=%1", func); -y2debug("param=%1", param); - -if (func == "Info") -{ - return (any)$[ - "steps" : 1, - // progress step title - "title" : _("Initializing fonts..."), - "when" : [ `installation, `update, `autoinst ], - ]; -} -else if (func == "Write") -{ - // Always run fonts_finish::Write - // skip it if SuSEconfig.fonts doesn't exist - // bugzilla #216079 - if (FileUtils::Exists ("/sbin/conf.d/SuSEconfig.fonts")) { - if (SCR::Execute (.target.bash, "/sbin/SuSEconfig --module fonts") != 0) - y2error ("SuSEconfig --module fonts failed"); - } else { - y2warning ("Script /sbin/conf.d/SuSEconfig.fonts doesn't exist, skipping..."); - } -} -else -{ - y2error ("unknown function: %1", func); - ret = nil; -} - -y2debug("ret=%1", ret); -y2milestone("fonts_finish finished"); -return ret; - - -} /* EOF */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/inst_finish/installation_settings_finish.ycp new/yast2-installation-2.23.2/src/inst_finish/installation_settings_finish.ycp --- old/yast2-installation-2.23.1/src/inst_finish/installation_settings_finish.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/inst_finish/installation_settings_finish.ycp 2012-10-26 11:07:22.000000000 +0200 @@ -102,16 +102,6 @@ } - // bnc #390930 - // Since there is no second stage during upgrade, SuSEConfig has to be run - // by hooks - if (Mode::update()) { - y2milestone ("Creating hook-file %1", InstData::suseconfig_hookfile); - if ((boolean) SCR::Write (.target.string, InstData::suseconfig_hookfile, "")) { - y2error ("Cannot write suseconfig hook-file"); - } - } - y2milestone ("Anyway, successful"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-2.23.1/src/modules/InstData.ycp new/yast2-installation-2.23.2/src/modules/InstData.ycp --- old/yast2-installation-2.23.1/src/modules/InstData.ycp 2012-06-25 11:05:52.000000000 +0200 +++ new/yast2-installation-2.23.2/src/modules/InstData.ycp 2012-10-26 11:06:29.000000000 +0200 @@ -74,10 +74,6 @@ // this variable enables a check box in dialog global boolean enable_autoconfiguration = false; - // file that forces suseconfig run on boot - // bnc #390930 - global string suseconfig_hookfile = Directory::vardir + "/run_suseconfig"; - // <-- other // --> copy files -- config -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org