Hello community, here is the log from the commit of package yast2-storage checked in at Fri Aug 31 16:07:18 CEST 2007. -------- --- yast2-storage/yast2-storage.changes 2007-08-28 23:41:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-08-30 17:14:34.000000000 +0200 @@ -2 +2 @@ -Tue Aug 28 23:42:34 CEST 2007 - cthiel@suse.de +Thu Aug 30 11:37:39 CEST 2007 - fehr@suse.de @@ -4 +4,10 @@ -- fix build (require kpartx instead of partx) +- call insserv for boot.crypto during update from <=10.2 (#305105) +- restart boot.quota if quota options have changed (#304841) +- prevent proposal of install medium under XEN (#297321) +- version 2.15.23 + +------------------------------------------------------------------- +Tue Aug 28 17:28:32 CEST 2007 - fehr@suse.de + +- try a remount if fstab options change and umount/mount is not + possible (#304841) Old: ---- yast2-storage-2.15.22.tar.bz2 New: ---- yast2-storage-2.15.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.dF5487/_old 2007-08-31 16:06:46.000000000 +0200 +++ /var/tmp/diff_new_pack.dF5487/_new 2007-08-31 16:06:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.15.22) +# spec file for package yast2-storage (Version 2.15.23) # # Copyright (c) 2007 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.15.22 -Release: 2 +Version: 2.15.23 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.15.22.tar.bz2 +Source0: yast2-storage-2.15.23.tar.bz2 prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms evms-devel 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 # Required only in inst-sys @@ -44,7 +44,7 @@ %prep -%setup -n yast2-storage-2.15.22 +%setup -n yast2-storage-2.15.23 %build %{prefix}/bin/y2tool y2autoconf @@ -171,8 +171,14 @@ %doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description %changelog -* Tue Aug 28 2007 - cthiel@suse.de -- fix build (require kpartx instead of partx) +* Thu Aug 30 2007 - fehr@suse.de +- call insserv for boot.crypto during update from <=10.2 (#305105) +- restart boot.quota if quota options have changed (#304841) +- prevent proposal of install medium under XEN (#297321) +- version 2.15.23 +* Tue Aug 28 2007 - fehr@suse.de +- try a remount if fstab options change and umount/mount is not + possible (#304841) * Tue Aug 28 2007 - fehr@suse.de - rename hotplug to nofail for iSCSI fstab entries (#302158) - droppend code from handling of INITRD_MODULES since it will not ++++++ yast2-storage-2.15.22.tar.bz2 -> yast2-storage-2.15.23.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.22/libstorage/src/StorageInterface.h new/yast2-storage-2.15.23/libstorage/src/StorageInterface.h --- old/yast2-storage-2.15.22/libstorage/src/StorageInterface.h 2007-07-26 12:21:19.000000000 +0200 +++ new/yast2-storage-2.15.23/libstorage/src/StorageInterface.h 2007-08-28 17:14:57.000000000 +0200 @@ -512,6 +512,7 @@ VOLUME_FORMAT_NOT_IMPLEMENTED = -3036, VOLUME_FORMAT_NFS_IMPOSSIBLE = -3037, VOLUME_CRYPT_NFS_IMPOSSIBLE = -3038, + VOLUME_REMOUNT_FAILED = -3039, LVM_CREATE_PV_FAILED = -4000, LVM_PV_ALREADY_CONTAINED = -4001, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.22/libstorage/src/Volume.cc new/yast2-storage-2.15.23/libstorage/src/Volume.cc --- old/yast2-storage-2.15.22/libstorage/src/Volume.cc 2007-08-13 16:49:54.000000000 +0200 +++ new/yast2-storage-2.15.23/libstorage/src/Volume.cc 2007-08-30 12:32:15.000000000 +0200 @@ -2323,6 +2323,21 @@ return( l!=NULL ); } +static bool haveQuota( const string& fstopt ) + { + bool ret = false; + list<string> opt = splitString( fstopt, "," ); + list<string>::const_iterator i = opt.begin(); + while( !ret && i!=opt.end() ) + { + ret = (*i=="usrquota") || (*i=="usrquota") || + i->find("usrjquota=")==0 || i->find("grpjquota=")==0; + ++i; + } + y2mil( "fstopt:" << fstopt << " ret:" << ret ); + return( ret ); + } + int Volume::doFstabUpdate() { int ret = 0; @@ -2449,6 +2464,7 @@ fstab_opt!=orig_fstab_opt && !orig_fstab_opt.empty() && mp==orig_mp && mp!="swap" ) { + SystemCmd c; y2mil( "fstab_opt:" << fstab_opt << " fstab_opt_orig:" << orig_fstab_opt ); y2mil( "remount:" << *this ); int r = umount( mp ); @@ -2458,6 +2474,18 @@ ret = mount( mp ); y2mil( "remount mount:" << ret ); } + else + { + c.execute( (string)"mount -oremount " + mp ); + y2mil( "remount remount:" << c.retcode() ); + if( c.retcode()!=0 ) + ret = VOLUME_REMOUNT_FAILED; + } + if( !cont->getStorage()->instsys() && + haveQuota(fstab_opt)!=haveQuota(orig_fstab_opt) ) + { + c.execute( "/etc/init.d/boot.quota restart" ); + } } y2milestone( "changed:%d ret:%d", changed, ret ); return( ret ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.22/storage/src/modules/Storage.ycp new/yast2-storage-2.15.23/storage/src/modules/Storage.ycp --- old/yast2-storage-2.15.22/storage/src/modules/Storage.ycp 2007-08-21 18:12:24.000000000 +0200 +++ new/yast2-storage-2.15.23/storage/src/modules/Storage.ycp 2007-08-30 14:10:00.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 40386 2007-08-21 16:12:23Z fehr $ + * $Id: Storage.ycp 40621 2007-08-30 12:09:59Z fehr $ */ { @@ -5351,6 +5351,12 @@ map bo = (map)SCR::Execute (.target.bash_output, cmd ); y2milestone( "Update bo %1", bo ); } + if( oldv["major"]:0<10 || (oldv["major"]:0==10 && oldv["minor"]:0<=2)) + { + string cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto"; + map bo = (map)SCR::Execute (.target.bash_output, cmd ); + y2milestone( "Update bo %1", bo ); + } } global define list<string> GetTranslatedDevices( map oldv, map newv, @@ -6349,7 +6355,19 @@ no_propose_disks = []; if( Stage::initial() && SCR::Read( .target.size, "/etc/install.inf" )>0 ) { - string inst = (string) SCR::Read( .etc.install_inf.Cdrom ); + string inst = (string) SCR::Read( .etc.install_inf.Partition ); + y2milestone( "NoProposeDisks .etc.install_inf.Partition \"%1\"", + inst ); + if( inst!=nil && size(inst)>0 ) + { + if( search( inst, "/dev/" )!=0 ) + inst = "/dev/" + inst; + map d = GetDiskPartition( inst ); + y2milestone( "NoProposeDisks inst:%1 disk:%2", inst, d ); + if( size(d["disk"]:"")>0 ) + no_propose_disks = add( no_propose_disks, d["disk"]:"" ); + } + inst = (string) SCR::Read( .etc.install_inf.Cdrom ); y2milestone( "NoProposeDisks .etc.install_inf.Cdrom \"%1\"", inst ); if( inst!=nil && size(inst)>0 ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.22/VERSION new/yast2-storage-2.15.23/VERSION --- old/yast2-storage-2.15.22/VERSION 2007-08-27 12:25:59.000000000 +0200 +++ new/yast2-storage-2.15.23/VERSION 2007-08-30 17:14:39.000000000 +0200 @@ -1 +1 @@ -2.15.22 +2.15.23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de