Author: locilka Date: Wed Oct 31 14:15:08 2007 New Revision: 41684 URL: http://svn.opensuse.org/viewcvs/yast?rev=41684&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. - Removed support for converting inittab from SUSE Linux 7.0 and older during upgrade. - 2.16.1 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_kickoff.ycp trunk/packager/src/clients/media_proposal.ycp trunk/packager/yast2-packager.spec.in Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=41684&r1=41683&r2=41684&view=diff ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Oct 31 14:15:08 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=41684&r1=41683&r2=41684&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Oct 31 14:15:08 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Oct 31 14:13:07 CET 2007 - locilka@suse.cz + +- installedVersion and updateVersion moved from 'Update' to + 'Installation' YCP module to remove dependencies. +- Removed support for converting inittab from SUSE Linux 7.0 and + older during upgrade. +- 2.16.1 + +------------------------------------------------------------------- Tue Oct 30 09:29:39 CET 2007 - locilka@suse.cz - Downloading only one localized slideshow (with 'en' localization Modified: trunk/packager/src/clients/inst_kickoff.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_kickoff.ycp?rev=41684&r1=41683&r2=41684&view=diff ============================================================================== --- trunk/packager/src/clients/inst_kickoff.ycp (original) +++ trunk/packager/src/clients/inst_kickoff.ycp Wed Oct 31 14:15:08 2007 @@ -16,7 +16,6 @@ import "Stage"; import "Linuxrc"; import "Installation"; - import "Update"; import "Popup"; import "Directory"; import "ModuleLoading"; @@ -215,57 +214,6 @@ } } - - /** - * Update and convert inittab. - */ - define void update_inittab () ``{ - - // /etc/inittab will be overridden by package aaa_base. So we will - // have to save the run-level - // The runlevel-values have been changed since version 7.0; So we - // have to handle older version in a special case. - - string idfile = (string) SCR::Read(.target.tmpdir) + "/idline"; - if (SCR::Execute (.target.bash, "/bin/grep ^id: " + - "'" + String::Quote (Installation::destdir) + "/etc/inittab" + "'" + - " >" + idfile) == 0) - { - // idline = "id:X:initdefault:" - - string idline = (string) SCR::Read(.target.string, idfile); - - // idsplit = "id", "X", "initdefault", "" - list idsplit = splitstring (idline, ":"); - - integer initdefault = -1; - if (size (idsplit) > 2) - { - initdefault = tointeger (idsplit[1]:"3"); - } - - y2milestone ("run-level %1 found", initdefault); - - if (Update::installedVersion["name"]:"" == "SuSE Linux") - { - integer oldmajor = Update::installedVersion["major"]:-1; - integer oldminor = Update::installedVersion["minor"]:-1; - - if (oldmajor >= 0 && oldminor >= 0) - { - if ((oldmajor < 7) || (oldmajor == 7 && oldminor == 0)) - { - // position == old, value == new - list new_levels = [ 0, 0, 3, 5, 4, 4 ]; // 0->0, 1->0, 2->3, 3->5, 4->4, 5->4 - initdefault = new_levels[initdefault]:5; - } - } - } - - Update::last_runlevel = initdefault; // evaluated in inst_finish - } - } - /** * Create /etc/mdadm.conf if it does not exist and it's needed * bugs: #169710 and #146304 @@ -341,10 +289,8 @@ * Calls a local command and returns if successful */ define boolean LocalCommand (string command) { - // FIXME: can be changed into y2debug() later - eat2minestrone (sformat ("Running: %1", command)); map cmd = (map) WFM::Execute (.local.bash_output, command); - eat2minestrone (sformat ("Returned: %1", cmd)); + y2milestone (sformat ("Command %1 returned: %1", command, cmd)); if (cmd["exit"]:-1 == 0) { return true; @@ -449,9 +395,6 @@ SCR::Execute (.target.bash, "/usr/lib/YaST2/bin/update_users_groups " + "'" + String::Quote (Installation::destdir) + "'"); - // update inittab - update_inittab (); - // create /etc/mdadm.conf if it does not exist createmdadm(); Modified: trunk/packager/src/clients/media_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/media_proposal.ycp?rev=41684&r1=41683&r2=41684&view=diff ============================================================================== --- trunk/packager/src/clients/media_proposal.ycp (original) +++ trunk/packager/src/clients/media_proposal.ycp Wed Oct 31 14:15:08 2007 @@ -12,7 +12,6 @@ textdomain "packager"; import "HTML"; - import "Update"; import "Mode"; import "Language"; import "Packages"; Modified: trunk/packager/yast2-packager.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/yast2-packager.spec.in?rev=41684&r1=41683&r2=41684&view=diff ============================================================================== --- trunk/packager/yast2-packager.spec.in (original) +++ trunk/packager/yast2-packager.spec.in Wed Oct 31 14:15:08 2007 @@ -3,7 +3,9 @@ @HEADER@ BuildRequires: gcc-c++ libxcrypt-devel yast2-country yast2-xml docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-testsuite yast2-slp -BuildRequires: yast2 >= 2.16.2 + +# Installation::installedVersion && Installation::updateVersion +BuildRequires: yast2 >= 2.16.4 # Module: OneClickInstallStandard Requires: perl-XML-Bare yast2-perl-bindings -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org