Hello community, here is the log from the commit of package yast2-storage checked in at Mon Oct 30 22:51:43 CET 2006. -------- --- yast2-storage/yast2-storage.changes 2006-10-24 12:38:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2006-10-30 18:15:47.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Oct 30 16:33:30 CET 2006 - fehr@suse.de + +- fix missing LVM/EVMS/HOME proposal buttons on empty disk (#215674) +- fix too small boot partition with VM proposal on PPC (#216222) +- version 2.14.14 + +------------------------------------------------------------------- +Thu Oct 26 13:17:08 CEST 2006 - fehr@suse.de + +- map SLES releases to SL releases in Storage::Update (#153576) + +------------------------------------------------------------------- +Wed Oct 25 10:47:43 CEST 2006 - fehr@suse.de + +- add code to detect mismatch of kernel and modules + +------------------------------------------------------------------- Old: ---- yast2-storage-2.14.13.tar.bz2 New: ---- yast2-storage-2.14.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.pr3thf/_old 2006-10-30 22:51:28.000000000 +0100 +++ /var/tmp/diff_new_pack.pr3thf/_new 2006-10-30 22:51:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.14.13) +# spec file for package yast2-storage (Version 2.14.14) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-storage -Version: 2.14.13 +Version: 2.14.14 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.14.13.tar.bz2 +Source0: yast2-storage-2.14.14.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings @@ -40,7 +40,7 @@ %prep -%setup -n yast2-storage-2.14.13 +%setup -n yast2-storage-2.14.14 %build %{prefix}/bin/y2tool y2autoconf @@ -165,6 +165,14 @@ %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog -n yast2-storage +* Mon Oct 30 2006 - fehr@suse.de +- fix missing LVM/EVMS/HOME proposal buttons on empty disk (#215674) +- fix too small boot partition with VM proposal on PPC (#216222) +- version 2.14.14 +* Thu Oct 26 2006 - fehr@suse.de +- map SLES releases to SL releases in Storage::Update (#153576) +* Wed Oct 25 2006 - fehr@suse.de +- add code to detect mismatch of kernel and modules * Tue Oct 24 2006 - fehr@suse.de - enable special handling for exactly one selected partition in target partitioner (#214284) ++++++ yast2-storage-2.14.13.tar.bz2 -> yast2-storage-2.14.14.tar.bz2 ++++++ ++++ 6368 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.13/VERSION new/yast2-storage-2.14.14/VERSION --- old/yast2-storage-2.14.13/VERSION 2006-10-24 12:38:55.000000000 +0200 +++ new/yast2-storage-2.14.14/VERSION 2006-10-26 13:50:07.000000000 +0200 @@ -1 +1 @@ -2.14.13 +2.14.14 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.13/libstorage/src/Storage.cc new/yast2-storage-2.14.14/libstorage/src/Storage.cc --- old/yast2-storage-2.14.13/libstorage/src/Storage.cc 2006-10-23 11:10:21.000000000 +0200 +++ new/yast2-storage-2.14.14/libstorage/src/Storage.cc 2006-10-30 16:35:08.000000000 +0100 @@ -98,6 +98,37 @@ zeroNewPartitions = false; defaultMountBy = MOUNTBY_DEVICE; detectMounted = true; + ifstream File( "/proc/version" ); + string line; + getline( File, line ); + File.close(); + y2mil( "kernel version:" << line ); + if( inst_sys ) + { + DIR *dir; + struct dirent *entry; + string mtest; + if( (dir=opendir( "/lib/modules" ))!=NULL ) + { + while( (entry=readdir( dir ))!=NULL ) + { + if( strcmp( entry->d_name, "." )!=0 && + strcmp( entry->d_name, ".." )!=0 ) + { + y2mil( "modules dir:" << entry->d_name ); + line = (string)"/lib/modules/" + entry->d_name + "/updates/initrd/ext3.ko"; + if( access( line.c_str(), R_OK )==0 ) + mtest = line; + } + } + closedir( dir ); + } + if( mtest.length()>0 ) + { + line = "/sbin/modinfo " + mtest; + SystemCmd c( line ); + } + } } void @@ -3703,6 +3734,10 @@ new_pair = false; } pt++; + SystemCmd c; + c.execute( "dmsetup ls" ); + c.execute( "dmsetup table" ); + c.execute( "dmsetup info" ); logProcData(); } if( evms_activate && haveEvms() ) @@ -3790,7 +3825,8 @@ static bool isDmContainer( const Container& co ) { - return( co.type()==EVMS || co.type()==DM || co.type()==LVM ); + return( co.type()==EVMS || co.type()==DM || co.type()==LVM || + co.type()==DMRAID ); } bool Storage::removeDmMapsTo( const string& dev, bool also_evms ) @@ -4423,6 +4459,7 @@ bool ret = false; if( c.retcode()==0 ) { + c.execute( "dmsetup info \"" + table + "\"" ); c.execute( "dmsetup remove \"" + table + "\"" ); waitForDevice(); ret = c.retcode()==0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.13/storage/src/include/auto_part_ui.ycp new/yast2-storage-2.14.14/storage/src/include/auto_part_ui.ycp --- old/yast2-storage-2.14.13/storage/src/include/auto_part_ui.ycp 2006-09-18 19:48:20.000000000 +0200 +++ new/yast2-storage-2.14.14/storage/src/include/auto_part_ui.ycp 2006-10-30 16:35:55.000000000 +0100 @@ -9,7 +9,7 @@ * * * - * $Id: auto_part_ui.ycp 32957 2006-09-18 17:49:54Z fehr $ + * $Id: auto_part_ui.ycp 33868 2006-10-30 15:35:53Z fehr $ * * used globals: * @@ -79,7 +79,6 @@ define map construct_partition_dialog( list<map> partitions, string ptype, integer bps ) ``{ - map cfg = Storage::GetControlCfg(); term vbox_contents = `VBox( // Message between the full name of the hard disk to use // and the "Use entire hard disk" button @@ -122,32 +121,14 @@ } } }); - - vbox_contents = add (vbox_contents, `VSpacing(1.5) ); - vbox_contents = add (vbox_contents, - `Left( `HBox(`HSpacing(3), - `CheckBox( `id(`home), - // Label text - _("Propose Separate &Home Partition" ), - cfg["home"]:false )))); - vbox_contents = add (vbox_contents, `VSpacing(1) ); - vbox_contents = add( vbox_contents, - `Left(`HBox(`HSpacing(3), `CheckBox(`id(`lvm), `opt(`notify), - // Label text - _("Create &LVM Based Proposal"), cfg["prop_lvm"]:false )))); - if( cfg["evms_config"]:false ) - vbox_contents = add( vbox_contents, - `Left(`HBox(`HSpacing(3), `CheckBox(`id(`evms), `opt(`notify), - // Label text - _("Create &EVMS Based Proposal"), cfg["prop_evms"]:false )))); return $[ "term": vbox_contents, "high_id": ui_id ]; }; define term create_whole_disk_dialog () ``{ // There were no prior partitions on this disk. // No partitions to choose from will be displayed. - return (`Left(`Label( sformat(_("There are no partitions on this disk yet. -The entire disk will be used for %1."),Product::name)))); + return (`VBox(`Left(`Label( sformat(_("There are no partitions on this disk yet. +The entire disk will be used for %1."),Product::name))))); }; define term create_resize_dialog (list<map> partitions, integer bps) @@ -156,13 +137,7 @@ string explanation = _("This disk appears to be used by Windows. There is not enough space to install Linux."); - map pentry = partitions[0]:$[]; - string part_name = sformat ( "%1, %2 (%3)", - ByteToHumanString(size_of_region(pentry["region"]:[], bps )), - pentry["fstype"]:"", - pentry["device"]:"" ); - - return (`HVSquash ( + return (`VBox( `RadioButtonGroup ( `HBox( `HSpacing(1.5), @@ -232,7 +207,7 @@ `VSpacing(0.5), // All partitions are listed that are found on the target (hard disk). - `Left(`HVSquash( targetbox ) ), + `VSquash( targetbox ), `VSpacing(0.5) ), `HSpacing() @@ -266,7 +241,6 @@ // Information what to do, background information Wizard::SetContents( _("Preparing Hard Disk -- Step 2"), `HCenter( - `HSquash( `Frame( // Frame title for installation target hard disk / partition(s) _("Installing on:"), @@ -281,14 +255,38 @@ `VSpacing(0.5), // All partitions are listed that are found on the target (hard disk). - `Left(`HVSquash( targetbox ) ), + `VSquash(targetbox), `VSpacing(0.5) ), `HSpacing() ) ) - ) ), helptext, (boolean)WFM::Args(0), (boolean)WFM::Args (1)); }; +term add_common_widgets( term vbox ) + { + map cfg = Storage::GetControlCfg(); + term vb = `VBox(); + vb = add (vb, + `Left(`HBox(`HSpacing(3), `CheckBox( `id(`home), + // Label text + _("Propose Separate &Home Partition" ), + cfg["home"]:false )))); + vb = add (vb, `VSpacing(1) ); + vb = add( vb, + `Left(`HBox(`HSpacing(3), `CheckBox(`id(`lvm), `opt(`notify), + // Label text + _("Create &LVM Based Proposal"), cfg["prop_lvm"]:false )))); + if( cfg["evms_config"]:false ) + vb = add( vb, + `Left(`HBox(`HSpacing(3), `CheckBox(`id(`evms), `opt(`notify), + // Label text + _("Create &EVMS Based Proposal"), + cfg["prop_evms"]:false )))); + vbox = add (vbox, `VSpacing(1.5) ); + term frame = `HVCenter(`Frame( _( "Proposal type" ), `HVCenter(vb) )); + vbox = add (vbox, frame ); + return( vbox ); + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.13/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.14.14/storage/src/include/do_proposal_flexible.ycp --- old/yast2-storage-2.14.13/storage/src/include/do_proposal_flexible.ycp 2006-10-12 15:30:02.000000000 +0200 +++ new/yast2-storage-2.14.14/storage/src/include/do_proposal_flexible.ycp 2006-10-30 19:02:00.000000000 +0100 @@ -14,7 +14,7 @@ * ************************************************************* - $Id: do_proposal_flexible.ycp 33354 2006-10-12 13:30:00Z fehr $ + $Id: do_proposal_flexible.ycp 33906 2006-10-30 18:01:58Z fehr $ */ { @@ -217,6 +217,7 @@ map ret = $[]; ret["ok"] = false; + integer fsid = conf["partitions",0,"id"]:0; if( Storage::IsPartitionable( disk )) { y2milestone( "do_vm_disk_conf processing disk %1", dev ); @@ -243,7 +244,11 @@ if( !ok ) { integer gstart = -1; - integer cyl_num = tc["partitions",1,"cylinders"]:0; + map bo = find( map p, (list<map>)tc["partitions"]:[], + ``(p["mount"]:""==boot["mount"]:"") ); + y2milestone( "do_vm_disk_conf boot %1", bo ); + integer cyl_num = bo["cylinders"]:1; + y2milestone( "do_vm_disk_conf boot cyl %1", cyl_num ); gap["gap"] = maplist( map g, gap["gap"]:[], ``{ if( !g["exists"]:false && !ok && g["cylinders"]:0>=cyl_num && @@ -301,7 +306,6 @@ ret["weight"] = 0; if( ok && size(vmkey)==0 ) { - integer fsid = tc["partitions",0,"id"]:0; if( size(gap["ext_reg"]:[])>0 ) { integer ext_end = gap["ext_reg",0]:0 + gap["ext_reg",1]:0 - 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.13/storage/src/inst_target_part.ycp new/yast2-storage-2.14.14/storage/src/inst_target_part.ycp --- old/yast2-storage-2.14.13/storage/src/inst_target_part.ycp 2006-09-18 19:48:20.000000000 +0200 +++ new/yast2-storage-2.14.14/storage/src/inst_target_part.ycp 2006-10-30 16:35:55.000000000 +0100 @@ -9,7 +9,7 @@ * -Ask the user which partition to use. * -Check the input and return error-messages. * - * $Id: inst_target_part.ycp 32957 2006-09-18 17:49:54Z fehr $ + * $Id: inst_target_part.ycp 33868 2006-10-30 15:35:53Z fehr $ */ { textdomain "storage"; @@ -172,6 +172,7 @@ // this is the resize case // vbox = create_resize_dialog (partitions, target["cyl_size"]:1 ); + vbox = add_common_widgets( vbox ); y2milestone ("can resize !"); } else @@ -181,7 +182,7 @@ map tmp = construct_partition_dialog( partitions, target["label"]:"", target["cyl_size"]:1 ); - vbox = tmp["term"]:`Empty(); + vbox = add_common_widgets( tmp["term"]:`Empty() ); } } @@ -190,6 +191,7 @@ else { vbox = create_whole_disk_dialog(); + vbox = add_common_widgets( vbox ); Storage::SetWholeDisk( true ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.14.13/storage/src/modules/Storage.ycp new/yast2-storage-2.14.14/storage/src/modules/Storage.ycp --- old/yast2-storage-2.14.13/storage/src/modules/Storage.ycp 2006-10-23 15:25:13.000000000 +0200 +++ new/yast2-storage-2.14.14/storage/src/modules/Storage.ycp 2006-10-26 13:20:42.000000000 +0200 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen näher erklärt. * - * $Id: Storage.ycp 33576 2006-10-23 13:25:11Z fehr $ + * $Id: Storage.ycp 33681 2006-10-26 11:20:40Z fehr $ */ { @@ -4829,6 +4829,23 @@ global define void Update( map oldv, map newv ) ``{ y2milestone( "Update old:%1 new:%2", oldv, newv ); + + // Enterprise products do not have minor release number + // map enterprise releases to corresponding code bases of SL + map sles_major_to_minor = $[ 8 : 2, 9 : 1, 10 : 1 ]; + if( haskey( oldv, "major" ) && !haskey( oldv, "minor" ) ) + { + oldv["minor"] = sles_major_to_minor[oldv["major"]:0]:0; + y2milestone( "Update old:%1", oldv ); + } + if( haskey( newv, "major" ) && !haskey( newv, "minor" ) ) + { + newv["minor"] = sles_major_to_minor[newv["major"]:0]:0; + y2milestone( "Update new:%1", newv ); + } + if( !haskey( oldv, "major" ) || !haskey( newv, "major" ) ) + y2error( "Missing key major or minor" ); + if( oldv["major"]:0<=9 ) { UpdateFstabSysfs(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org