Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Sep 20 23:04:48 CEST 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-09-17 14:26:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-09-20 15:52:28.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Sep 20 15:50:27 CEST 2007 - fehr@suse.de
+
+- make importing fstab cope with changing disk names (#309774)
+- version 2.15.26
+
+-------------------------------------------------------------------
+Tue Sep 18 18:22:57 CEST 2007 - fehr@suse.de
+
+- fix wrong cryptotab line for old style encryption (#325597)
+
+-------------------------------------------------------------------
@@ -4 +15 @@
-- version 2.15.24
+- version 2.15.25
Old:
----
yast2-storage-2.15.25.tar.bz2
New:
----
yast2-storage-2.15.26.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.R25396/_old 2007-09-20 23:04:31.000000000 +0200
+++ /var/tmp/diff_new_pack.R25396/_new 2007-09-20 23:04:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.15.25)
+# spec file for package yast2-storage (Version 2.15.26)
#
# 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.25
+Version: 2.15.26
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.15.25.tar.bz2
+Source0: yast2-storage-2.15.26.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.25
+%setup -n yast2-storage-2.15.26
%build
%{prefix}/bin/y2tool y2autoconf
@@ -172,10 +172,14 @@
%doc %{prefix}/share/doc/packages/yast2-storage/examples
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
-
%changelog
+* Thu Sep 20 2007 - fehr@suse.de
+- make importing fstab cope with changing disk names (#309774)
+- version 2.15.26
+* Tue Sep 18 2007 - fehr@suse.de
+- fix wrong cryptotab line for old style encryption (#325597)
* Mon Sep 17 2007 - fehr@suse.de
-- version 2.15.24
+- version 2.15.25
* Thu Sep 13 2007 - fehr@suse.de
- change activation of md devices (#309841)
* Tue Sep 11 2007 - fehr@suse.de
++++++ yast2-storage-2.15.25.tar.bz2 -> yast2-storage-2.15.26.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/libstorage/src/LoopCo.h new/yast2-storage-2.15.26/libstorage/src/LoopCo.h
--- old/yast2-storage-2.15.25/libstorage/src/LoopCo.h 2007-07-18 12:39:00.000000000 +0200
+++ new/yast2-storage-2.15.26/libstorage/src/LoopCo.h 2007-09-18 13:49:59.000000000 +0200
@@ -90,7 +90,6 @@
bool findLoopDev( const string& dev, LoopIter& i );
void addLoop( Loop* m );
void updateEntry( const Loop* m );
- static int getFreeLoop( string& dev );
void init();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/libstorage/src/Storage.cc new/yast2-storage-2.15.26/libstorage/src/Storage.cc
--- old/yast2-storage-2.15.25/libstorage/src/Storage.cc 2007-09-13 12:17:22.000000000 +0200
+++ new/yast2-storage-2.15.26/libstorage/src/Storage.cc 2007-09-20 14:56:00.000000000 +0200
@@ -5748,6 +5748,7 @@
Storage::readFstab( const string& dir, deque<VolumeInfo>& infos )
{
static deque<VolumeInfo> vil;
+ static Regex disk_part( "^/dev/[sh]d[a-z]+[0-9]+$" );
vil.clear();
bool ret = false;
VolIterator vol;
@@ -5759,13 +5760,31 @@
for( list<FstabEntry>::const_iterator i=le.begin(); i!=le.end(); ++i )
{
y2mil( "entry:" << *i );
- if( findVolume( i->dentry, vol ) )
+ VolumeInfo* info = NULL;
+ if( disk_part.match( i->dentry ) )
{
- VolumeInfo info;
- vol->getInfo( info );
- vol->mergeFstabInfo( info, *i );
+ info = new VolumeInfo;
+ info->create = info->format = info->resize = false;
+ info->sizeK = info->OrigSizeK = info->minor = info->major = 0;
+ info->device = i->dentry;
+ info->mount = i->mount;
+ info->mount_by = MOUNTBY_DEVICE;
+ info->fs = Volume::toFsType( i->fs );
+ info->fstab_options = mergeString( i->opts, "," );
+ vil.push_back( *info );
+ }
+ else if( findVolume( i->dentry, vol ) )
+ {
+ info = new VolumeInfo;
+ vol->getInfo( *info );
+ vol->mergeFstabInfo( *info, *i );
y2mil( "volume:" << *vol );
- vil.push_back( info );
+ vil.push_back( *info );
+ }
+ if( info )
+ {
+ delete info;
+ info = NULL;
}
}
delete fstab;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/libstorage/src/Volume.cc new/yast2-storage-2.15.26/libstorage/src/Volume.cc
--- old/yast2-storage-2.15.25/libstorage/src/Volume.cc 2007-09-05 12:06:17.000000000 +0200
+++ new/yast2-storage-2.15.26/libstorage/src/Volume.cc 2007-09-18 18:19:15.000000000 +0200
@@ -2268,7 +2268,7 @@
if( cont->type()!=LOOP )
{
if( dmcrypt() )
- ret = optNoauto()?dev:dmcrypt_dev;
+ ret = (inCryptotab()||optNoauto())?dev:dmcrypt_dev;
else
ret = getMountByString( mount_by, dev, uuid, label );
}
@@ -2414,8 +2414,11 @@
{
changed = true;
che.encr = encryption;
- if( !dmcrypt() )
+ if( inCryptotab() )
+ {
+ getFreeLoop();
che.loop_dev = fstab_loop_dev;
+ }
che.dentry = de;
if( encryption!=ENC_NONE )
che.freq = che.passno = 0;
@@ -2448,8 +2451,11 @@
che.encr = encryption;
if( dmcrypt() && isTmpCryptMp(mp) && crypt_pwd.empty() )
che.tmpcrypt = true;
- if( !dmcrypt() )
+ if( inCryptotab() )
+ {
+ getFreeLoop();
che.loop_dev = fstab_loop_dev;
+ }
che.fs = fs_names[fs];
getFstabOpts( che.opts );
che.mount = mp;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/libstorage/src/Volume.h new/yast2-storage-2.15.26/libstorage/src/Volume.h
--- old/yast2-storage-2.15.25/libstorage/src/Volume.h 2007-08-28 17:07:46.000000000 +0200
+++ new/yast2-storage-2.15.26/libstorage/src/Volume.h 2007-09-18 14:42:13.000000000 +0200
@@ -157,7 +157,7 @@
string sizeString() const;
string bootMount() const;
bool optNoauto() const;
- bool inCryptotab() const { return( encryption!=ENC_LUKS && is_loop && !optNoauto() ); }
+ bool inCryptotab() const { return( encryption!=ENC_LUKS && !optNoauto() ); }
bool inCrypttab() const { return( encryption==ENC_LUKS && !optNoauto() ); }
virtual void print( std::ostream& s ) const { s << *this; }
int getFreeLoop();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.25/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.15.26/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.15.25/storage/src/include/custom_part_lib.ycp 2007-08-27 15:41:53.000000000 +0200
+++ new/yast2-storage-2.15.26/storage/src/include/custom_part_lib.ycp 2007-09-20 15:52:49.000000000 +0200
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 40502 2007-08-27 13:41:53Z fehr $
+ $Id: custom_part_lib.ycp 40987 2007-09-20 13:52:49Z fehr $
*
*/
@@ -28,6 +28,61 @@
#include "partitioning/partition_defines.ycp";
+define string mountVar( map var, map root, string rdev, string mp,
+ map