September 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62514 - /branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp
by jsrain＠svn2.opensuse.org 30 Sep '10

30 Sep '10

Author: jsrain Date: Thu Sep 30 18:33:37 2010 New Revision: 62514 URL: http://svn.opensuse.org/viewcvs/yast?rev=62514&view=rev Log: remove code breaking auto upgrade in some cases Modified: branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp Modified: branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp (original) +++ branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp Thu Sep 30 18:33:37 2010 @@ -61,15 +61,6 @@ } symbol ret = RootPartitionDialog (`update_dialog); -if (ret == `next) -{ - ret = ProductControl::RunFrom ( - ProductControl::CurrentStep () + 1, - false); - if (ret == `next) - ret = `finish; -} - 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] r62513 - /tags/stable-2_20_0/pkg-bindings/
by lslezak＠svn2.opensuse.org 30 Sep '10

30 Sep '10

Author: lslezak Date: Thu Sep 30 18:26:55 2010 New Revision: 62513 URL: http://svn.opensuse.org/viewcvs/yast?rev=62513&view=rev Log: Created tag stable-2_20_0 for pkg-bindings Added: tags/stable-2_20_0/pkg-bindings/ - copied from r62512, trunk/pkg-bindings/ -- 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] r62512 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Resolvable_Patches.cc
by lslezak＠svn2.opensuse.org 30 Sep '10

30 Sep '10

Author: lslezak Date: Thu Sep 30 18:26:37 2010 New Revision: 62512 URL: http://svn.opensuse.org/viewcvs/yast?rev=62512&view=rev Log: - don't preselect locked patches (bnc#627316) - 2.20.0 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Resolvable_Patches.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=62512&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Thu Sep 30 18:26:37 2010 @@ -1 +1 @@ -2.19.1 +2.20.0 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Sep 30 18:26:37 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 30 16:23:06 UTC 2010 - lslezak(a)suse.cz + +- don't preselect locked patches (bnc#627316) +- 2.20.0 + +------------------------------------------------------------------- Wed Apr 21 17:22:31 UTC 2010 - lslezak(a)suse.cz - reload services rnd epositories after service refresh to avoid Modified: trunk/pkg-bindings/src/Resolvable_Patches.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Patc… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Patches.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Patches.cc Thu Sep 30 18:26:37 2010 @@ -95,7 +95,7 @@ y2milestone("Procesing patch %s", (*it)->name().c_str()); zypp::ui::Selectable::Ptr s = *it; - if (s && s->isNeeded()) + if (s && s->isNeeded() && !s->isUnwanted()) { zypp::Patch::constPtr patch = zypp::dynamic_pointer_cast<const zypp::Patch> (s->candidateObj().resolvable()); -- 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] r62511 - /branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp
by jsrain＠svn2.opensuse.org 30 Sep '10

30 Sep '10

Author: jsrain Date: Thu Sep 30 18:08:35 2010 New Revision: 62511 URL: http://svn.opensuse.org/viewcvs/yast?rev=62511&view=rev Log: fixed partition filter Modified: branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp Modified: branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp (original) +++ branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp Thu Sep 30 18:08:35 2010 @@ -29,7 +29,6 @@ map<string,map> partitions = filter (string name, map p, RootPart::rootPartitions, { - return true; return p[`valid]:false; }); -- 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] r62510 - /branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp
by jsrain＠svn2.opensuse.org 30 Sep '10

30 Sep '10

Author: jsrain Date: Thu Sep 30 17:26:12 2010 New Revision: 62510 URL: http://svn.opensuse.org/viewcvs/yast?rev=62510&view=rev Log: added missing file Added: branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp Added: branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp (added) +++ branches/tmp/jsrain/unattended-migration/update/src/clients/inst_update_partition_auto.ycp Thu Sep 30 17:26:12 2010 @@ -0,0 +1,76 @@ +/** + * 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, { + return true; + 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); + +if (ret == `next) +{ + ret = ProductControl::RunFrom ( + ProductControl::CurrentStep () + 1, + false); + if (ret == `next) + ret = `finish; +} + +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] r62509 - in /branches/tmp/jsrain/unattended-migration/update: src/clients/Makefile.am yast2-update.spec.in
by jsrain＠svn2.opensuse.org 30 Sep '10

30 Sep '10

Author: jsrain Date: Thu Sep 30 17:23:35 2010 New Revision: 62509 URL: http://svn.opensuse.org/viewcvs/yast?rev=62509&view=rev Log: missed commit Modified: branches/tmp/jsrain/unattended-migration/update/src/clients/Makefile.am branches/tmp/jsrain/unattended-migration/update/yast2-update.spec.in Modified: branches/tmp/jsrain/unattended-migration/update/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/update/src/clients/Makefile.am (original) +++ branches/tmp/jsrain/unattended-migration/update/src/clients/Makefile.am Thu Sep 30 17:23:35 2010 @@ -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: branches/tmp/jsrain/unattended-migration/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/update/yast2-update.spec.in (original) +++ branches/tmp/jsrain/unattended-migration/update/yast2-update.spec.in Thu Sep 30 17:23:35 2010 @@ -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] r62508 - /branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp
by jsrain＠svn2.opensuse.org 30 Sep '10

30 Sep '10

Author: jsrain Date: Thu Sep 30 17:22:32 2010 New Revision: 62508 URL: http://svn.opensuse.org/viewcvs/yast?rev=62508&view=rev Log: initialize properly also for autoupgrade Modified: branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp Modified: branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp (original) +++ branches/tmp/jsrain/unattended-migration/storage/storage/src/modules/Storage.ycp Thu Sep 30 17:22:32 2010 @@ -311,7 +311,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); -- 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] r62507 - /branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoinstConfig.ycp
by jsrain＠svn2.opensuse.org 30 Sep '10

30 Sep '10

Author: jsrain Date: Thu Sep 30 10:49:54 2010 New Revision: 62507 URL: http://svn.opensuse.org/viewcvs/yast?rev=62507&view=rev Log: - forgotten commit - get the profile properly in case of upgrade (bnc#642275) Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoinstConfig.ycp Modified: branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoinstConfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migrati… ============================================================================== --- branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoinstConfig.ycp (original) +++ branches/tmp/jsrain/unattended-migration/autoinstallation/src/modules/AutoinstConfig.ycp Thu Sep 30 10:49:54 2010 @@ -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] r62506 - in /trunk/storage: VERSION package/yast2-storage.changes yast2-storage.spec.in
by aschnell＠svn2.opensuse.org 27 Sep '10

27 Sep '10

Author: aschnell Date: Mon Sep 27 11:20:36 2010 New Revision: 62506 URL: http://svn.opensuse.org/viewcvs/yast?rev=62506&view=rev Log: - increased version Modified: trunk/storage/VERSION trunk/storage/package/yast2-storage.changes trunk/storage/yast2-storage.spec.in Modified: trunk/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/VERSION?rev=62506&r1=625… ============================================================================== --- trunk/storage/VERSION (original) +++ trunk/storage/VERSION Mon Sep 27 11:20:36 2010 @@ -1 +1 @@ -2.20.2 +2.20.3 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 Mon Sep 27 11:20:36 2010 @@ -2,6 +2,7 @@ Thu Sep 23 12:33:40 CEST 2010 - aschnell(a)suse.de - do not allow resizing of VFAT on logical volumes +- 2.20.3 ------------------------------------------------------------------- Mon Sep 13 14:36:20 CEST 2010 - fehr(a)suse.de Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Mon Sep 27 11:20:36 2010 @@ -5,7 +5,7 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.20.1 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.20.3 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings perl = %{perl_version} -- 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] r62505 - in /trunk/storage/storage/src: include/ep-raid-lib.ycp modules/Storage.ycp
by aschnell＠svn2.opensuse.org 27 Sep '10

27 Sep '10

Author: aschnell Date: Mon Sep 27 10:38:30 2010 New Revision: 62505 URL: http://svn.opensuse.org/viewcvs/yast?rev=62505&view=rev Log: - adapted to libstorage md raid spare changes Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-lib.ycp Mon Sep 27 10:38:30 2010 @@ -17,7 +17,7 @@ foreach(string dev, devs, { Storage::SetPartitionId(dev, Partitions::fsid_raid); Storage::SetPartitionFormat(dev, false, `none); - if (!Storage::ExtendMd(raid_nr, dev)) + if (!Storage::ExtendMd(raid_nr, [ dev ])) ret = false; }); @@ -31,7 +31,7 @@ foreach(string dev, devs, { Storage::UnchangePartitionId(dev); - if (!Storage::ShrinkMd(raid_nr, dev)) + if (!Storage::ShrinkMd(raid_nr, [ dev ])) ret = false; }); Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Mon Sep 27 10:38:30 2010 @@ -2690,7 +2690,7 @@ integer tmp = conv_mdstring[type]:0; list<string> dummy = []; string rd = sformat("/dev/md%1", nr ); - ret = LibStorage::StorageInterface::createMd( sint, rd, tmp, dummy ); + ret = LibStorage::StorageInterface::createMd(sint, rd, tmp, dummy, dummy); if( ret<0 ) y2error( "CreateMd sint ret:%1", ret ); UpdateTargetMapDisk( "/dev/md" ); @@ -2707,33 +2707,36 @@ if (v == type) tmp = k; }); - + + list<string> dummy = []; string rd = sformat("/dev/md%1", nr ); - ret = LibStorage::StorageInterface::createMd(sint, rd, tmp, devices); + ret = LibStorage::StorageInterface::createMd(sint, rd, tmp, devices, dummy); if( ret<0 ) y2error( "CreateMdWithDevs sint ret:%1", ret ); UpdateTargetMap(); return ret==0; } -global boolean ExtendMd( integer nr, string dev ) +global boolean ExtendMd( integer nr, list<string> devs ) { - y2milestone( "ExtendMd nr:%1 dev:%2", nr, dev ); + y2milestone( "ExtendMd nr:%1 devs:%2", nr, devs ); integer ret = 0; + list<string> dummy = []; string rd = sformat("/dev/md%1", nr ); - ret = LibStorage::StorageInterface::extendMd( sint, rd, dev ); + ret = LibStorage::StorageInterface::extendMd( sint, rd, devs, dummy ); if( ret<0 ) y2error( "ExtendMd sint ret:%1", ret ); UpdateTargetMap(); return( ret==0 ); } -global boolean ShrinkMd( integer nr, string dev ) +global boolean ShrinkMd( integer nr, list<string> devs ) { - y2milestone( "ShrinkMd nr:%1 dev:%2", nr, dev ); + y2milestone( "ShrinkMd nr:%1 devs:%2", nr, devs ); integer ret = 0; + list<string> dummy = []; string rd = sformat("/dev/md%1", nr ); - ret = LibStorage::StorageInterface::shrinkMd( sint, rd, dev ); + ret = LibStorage::StorageInterface::shrinkMd( sint, rd, devs, dummy ); if( ret<0 ) y2error( "ShrinkMd sint ret:%1", ret ); UpdateTargetMap(); @@ -2812,7 +2815,8 @@ tmp = k; }); - ret = LibStorage::StorageInterface::computeMdSize(sint, tmp, devices, sizeK); + list<string> dummy = []; + ret = LibStorage::StorageInterface::computeMdSize(sint, tmp, devices, dummy, sizeK); if( ret!=0 ) y2milestone( "ComputeMdSize sint ret:%1", ret ); return ret; @@ -3007,12 +3011,10 @@ ret = Storage::CreateMd( p["nr"]:0, p["raid_type"]:"raid1" ); if( ret && haskey( p, "chunk_size" )) Storage::ChangeMdChunk( p["nr"]:0, p["chunk_size"]:4 ); - if( ret && HasRaidParity( p["raid_type"]:"" ) && - haskey( p, "parity_algorithm" )) - Storage::ChangeMdParity( p["nr"]:0, - p["parity_algorithm"]:"" ); - foreach( string d, p["devices"]:[], - ``{ret=Storage::ExtendMd( p["nr"]:0, d )&&ret;}); + if( ret && HasRaidParity( p["raid_type"]:"" ) && haskey( p, "parity_algorithm" )) + Storage::ChangeMdParity(p["nr"]:0, p["parity_algorithm"]:""); + if (ret) + ret = Storage::ExtendMd(p["nr"]:0, p["devices"]:[]); } else if( ctype == `CT_LOOP ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0