Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Apr 12 18:32:27 CEST 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-03-27 11:58:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-04-12 17:36:36.000000000 +0200
@@ -1,0 +2,25 @@
+Thu Apr 12 11:58:53 CEST 2007 - fehr@suse.de
+
+- handle LABEL= and UUID= in Storage::GetDiskPartitionTg (#263239)
+- add patch by Olaf to support Efika boards (#259827)
+- fix wrong handling of crypted dirs /tmp and /var/tmp (#263508)
+- version 2.15.8
+
+-------------------------------------------------------------------
+Wed Apr 11 12:50:22 CEST 2007 - fehr@suse.de
+
+- show first proposal screen even after using target partitioner
+ (#260341)
+
+-------------------------------------------------------------------
+Mon Apr 2 14:17:15 CEST 2007 - fehr@suse.de
+
+- add support for HFS+ filesystem (feature #302071)
+
+-------------------------------------------------------------------
+Fri Mar 30 08:24:50 CEST 2007 - locilka@suse.cz
+
+- SCR agent proc_meminfo.scr moved from yast2-storage to yast2
+- Adjusted RPM dependencies
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.15.7.tar.bz2
New:
----
yast2-storage-2.15.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.K31961/_old 2007-04-12 18:32:12.000000000 +0200
+++ /var/tmp/diff_new_pack.K31961/_new 2007-04-12 18:32:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.15.7)
+# spec file for package yast2-storage (Version 2.15.8)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,19 @@
# norootforbuild
Name: yast2-storage
-Version: 2.15.7
+Version: 2.15.8
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.15.7.tar.bz2
+Source0: yast2-storage-2.15.8.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
# Required only in inst-sys
# Requires: yast2-update
-Requires: yast2 parted yast2-installation yast2-storage-lib yast2-perl-bindings autoyast2-installation
+Requires: parted yast2-installation yast2-storage-lib yast2-perl-bindings autoyast2-installation
+# proc_meminfo.scr moved to yast2-2.15.23
+Requires: yast2 >= 2.15.23
%ifarch s390 s390x
Requires: yast2-s390
%endif
@@ -42,7 +44,7 @@
%prep
-%setup -n yast2-storage-2.15.7
+%setup -n yast2-storage-2.15.8
%build
%{prefix}/bin/y2tool y2autoconf
@@ -168,6 +170,19 @@
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Thu Apr 12 2007 - fehr@suse.de
+- handle LABEL= and UUID= in Storage::GetDiskPartitionTg (#263239)
+- add patch by Olaf to support Efika boards (#259827)
+- fix wrong handling of crypted dirs /tmp and /var/tmp (#263508)
+- version 2.15.8
+* Wed Apr 11 2007 - fehr@suse.de
+- show first proposal screen even after using target partitioner
+ (#260341)
+* Mon Apr 02 2007 - fehr@suse.de
+- add support for HFS+ filesystem (feature #302071)
+* Fri Mar 30 2007 - locilka@suse.cz
+- SCR agent proc_meminfo.scr moved from yast2-storage to yast2
+- Adjusted RPM dependencies
* Tue Mar 27 2007 - fehr@suse.de
- make Storage::SetPartitionData also work with /dev/disk/by-
devices (#257696)
++++++ yast2-storage-2.15.7.tar.bz2 -> yast2-storage-2.15.8.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/agents-scr/Makefile.am new/yast2-storage-2.15.8/agents-scr/Makefile.am
--- old/yast2-storage-2.15.7/agents-scr/Makefile.am 2005-07-21 15:31:05.000000000 +0200
+++ new/yast2-storage-2.15.8/agents-scr/Makefile.am 2007-04-02 09:29:19.000000000 +0200
@@ -1,11 +1,10 @@
#
# Makefile.am for storage/agents
#
-# $Id: Makefile.am 24216 2005-07-21 10:04:15Z arvin $
+# $Id: Makefile.am 37212 2007-03-30 06:30:45Z locilka $
#
scrconf_DATA = etc_cryptotab.scr \
- proc_meminfo.scr \
proc_swaps.scr \
proc_partitions.scr \
dasddev.scr \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/agents-scr/Makefile.in new/yast2-storage-2.15.8/agents-scr/Makefile.in
--- old/yast2-storage-2.15.7/agents-scr/Makefile.in 2007-03-13 09:53:33.000000000 +0100
+++ new/yast2-storage-2.15.8/agents-scr/Makefile.in 2007-04-10 11:01:46.000000000 +0200
@@ -17,7 +17,7 @@
#
# Makefile.am for storage/agents
#
-# $Id: Makefile.am 24216 2005-07-21 10:04:15Z arvin $
+# $Id: Makefile.am 37212 2007-03-30 06:30:45Z locilka $
#
srcdir = @srcdir@
@@ -214,7 +214,6 @@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
scrconf_DATA = etc_cryptotab.scr \
- proc_meminfo.scr \
proc_swaps.scr \
proc_partitions.scr \
dasddev.scr \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/agents-scr/proc_meminfo.scr new/yast2-storage-2.15.8/agents-scr/proc_meminfo.scr
--- old/yast2-storage-2.15.7/agents-scr/proc_meminfo.scr 2005-01-24 14:50:55.000000000 +0100
+++ new/yast2-storage-2.15.8/agents-scr/proc_meminfo.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,68 +0,0 @@
-/**
- * File:
- * proc_meminfo.scr
- * Summary:
- * SCR Agent for reading /proc/meminfo
- * Access:
- * read-only
- * Authors:
- * Unknown
- * See:
- * anyagent
- * libscr
- * Example:
- * Read(.proc.meminfo)
- * ($["buffers":26252,
- * "cached":82764,
- * "mem":$["buffers":26882048,
- * "cached":84750336,
- * "free":8835072,
- * "shared":0,
- * "total":268005376,
- * "used":259170304],
- * "memfree":8628,
- * "memshared":0, "memtotal":261724,
- * "swap":$["free":271425536,
- * "total":271425536,
- * "used":0]
- * ])
- *
- * $Id: proc_meminfo.scr 13018 2003-12-11 12:52:53Z jhumpol $
- *
- * Returns a <b>map</b>. Keys for the map are: "mem", "swap", "memtotal",
- * "memfree", "memshared", "buffers", "cached", "swaptotal", "swapfree".
- * Values for all but "mem", "swap" are the respective size in kB.
- * The values for "mem" and "swap" are again maps. Their keys are:
- * "total", "used", "free", "shared", "buffers", "cached"
- */
-.proc.meminfo
-
-`ag_anyagent(
- `Description (
- (`File("/proc/meminfo")), // real file name
- "#\n", // Comment
- true, // read-only
- (`Tuple (
- `Choice (
- [" ", `Sequence (`Whitespace(),"total",`String("^\n"))],
- ["Mem:", `mem(`Tuple (`Whitespace(), `total(`Number()), `Whitespace(), `used(`Number()), `Whitespace(), `free(`Number()), `Whitespace(), `shared(`Number()), `Whitespace(), `buffers(`Number()), `Whitespace(), `cached(`Number())))],
- ["Swap:", `swap(`Tuple (`Whitespace(), `total(`Number()), `Whitespace(), `used(`Number()), `Whitespace(), `free(`Number())))],
- ["MemTotal:", `Sequence (`Whitespace(), `memtotal(`Number()), `String("^\n"))],
- ["MemFree:", `Sequence (`Whitespace(), `memfree(`Number()), `String("^\n"))],
- ["MemShared:", `Sequence (`Whitespace(), `memshared(`Number()), `String("^\n"))],
- ["Buffers:", `Sequence (`Whitespace(), `buffers(`Number()), `String("^\n"))],
- ["Cached:", `Sequence (`Whitespace(), `cached(`Number()), `String("^\n"))],
- ["SwapCached:", `Sequence (`Whitespace(), `swapcached(`Number()), `String("^\n"))],
- ["Active:", `Sequence (`Whitespace(), `active(`Number()), `String("^\n"))],
- ["Inactive:", `Sequence (`Whitespace(), `inactive(`Number()), `String("^\n"))],
- ["HighTotal:", `Sequence (`Whitespace(), `hightotal(`Number()), `String("^\n"))],
- ["HighFree:", `Sequence (`Whitespace(), `highfree(`Number()), `String("^\n"))],
- ["LowTotal:", `Sequence (`Whitespace(), `lowtotal(`Number()), `String("^\n"))],
- ["LowFree:", `Sequence (`Whitespace(), `lowfree(`Number()), `String("^\n"))],
- ["SwapTotal:", `Sequence (`Whitespace(), `swaptotal(`Number()), `String("^\n"))],
- ["SwapFree:", `Sequence (`Whitespace(), `swapfree(`Number()), `String("^\n"))]
- ),
- `Continue ("\n")
- ))
- )
-)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/libstorage/src/Disk.cc new/yast2-storage-2.15.8/libstorage/src/Disk.cc
--- old/yast2-storage-2.15.7/libstorage/src/Disk.cc 2007-03-26 12:36:15.000000000 +0200
+++ new/yast2-storage-2.15.8/libstorage/src/Disk.cc 2007-04-02 12:37:19.000000000 +0200
@@ -862,7 +862,7 @@
bool Disk::checkPartedValid( const ProcPart& pp, const string& diskname,
list& pl, unsigned long& range_exceed )
{
- long ext_nr = 0;
+ unsigned ext_nr = 0;
bool ret=true;
unsigned long Dummy;
unsigned long long SizeK;
@@ -890,7 +890,7 @@
if( p.second>0 && p.second!=ext_nr &&
pp.getInfo( *i, SizeK, Dummy, Dummy ))
{
- proc_l[unsigned(p.second)] = kbToCylinder( SizeK );
+ proc_l[p.second] = kbToCylinder( SizeK );
}
}
bool openbsd = false;
@@ -2408,7 +2408,8 @@
remount = true;
}
if( ret==0 && !dmp_slave && !needExtend &&
- p->getFs()!=VFAT && p->getFs()!=FSNONE )
+ p->getFs()!=HFS && p->getFs()!=HFSPLUS && p->getFs()!=VFAT &&
+ p->getFs()!=FSNONE )
ret = p->resizeFs();
if( ret==0 )
{
@@ -2465,7 +2466,8 @@
p->needShrink()||p->needExtend() );
}
if( needExtend && !dmp_slave &&
- p->getFs()!=VFAT && p->getFs()!=FSNONE )
+ p->getFs()!=HFS && p->getFs()!=HFSPLUS && p->getFs()!=VFAT &&
+ p->getFs()!=FSNONE )
ret = p->resizeFs();
if( ret==0 && remount )
ret = p->mount();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/libstorage/src/EtcFstab.cc new/yast2-storage-2.15.8/libstorage/src/EtcFstab.cc
--- old/yast2-storage-2.15.7/libstorage/src/EtcFstab.cc 2007-02-14 11:21:31.000000000 +0100
+++ new/yast2-storage-2.15.8/libstorage/src/EtcFstab.cc 2007-04-12 17:36:24.000000000 +0200
@@ -570,7 +570,7 @@
}
ls.push_back( tmp );
tmp.erase();
- if( e.fs=="ext2" || e.fs=="ext3" || e.fs=="reiser" )
+ if( e.fs=="ext2" || e.fs=="ext3" || e.fs=="reiserfs" )
tmp = e.fs;
ls.push_back( tmp );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/libstorage/src/Storage.cc new/yast2-storage-2.15.8/libstorage/src/Storage.cc
--- old/yast2-storage-2.15.7/libstorage/src/Storage.cc 2007-03-27 12:00:01.000000000 +0200
+++ new/yast2-storage-2.15.8/libstorage/src/Storage.cc 2007-04-12 12:44:43.000000000 +0200
@@ -374,7 +374,8 @@
line = extractNthWord( 2, line );
y2milestone( "line:%s", line.c_str() );
is_ppc_mac = line.find( "PowerMac" )==0 || line.find( "PowerBook" )==0;
- if( is_ppc_mac == 0)
+ is_ppc_pegasos = line.find( "EFIKA5K2" )==0;
+ if( is_ppc_mac == 0 || is_ppc_pegasos == 0 )
{
line = cpu[l];
line = extractNthWord( 3, line );
@@ -4675,8 +4676,11 @@
static FsCapabilitiesX jfsCaps (false, false, false, false, true, true,
false, 16, 16*1024);
- static FsCapabilitiesX hfsCaps (false, false, false, false, false, false,
- false, 0, 10*1024);
+ static FsCapabilitiesX hfsCaps (false, false, true, false, false, false,
+ false, 0, 10*1024);
+
+ static FsCapabilitiesX hfspCaps(false, false, true, false, false, false,
+ false, 0, 10*1024);
switch (fstype)
{
@@ -4712,6 +4716,10 @@
fscapabilities = hfsCaps;
return true;
+ case HFSPLUS:
+ fscapabilities = hfspCaps;
+ return true;
+
case SWAP:
fscapabilities = swapCaps;
return true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/libstorage/src/StorageInterface.h new/yast2-storage-2.15.8/libstorage/src/StorageInterface.h
--- old/yast2-storage-2.15.7/libstorage/src/StorageInterface.h 2007-03-21 18:00:08.000000000 +0100
+++ new/yast2-storage-2.15.8/libstorage/src/StorageInterface.h 2007-04-02 12:34:05.000000000 +0200
@@ -80,7 +80,7 @@
namespace storage
{
- enum FsType { FSUNKNOWN, REISERFS, EXT2, EXT3, VFAT, XFS, JFS, HFS, NTFS, SWAP, FSNONE };
+ enum FsType { FSUNKNOWN, REISERFS, EXT2, EXT3, VFAT, XFS, JFS, HFS, NTFS, SWAP, HFSPLUS, FSNONE };
enum PartitionType { PRIMARY, EXTENDED, LOGICAL, PTYPE_ANY };
@@ -500,6 +500,7 @@
VOLUME_CRYPTFORMAT_FAILED = -3033,
VOLUME_CRYPTSETUP_FAILED = -3034,
VOLUME_CRYPTUNSETUP_FAILED = -3035,
+ VOLUME_FORMAT_NOT_IMPLEMENTED = -3036,
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.7/libstorage/src/Volume.cc new/yast2-storage-2.15.8/libstorage/src/Volume.cc
--- old/yast2-storage-2.15.7/libstorage/src/Volume.cc 2007-02-13 12:14:13.000000000 +0100
+++ new/yast2-storage-2.15.8/libstorage/src/Volume.cc 2007-04-12 17:26:47.000000000 +0200
@@ -408,6 +408,10 @@
{
fs = HFS;
}
+ else if( i->second == "hfsplus" )
+ {
+ fs = HFSPLUS;
+ }
else if( i->second == "xfs" )
{
fs = XFS;
@@ -738,6 +742,9 @@
case HFS:
cmd = "/usr/bin/hformat";
break;
+ case HFSPLUS:
+ ret = VOLUME_FORMAT_NOT_IMPLEMENTED;
+ break;
case XFS:
cmd = "/sbin/mkfs.xfs";
params = "-q -f";
@@ -1447,16 +1454,18 @@
}
string Volume::getCryptsetupCmd( const string& dmdev, const string& mount,
- const string& pwdf, bool format ) const
+ const string& pwdf, bool format,
+ bool empty_pwd ) const
{
string table = dmdev;
- y2mil( "dmdev:" << dmdev << " mount:" << mount << " format:" << format );
+ y2mil( "dmdev:" << dmdev << " mount:" << mount << " format:" << format <<
+ " pwempty:" << empty_pwd );
if( table.find( '/' )!=string::npos )
table.erase( 0, table.find_last_of( '/' )+1 );
string cmd = "/sbin/cryptsetup -q";
if( format )
{
- if( isTmpCryptMp(mount) )
+ if( isTmpCryptMp(mount) && empty_pwd )
{
cmd += " --key-file /dev/urandom create";
cmd += ' ';
@@ -1782,13 +1791,14 @@
SystemCmd c;
if( format || isTmpCryptMp(mp) )
{
- c.execute( getCryptsetupCmd( dmcrypt_dev, mp, fname, true ));
+ c.execute( getCryptsetupCmd( dmcrypt_dev, mp, fname, true,
+ crypt_pwd.empty() ));
if( c.retcode()!=0 )
ret = VOLUME_CRYPTFORMAT_FAILED;
if( ret==0 && mp=="swap" )
c.execute( "mkswap " + dmcrypt_dev );
}
- if( ret==0 && !isTmpCryptMp(mp) )
+ if( ret==0 && (!isTmpCryptMp(mp)||!crypt_pwd.empty()) )
{
c.execute( getCryptsetupCmd( dmcrypt_dev, mp, fname, false ));
if( c.retcode()!=0 )
@@ -2890,7 +2900,8 @@
}
string Volume::fs_names[] = { "unknown", "reiserfs", "ext2", "ext3", "vfat",
- "xfs", "jfs", "hfs", "ntfs", "swap", "none" };
+ "xfs", "jfs", "hfs", "ntfs", "swap", "hfsplus",
+ "none" };
string Volume::mb_names[] = { "device", "uuid", "label", "id", "path" };
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/libstorage/src/Volume.h new/yast2-storage-2.15.8/libstorage/src/Volume.h
--- old/yast2-storage-2.15.7/libstorage/src/Volume.h 2007-03-21 18:00:08.000000000 +0100
+++ new/yast2-storage-2.15.8/libstorage/src/Volume.h 2007-04-12 17:26:47.000000000 +0200
@@ -223,7 +223,8 @@
std::ostream& logVolume( std::ostream& file ) const;
string getLosetupCmd( storage::EncryptType e, const string& pwdfile ) const;
string getCryptsetupCmd( const string& dmdev, const string& mp,
- const string& pwdfile, bool format ) const;
+ const string& pwdfile, bool format,
+ bool empty_pwd=false ) const;
storage::EncryptType detectEncryption();
string getFilesysSysfsPath() const;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.15.8/storage/src/include/custom_part_dialogs.ycp
--- old/yast2-storage-2.15.7/storage/src/include/custom_part_dialogs.ycp 2007-02-28 10:54:14.000000000 +0100
+++ new/yast2-storage-2.15.8/storage/src/include/custom_part_dialogs.ycp 2007-04-02 14:19:59.000000000 +0200
@@ -16,7 +16,7 @@
*
*************************************************************
- $Id: custom_part_dialogs.ycp 36552 2007-02-28 09:54:12Z fehr $
+ $Id: custom_part_dialogs.ycp 37253 2007-04-02 12:19:57Z fehr $
*/
{
@@ -849,17 +849,18 @@
boolean is_swap = new_val["fsid"]:0 == Partitions::fsid_swap;
y2debug( "new=%1 swap=%2", new_val, is_swap );
+ symbol ufs = new_val["used_fs"]:Partitions::DefaultFs();
foreach( symbol file_system_name, map file_system_map, file_systems,
``{
- if( file_system_map[`supports_format]:false )
+ if( file_system_map[`real_fs]:false &&
+ (file_system_name==ufs||file_system_map[`supports_format]:false))
{
fs_sel[file_system_name] = $[];
fs_sel[file_system_name,"text"] = file_system_map[`name]:"Ext2";
if( is_swap )
fs_sel[file_system_name,"selected"] = file_system_name == `swap;
else
- fs_sel[file_system_name,"selected"] =
- new_val["used_fs"]:Partitions::DefaultFs() == file_system_name;
+ fs_sel[file_system_name,"selected"] = file_system_name==ufs;
}
});
y2milestone( "fs_sel=%1", fs_sel );
@@ -912,7 +913,7 @@
*/
define term FsidComboBox( map new_val, map file_systems )
``{
- list items = [];
+ list<term> items = [];
list added_items = [];
list added_fsids = [];
foreach( any fs_name, map fs_map, file_systems,
@@ -936,6 +937,24 @@
items = add( items, `item( `id(part_id), part_id, true ));
}
+ map so = $[ "0x83" : 0, "0x8" : 1, "0xF" : 2, "0x0" : 3,
+ "0x10" : 6 ];
+ map val = $[];
+ foreach( term t, items, ``{val[t[1]:""] = 5;} );
+ foreach( string s, integer i, val,
+ ``{
+ foreach( string match, integer w, so,
+ ``{
+ boolean found = false;
+ if( !found && search( s, match )==0 )
+ {
+ val[s] = w;
+ found = true;
+ }
+ });
+ });
+ items = sort( term a, term b, items, ``(val[a[1]:""]:5<=val[b[1]:""]:5));
+
return( `ComboBox(`id(`fsid_point), `opt(`notify,`editable, `hstretch),
// label text
_("File system &ID:"), items ));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.15.8/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.15.7/storage/src/include/custom_part_lib.ycp 2007-02-22 18:24:07.000000000 +0100
+++ new/yast2-storage-2.15.8/storage/src/include/custom_part_lib.ycp 2007-04-02 14:20:00.000000000 +0200
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 36426 2007-02-22 17:24:04Z fehr $
+ $Id: custom_part_lib.ycp 37253 2007-04-02 12:19:57Z fehr $
*
*/
@@ -551,10 +551,35 @@
return( ret );
};
+define map CheckFormatOk( map new )
+ ``{
+ map ret = $[ "ok" : true ];
+ if( new["format"]:false )
+ {
+ symbol ufs = new["used_fs"]:`unknown;
+ y2milestone( "GetSupportFormat %1", FileSystems::GetSupportFormat(ufs));
+ if( !FileSystems::GetSupportFormat(ufs) )
+ {
+ // Popup text
+ string txt = sformat( "The file system of type %1 cannot be created.",
+ FileSystems::GetName( ufs, "" ));
+ Popup::Error(txt);
+ ret["ok"] = false;
+ }
+ }
+ ret["map"] = new;
+ y2milestone( "CheckFormatOk ret:%1", ret["ok"]:false );
+ return( ret );
+ };
+
define map CheckDeviceFinalOk( map new )
``{
y2milestone( "CheckDeviceFinalOk new:%1", new );
- map ret = CheckCryptOk( new );
+ map ret = CheckFormatOk( new );
+ if( ret["ok"]:false )
+ {
+ ret = CheckCryptOk( ret["map"]:$[] );
+ }
y2milestone( "CheckDeviceFinalOk ret:%1", ret );
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/storage/src/inst_target_part.ycp new/yast2-storage-2.15.8/storage/src/inst_target_part.ycp
--- old/yast2-storage-2.15.7/storage/src/inst_target_part.ycp 2007-02-13 15:57:23.000000000 +0100
+++ new/yast2-storage-2.15.8/storage/src/inst_target_part.ycp 2007-04-11 12:51:41.000000000 +0200
@@ -9,7 +9,7 @@
* -Ask the user which partition to use.
* -Check the input and return error-messages.
*
- * $Id: inst_target_part.ycp 36102 2007-02-13 14:57:21Z fehr $
+ * $Id: inst_target_part.ycp 37390 2007-04-11 10:51:39Z fehr $
*/
{
textdomain "storage";
@@ -416,12 +416,7 @@
}
} // while (true)
- if( ret == `next )
- {
- y2milestone( "Set to inactive" );
- Storage::SetPartProposalActive(false);
- }
- else if( ret == `back || ret == `abort )
+ if( ret == `back || ret == `abort )
{
Storage::RestoreTargetBackup("disk");
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/storage/src/modules/FileSystems.ycp new/yast2-storage-2.15.8/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.15.7/storage/src/modules/FileSystems.ycp 2007-03-22 11:43:56.000000000 +0100
+++ new/yast2-storage-2.15.8/storage/src/modules/FileSystems.ycp 2007-04-02 14:20:46.000000000 +0200
@@ -7,7 +7,7 @@
* These module contains the supported filesystems and their settings.
*
*
- * $Id: FileSystems.ycp 37085 2007-03-22 10:43:51Z fehr $
+ * $Id: FileSystems.ycp 37254 2007-04-02 12:20:45Z fehr $
*/
{
module "FileSystems";
@@ -130,6 +130,7 @@
`ext3 : true,
`jfs : true,
`vfat : true,
+ `ntfs : true,
`xxefi : false,
`xbootdisk : false,
`xbootfat : false,
@@ -617,6 +618,7 @@
`ext2 : $[
`name : "Ext2",
`fsid : Partitions::fsid_native,
+ `real_fs : true,
`supports_format : true,
`fsid_item : "0x83 Linux ",
`fstype : "Linux native" ,
@@ -631,6 +633,7 @@
`vfat : $[
`name : "FAT",
`fsid : 12,
+ `real_fs : true,
`alt_fsid : [ 12, 0x103 ],
`supports_format : true ,
`fsid_item : "0x0C Win95 FAT32 ",
@@ -648,6 +651,7 @@
`reiser : $[
`name : "Reiser",
`fsid : Partitions::fsid_native,
+ `real_fs : true,
`supports_format : true ,
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native",
@@ -663,6 +667,7 @@
`xfs : $[
`name : "XFS",
`fsid : Partitions::fsid_native,
+ `real_fs : true,
`supports_format : true ,
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native" ,
@@ -677,6 +682,7 @@
`jfs : $[
`name : "JFS",
`fsid : Partitions::fsid_native,
+ `real_fs : true,
`supports_format : true ,
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native" ,
@@ -691,6 +697,7 @@
`ext3 : $[
`name : "Ext3",
`fsid : Partitions::fsid_native,
+ `real_fs : true,
`supports_format : true ,
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native" ,
@@ -706,7 +713,9 @@
`hfs : $[
`name : "MacHFS",
`fsid : Partitions::fsid_mac_hfs,
+ `real_fs : true,
`supports_format : true,
+ `alt_fsid : [ 0x83 ],
`fsid_item : "0x102 Apple_HFS " ,
`fstype : "Apple_HFS " ,
`crypt : false,
@@ -717,6 +726,40 @@
`makefstype : "hfs",
`fst_options : [],
`options : []
+ ],
+ `hfsplus : $[
+ `name : "MacHFS+",
+ `fsid : Partitions::fsid_mac_hfs,
+ `real_fs : true,
+ `supports_format : false,
+ `alt_fsid : [ 0x83 ],
+ `fsid_item : "0x102 Apple_HFS " ,
+ `fstype : "Apple_HFS " ,
+ `crypt : false,
+ `mountpoints : [],
+ `mount_string : "hfsplus",
+ `mount_option : "-t hfsplus",
+ `needed_modules : [ "hfsplus" ],
+ `makefstype : "",
+ `fst_options : [],
+ `options : []
+ ],
+ `ntfs : $[
+ `name : "NTFS",
+ `fsid : 7,
+ `real_fs : true,
+ `supports_format : false,
+ `alt_fsid : Partitions::fsid_ntfstypes,
+ `fsid_item : "0x07 NTFS " ,
+ `fstype : "NTFS " ,
+ `crypt : false,
+ `mountpoints : [],
+ `mount_string : "ntfs",
+ `mount_option : "-t ntfs",
+ `needed_modules : [ "ntfs" ],
+ `makefstype : "",
+ `fst_options : [],
+ `options : []
]
];
@@ -876,6 +919,7 @@
if( Arch::board_mac() )
{
support[`hfs] = true;
+ support[`hfsplus] = true;
}
y2milestone( "support %1", support );
suggest_m_points = [ "/home", "/srv", "/tmp", "/local", ""];
@@ -945,7 +989,7 @@
global define map GetFsMap( symbol used_fs )
``{
- map > allfs = GetAllFileSystems( true, true );
+ map > allfs = GetAllFileSystems( true, true );
if( haskey( allfs, used_fs ))
return allfs[ used_fs]:$[];
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/storage/src/modules/Storage.ycp new/yast2-storage-2.15.8/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.15.7/storage/src/modules/Storage.ycp 2007-03-27 11:58:51.000000000 +0200
+++ new/yast2-storage-2.15.8/storage/src/modules/Storage.ycp 2007-04-12 12:00:01.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 37135 2007-03-27 09:58:47Z fehr $
+ * $Id: Storage.ycp 37410 2007-04-12 09:59:59Z fehr $
*/
{
@@ -317,6 +317,14 @@
boolean as_string = false;
list<string> ls = filter( string s, splitstring( device, "/" ),
``(size(s)>0));
+ if( search( device, "LABEL=" )==0 ||
+ search( device, "UUID=" )==0 )
+ {
+ list<string> tl = splitstring( device, "=" );
+ ls = [ "dev", "disk", "", tl[1]:"" ];
+ ls[2] = (search( device, "LABEL=" )==0)?"by-label":"by-uuid";
+ y2milestone( "GetDiskPartition ls:%1", ls );
+ }
y2debug( "GetDiskPartition size:%1 ls:%2", size(ls), ls );
if( size(ls)>=4 && ls[1]:"" == "disk" &&
contains( [ "by-id", "by-path", "by-uuid", "by-label" ], ls[2]:"" ))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.7/VERSION new/yast2-storage-2.15.8/VERSION
--- old/yast2-storage-2.15.7/VERSION 2007-03-27 11:58:32.000000000 +0200
+++ new/yast2-storage-2.15.8/VERSION 2007-04-10 11:01:19.000000000 +0200
@@ -1 +1 @@
-2.15.7
+2.15.8
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org