Hello community,
here is the log from the commit of package yast2-storage
checked in at Mon Sep 17 17:34:34 CEST 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-09-03 11:35:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-09-17 14:26:46.000000000 +0200
@@ -1,0 +2,41 @@
+Mon Sep 17 14:26:39 CEST 2007 - fehr@suse.de
+
+- version 2.15.24
+
+-------------------------------------------------------------------
+Thu Sep 13 12:54:38 CEST 2007 - fehr@suse.de
+
+- change activation of md devices (#309841)
+
+-------------------------------------------------------------------
+Tue Sep 11 12:23:42 CEST 2007 - fehr@suse.de
+
+- fix path creation on loop based files (#308995)
+
+-------------------------------------------------------------------
+Mon Sep 10 19:15:08 CEST 2007 - fehr@suse.de
+
+- do not autodetect NFS mount in instsys (#308618)
+- change windows detection to cover also Vista (#307802)
+- be more robust if /proc/swaps in invalid (#309050)
+
+-------------------------------------------------------------------
+Thu Sep 6 15:40:49 CEST 2007 - fehr@suse.de
+
+- fix problems mounting nfs in instsys (#308200)
+
+-------------------------------------------------------------------
+Wed Sep 5 12:02:21 CEST 2007 - fehr@suse.de
+
+- fix another case of nonzero passno for encrypted fstab
+ entries (#307221)
+
+-------------------------------------------------------------------
+Tue Sep 4 16:55:55 CEST 2007 - fehr@suse.de
+
+- fix problem with resizing encrypted volumes (#307222)
+- fix missing initialisation of tmpcrypt (#307219)
+- fix possible usage of nonzero passno for encrypted fstab entries
+ (#296409)
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.15.24.tar.bz2
New:
----
yast2-storage-2.15.25.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.Wc9783/_old 2007-09-17 17:34:18.000000000 +0200
+++ /var/tmp/diff_new_pack.Wc9783/_new 2007-09-17 17:34:18.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.15.24)
+# spec file for package yast2-storage (Version 2.15.25)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,13 +11,13 @@
# norootforbuild
Name: yast2-storage
-Version: 2.15.24
+Version: 2.15.25
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.15.24.tar.bz2
-prefix: /usr
+Source0: yast2-storage-2.15.25.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
# Requires: yast2-update
@@ -44,7 +44,7 @@
%prep
-%setup -n yast2-storage-2.15.24
+%setup -n yast2-storage-2.15.25
%build
%{prefix}/bin/y2tool y2autoconf
@@ -114,6 +114,7 @@
%{prefix}/lib/YaST2/bin/check.boot
# perl bindings of libstorage
%{perl_vendorarch}/LibStorage.so
+
%package evms
Requires: yast2-storage = %version
Summary: YaST2 - Storage Configuration EVMS
@@ -130,6 +131,7 @@
%defattr(-,root,root)
%{prefix}/lib/YaST2/bin/evms_access
/usr/share/YaST2/clients/inst_evms.ycp
+
%package lib
Requires: blocxx
Summary: YaST2 - Storage Configuration Library
@@ -148,6 +150,7 @@
%post lib
/sbin/ldconfig
+
%package devel
Requires: blocxx-devel libstdc++-devel
Summary: YaST2 - Storage Library Headers and Documentation
@@ -171,6 +174,26 @@
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Mon Sep 17 2007 - fehr@suse.de
+- version 2.15.24
+* Thu Sep 13 2007 - fehr@suse.de
+- change activation of md devices (#309841)
+* Tue Sep 11 2007 - fehr@suse.de
+- fix path creation on loop based files (#308995)
+* Mon Sep 10 2007 - fehr@suse.de
+- do not autodetect NFS mount in instsys (#308618)
+- change windows detection to cover also Vista (#307802)
+- be more robust if /proc/swaps in invalid (#309050)
+* Thu Sep 06 2007 - fehr@suse.de
+- fix problems mounting nfs in instsys (#308200)
+* Wed Sep 05 2007 - fehr@suse.de
+- fix another case of nonzero passno for encrypted fstab
+ entries (#307221)
+* Tue Sep 04 2007 - fehr@suse.de
+- fix problem with resizing encrypted volumes (#307222)
+- fix missing initialisation of tmpcrypt (#307219)
+- fix possible usage of nonzero passno for encrypted fstab entries
+ (#296409)
* Mon Sep 03 2007 - fehr@suse.de
- call insserv or insser -r for boot.{md,lvm,dmraid} as needed (#303857)
- version 2.15.24
++++++ yast2-storage-2.15.24.tar.bz2 -> yast2-storage-2.15.25.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.24/libstorage/src/EtcFstab.h new/yast2-storage-2.15.25/libstorage/src/EtcFstab.h
--- old/yast2-storage-2.15.24/libstorage/src/EtcFstab.h 2007-08-13 16:11:15.000000000 +0200
+++ new/yast2-storage-2.15.25/libstorage/src/EtcFstab.h 2007-09-04 16:33:18.000000000 +0200
@@ -16,7 +16,8 @@
struct FstabEntry
{
- FstabEntry() { freq=passno=0; crypto=cryptt=loop=noauto=dmcrypt=false;
+ FstabEntry() { freq=passno=0;
+ crypto=cryptt=loop=noauto=dmcrypt=tmpcrypt=false;
encr=storage::ENC_NONE; mount_by=storage::MOUNTBY_DEVICE; }
FstabEntry& operator=( const FstabChange& rhs );
friend std::ostream& operator<< (std::ostream& s, const FstabEntry &v );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.24/libstorage/src/Loop.cc new/yast2-storage-2.15.25/libstorage/src/Loop.cc
--- old/yast2-storage-2.15.24/libstorage/src/Loop.cc 2007-05-23 12:45:15.000000000 +0200
+++ new/yast2-storage-2.15.25/libstorage/src/Loop.cc 2007-09-11 11:47:24.000000000 +0200
@@ -174,6 +174,14 @@
bool ret = true;
if( !reuseFile )
{
+ string pa = lfileRealPath();
+ string::size_type pos;
+ if( (pos=pa.rfind( '/' ))!=string::npos )
+ {
+ pa.erase( pos );
+ y2mil( "pa:" << pa );
+ createPath( pa );
+ }
string cmd = "dd if=/dev/zero of=" + lfileRealPath();
cmd += " bs=1k count=" + decString( sizeK() );
SystemCmd c( cmd );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.24/libstorage/src/MdCo.cc new/yast2-storage-2.15.25/libstorage/src/MdCo.cc
--- old/yast2-storage-2.15.24/libstorage/src/MdCo.cc 2007-07-18 14:24:52.000000000 +0200
+++ new/yast2-storage-2.15.25/libstorage/src/MdCo.cc 2007-09-13 14:24:08.000000000 +0200
@@ -538,15 +538,21 @@
return( ret );
}
-void MdCo::activate( bool val )
+void MdCo::activate( bool val, const string& tmpDir )
{
- y2milestone( "old active:%d val:%d", active, val );
+ y2milestone( "old active:%d val:%d tmp:%s", active, val, tmpDir.c_str() );
if( active!=val )
{
SystemCmd c;
if( val )
{
- c.execute( "raidautorun" );
+ string mdconf = tmpDir + "/mdadm.conf";
+ string cmd = "echo 1 > /sys/module/md_mod/parameters/start_ro";
+ c.execute( cmd );
+ cmd = "mdadm --examine --scan --config=partitions >" + mdconf;
+ c.execute( cmd );
+ cmd = "mdadm --assemble --scan --config=" + mdconf;
+ c.execute( cmd );
}
else
{
@@ -625,7 +631,7 @@
if( m != NULL )
{
if( !active )
- activate(true);
+ activate(true, getStorage()->tmpDir());
if( !silent )
{
getStorage()->showInfoCb( m->removeText(true) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.24/libstorage/src/MdCo.h new/yast2-storage-2.15.25/libstorage/src/MdCo.h
--- old/yast2-storage-2.15.24/libstorage/src/MdCo.h 2007-07-18 12:38:40.000000000 +0200
+++ new/yast2-storage-2.15.25/libstorage/src/MdCo.h 2007-09-13 12:17:49.000000000 +0200
@@ -37,7 +37,7 @@
void syncRaidtab();
void changeDeviceName( const string& old, const string& nw );
- static void activate( bool val=true );
+ static void activate( bool val, const string& tmpDir );
int removeVolume( Volume* v );
protected:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.24/libstorage/src/ProcMounts.cc new/yast2-storage-2.15.25/libstorage/src/ProcMounts.cc
--- old/yast2-storage-2.15.24/libstorage/src/ProcMounts.cc 2007-07-24 15:50:20.000000000 +0200
+++ new/yast2-storage-2.15.25/libstorage/src/ProcMounts.cc 2007-09-10 19:04:03.000000000 +0200
@@ -104,6 +104,7 @@
mounts.clear();
mounts.open( "/proc/swaps" );
getline( mounts, line );
+ y2mil( "line:\"" << line << "\"" );
getline( mounts, line );
while( mounts.good() )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.24/libstorage/src/Storage.cc new/yast2-storage-2.15.25/libstorage/src/Storage.cc
--- old/yast2-storage-2.15.24/libstorage/src/Storage.cc 2007-08-16 16:11:30.000000000 +0200
+++ new/yast2-storage-2.15.25/libstorage/src/Storage.cc 2007-09-13 12:17:22.000000000 +0200
@@ -233,7 +233,7 @@
detectDisks( *ppart );
if( instsys() )
{
- MdCo::activate( true );
+ MdCo::activate( true, tmpDir() );
LvmVg::activate( true );
DmraidCo::activate( true );
delete ppart;
@@ -266,7 +266,8 @@
fstab = new EtcFstab( "/etc", isRootMounted() );
detectLoops( *ppart );
ProcMounts pm( this );
- detectNfs( pm );
+ if( !instsys() )
+ detectNfs( pm );
detectFsData( vBegin(), vEnd(), pm );
}
EvmsCoIterator e = findEvmsCo( "" );
@@ -3519,8 +3520,8 @@
}
int
-Storage::addNfsDevice( const string& nfsDev, unsigned long long sizeK,
- const string& mp )
+Storage::addNfsDevice( const string& nfsDev, const string& opts,
+ unsigned long long sizeK, const string& mp )
{
int ret = 0;
assertInit();
@@ -3540,7 +3541,7 @@
if( ret==0 && co!=NULL )
{
if( sizeK==0 )
- checkNfsDevice( nfsDev, sizeK );
+ checkNfsDevice( nfsDev, opts, sizeK );
ret = co->addNfs( nfsDev, sizeK, mp );
}
if( !have )
@@ -3559,7 +3560,8 @@
}
int
-Storage::checkNfsDevice( const string& nfsDev, unsigned long long& sizeK )
+Storage::checkNfsDevice( const string& nfsDev, const string& opts,
+ unsigned long long& sizeK )
{
int ret = 0;
assertInit();
@@ -3569,12 +3571,21 @@
rmdir( mdir.c_str() );
createPath( mdir );
ret = co.addNfs( nfsDev, 0, "" );
+ if( !opts.empty() )
+ co.vBegin()->setFstabOption( opts );
+ if( instsys() )
+ {
+ SystemCmd c;
+ c.execute( "/sbin/portmap" );
+ c.execute( "/usr/sbin/rpc.statd" );
+ }
if( ret==0 && (ret=co.vBegin()->mount( mdir ))==0 )
{
sizeK = getDfSize( mdir );
ret = co.vBegin()->umount( mdir );
}
- y2mil( "name:" << nfsDev << " ret:" << ret << " sizeK:" << sizeK );
+ y2mil( "name:" << nfsDev << " opts:" << opts << " ret:" << ret <<
+ " sizeK:" << sizeK );
return( ret );
}
@@ -5812,12 +5823,25 @@
string mdir = tmpDir() + "/tmp_mp";
unlink( mdir.c_str() );
rmdir( mdir.c_str() );
+ string save_opt;
+ string cur_opt;
+ if( vol->getFs()==NTFS )
+ {
+ save_opt = vol->getFstabOption();
+ cur_opt = save_opt;
+ if( !cur_opt.empty() )
+ cur_opt += ",";
+ cur_opt += "show_sys_files";
+ vol->changeFstabOptions( cur_opt );
+ }
if( vol->getFs()!=FSUNKNOWN && mkdir( mdir.c_str(), 0700 )==0 &&
mountDev( device, mdir ) )
{
needUmount = true;
mp = mdir;
}
+ if( vol->getFs()==NTFS )
+ vol->changeFstabOptions( save_opt );
}
else
mp = vol->getMount();
@@ -5864,7 +5888,8 @@
}
win = false;
const char * files[] = { "boot.ini", "msdos.sys", "io.sys",
- "config.sys", "MSDOS.SYS", "IO.SYS" };
+ "config.sys", "MSDOS.SYS", "IO.SYS",
+ "bootmgr", "$Boot" };
string f;
unsigned i=0;
while( !win && i