Hello community,
here is the log from the commit of package yast2-storage
checked in at Mon Apr 3 18:58:38 CEST 2006.
--------
--- yast2-storage/yast2-storage.changes 2006-03-30 19:58:49.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2006-04-03 16:57:50.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Apr 3 13:11:32 CEST 2006 - fehr@suse.de
+
+- check if swapon succeeds before using swap partitions (#161335)
+- add Storage::RemoveDmMapsTo for usage by bootloader (#162242)
+- use correct default fstab options when resuing partition (#162510)
+- fix various bugs handling complete disk with mac label (#161751)
+- version 2.13.45
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.13.44.tar.bz2
New:
----
yast2-storage-2.13.45.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.CAriSV/_old 2006-04-03 18:58:12.000000000 +0200
+++ /var/tmp/diff_new_pack.CAriSV/_new 2006-04-03 18:58:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.13.44)
+# spec file for package yast2-storage (Version 2.13.45)
#
# 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.13.44
+Version: 2.13.45
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.13.44.tar.bz2
+Source0: yast2-storage-2.13.45.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-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.13.44
+%setup -n yast2-storage-2.13.45
%build
%{prefix}/bin/y2tool y2autoconf
@@ -164,6 +164,12 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%changelog -n yast2-storage
+* Mon Apr 03 2006 - fehr@suse.de
+- check if swapon succeeds before using swap partitions (#161335)
+- add Storage::RemoveDmMapsTo for usage by bootloader (#162242)
+- use correct default fstab options when resuing partition (#162510)
+- fix various bugs handling complete disk with mac label (#161751)
+- version 2.13.45
* Thu Mar 30 2006 - fehr@suse.de
- prevent reuse of partitions already used by other entities
- wait for udev activity to be finished after calls to
++++++ yast2-storage-2.13.44.tar.bz2 -> yast2-storage-2.13.45.tar.bz2 ++++++
++++ 6218 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.13.44/VERSION new/yast2-storage-2.13.45/VERSION
--- old/yast2-storage-2.13.44/VERSION 2006-03-30 20:01:20.000000000 +0200
+++ new/yast2-storage-2.13.45/VERSION 2006-04-03 16:57:54.000000000 +0200
@@ -1 +1 @@
-2.13.44
+2.13.45
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.13.44/configure.in new/yast2-storage-2.13.45/configure.in
--- old/yast2-storage-2.13.44/configure.in 2006-03-15 16:24:07.000000000 +0100
+++ new/yast2-storage-2.13.45/configure.in 2006-04-03 18:52:11.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.13.35, http://www.suse.de/feedback, yast2-storage)
+AC_INIT(yast2-storage, 2.13.45, http://www.suse.de/feedback, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.35"
+VERSION="2.13.45"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
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.13.44/libstorage/src/Disk.cc new/yast2-storage-2.13.45/libstorage/src/Disk.cc
--- old/yast2-storage-2.13.44/libstorage/src/Disk.cc 2006-03-30 14:24:35.000000000 +0200
+++ new/yast2-storage-2.13.45/libstorage/src/Disk.cc 2006-04-03 15:52:48.000000000 +0200
@@ -644,6 +644,10 @@
{
id = Partition::ID_APPLE_HFS;
}
+ else if( val.find( "Apple_UFS" ) != string::npos )
+ {
+ id = Partition::ID_APPLE_UFS;
+ }
}
}
}
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.13.44/libstorage/src/Partition.h new/yast2-storage-2.13.45/libstorage/src/Partition.h
--- old/yast2-storage-2.13.44/libstorage/src/Partition.h 2006-03-28 13:22:56.000000000 +0200
+++ new/yast2-storage-2.13.45/libstorage/src/Partition.h 2006-04-03 15:57:04.000000000 +0200
@@ -19,7 +19,7 @@
ID_LINUX=0x83, ID_SWAP=0x82, ID_LVM=0x8e, ID_RAID=0xfd,
ID_APPLE_OTHER=0x101, ID_APPLE_HFS=0x102,
ID_GPT_BOOT=0x103, ID_GPT_SERVICE=0x104,
- ID_GPT_MSFTRES=0x105 } IdNum;
+ ID_GPT_MSFTRES=0x105, ID_APPLE_UFS=0x106 } IdNum;
Partition( const Disk& d, unsigned Pnr, unsigned long long SizeK,
unsigned long Start, unsigned long CSize,
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.13.44/libstorage/src/Storage.cc new/yast2-storage-2.13.45/libstorage/src/Storage.cc
--- old/yast2-storage-2.13.44/libstorage/src/Storage.cc 2006-03-30 19:51:25.000000000 +0200
+++ new/yast2-storage-2.13.45/libstorage/src/Storage.cc 2006-04-03 13:36:14.000000000 +0200
@@ -3136,8 +3136,9 @@
return( co.type()==EVMS || co.type()==DM || co.type()==LVM );
}
-void Storage::removeDmMapsTo( const string& dev )
+bool Storage::removeDmMapsTo( const string& dev )
{
+ bool ret = false;
y2milestone( "dev:%s", dev.c_str() );
VPair vp = vPair( isDmContainer );
for( VolIterator v=vp.begin(); v!=vp.end(); ++v )
@@ -3146,11 +3147,33 @@
if( dm!=NULL )
{
if( dm->mapsTo( dev ) )
+ {
dm->removeTable();
+ ret = true;
+ }
}
else
y2warning( "not a Dm descendant %s", v->device().c_str() );
}
+ y2milestone( "ret:%d", ret );
+ return( ret );
+ }
+
+bool Storage::checkDmMapsTo( const string& dev )
+ {
+ bool ret = false;
+ y2milestone( "dev:%s", dev.c_str() );
+ VPair vp = vPair( isDmContainer );
+ VolIterator v=vp.begin();
+ while( !ret && v!=vp.end() )
+ {
+ Dm * dm = dynamic_cast(&(*v));
+ if( dm!=NULL )
+ ret = ret && dm->mapsTo( dev );
+ ++v;
+ }
+ y2milestone( "ret:%d", ret );
+ return( ret );
}
void
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.13.44/libstorage/src/Storage.h new/yast2-storage-2.13.45/libstorage/src/Storage.h
--- old/yast2-storage-2.13.44/libstorage/src/Storage.h 2006-03-30 19:49:51.000000000 +0200
+++ new/yast2-storage-2.13.45/libstorage/src/Storage.h 2006-04-03 13:33:35.000000000 +0200
@@ -334,7 +334,8 @@
void removeDmTableTo( const Volume& vol );
void removeDmTableTo( const string& device );
bool removeDmTable( const string& table );
- void removeDmMapsTo( const string& dev );
+ bool removeDmMapsTo( const string& dev );
+ bool checkDmMapsTo( const string& dev );
void setCallbackProgressBar( storage::CallbackProgressBar pfnc )
{ progress_bar_cb=pfnc; }
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.13.44/libstorage/src/StorageInterface.h new/yast2-storage-2.13.45/libstorage/src/StorageInterface.h
--- old/yast2-storage-2.13.44/libstorage/src/StorageInterface.h 2006-01-25 18:32:39.000000000 +0100
+++ new/yast2-storage-2.13.45/libstorage/src/StorageInterface.h 2006-04-03 15:29:26.000000000 +0200
@@ -1738,6 +1738,22 @@
virtual bool mountDevice( const string& device, const string& mp ) = 0;
/**
+ * Check if there are dm maps to a given device
+ *
+ * @param device device name for which dm maps should be checked
+ * @return bool true if there are map to device
+ */
+ virtual bool checkDmMapsTo( const string& device ) = 0;
+
+ /**
+ * Remove all possibly existing dm maps to a given device
+ *
+ * @param device device name for which dm maps should be removed
+ * @return bool true if maps to remove existed
+ */
+ virtual bool removeDmMapsTo( const string& device ) = 0;
+
+ /**
* Detect potentially available free space on a partition
*
* @param device device to check
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.13.44/storage/src/include/auto_part_ui.ycp new/yast2-storage-2.13.45/storage/src/include/auto_part_ui.ycp
--- old/yast2-storage-2.13.44/storage/src/include/auto_part_ui.ycp 2006-01-23 16:00:30.000000000 +0100
+++ new/yast2-storage-2.13.45/storage/src/include/auto_part_ui.ycp 2006-04-03 18:37:20.000000000 +0200
@@ -9,7 +9,7 @@
*
*
*
- * $Id: auto_part_ui.ycp 27211 2006-01-23 15:00:30Z fehr $
+ * $Id: auto_part_ui.ycp 29641 2006-04-03 16:37:17Z fehr $
*
* used globals:
*
@@ -106,10 +106,8 @@
symbol ptype = pentry["type"]:`unknown;
if (ptype != `extended)
{
- list<string> hit = filter(string v, Partitions::not_shown_partitions,
- ``(issubstring(pentry["fstype"]:"", v)) );
// skip #3 on AlphaBSD and SparcBSD
- if (size(hit)==0 &&
+ if( pentry["fsid"]:0 != Partitions::fsid_mac_hidden &&
((ptype!=`bsd && ptype!=`sun) || pentry["nr"]:0 != 3) &&
!pentry["create"]:false)
{
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.13.44/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.13.45/storage/src/include/do_proposal_flexible.ycp
--- old/yast2-storage-2.13.44/storage/src/include/do_proposal_flexible.ycp 2006-03-30 16:38:24.000000000 +0200
+++ new/yast2-storage-2.13.45/storage/src/include/do_proposal_flexible.ycp 2006-04-03 14:03:55.000000000 +0200
@@ -14,7 +14,7 @@
*
*************************************************************
- $Id: do_proposal_flexible.ycp 29573 2006-03-30 14:38:22Z fehr $
+ $Id: do_proposal_flexible.ycp 29609 2006-04-03 12:03:53Z fehr $
*/
{
@@ -1918,6 +1918,7 @@
``(p["type"]:`unknown!=`free &&
!p["delete"]:false &&
p["detected_fs"]:`unknown==`swap));
+ swaps = filter( map p, swaps, ``(Storage::CheckSwapable(p["device"]:"")));
swaps = sort( map a, map b, swaps, ``(a["size_k"]:0>b["size_k"]:0));
y2milestone( "can_swap_reuse swaps %1", swaps );
if( swaps[0,"size_k"]:0 >= 128*1024 )
@@ -1995,6 +1996,8 @@
p["mount"] = Partitions::BootMount();
p["used_fs"] = Partitions::DefaultBootFs();
p["format"] = true;
+ p["fstopt"] =
+ FileSystems::DefaultFstabOptions( p );
}
return( p );
});
@@ -2031,6 +2034,7 @@
p["mount"] = mp;
p["used_fs"] = Partitions::default_fs;
p["format"] = true;
+ p["fstopt"] = FileSystems::DefaultFstabOptions( p );
}
return( p );
});
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.13.44/storage/src/inst_custom_part.ycp new/yast2-storage-2.13.45/storage/src/inst_custom_part.ycp
--- old/yast2-storage-2.13.44/storage/src/inst_custom_part.ycp 2006-03-28 15:18:16.000000000 +0200
+++ new/yast2-storage-2.13.45/storage/src/inst_custom_part.ycp 2006-04-03 18:37:20.000000000 +0200
@@ -26,7 +26,7 @@
*
*************************************************************
- $Id: inst_custom_part.ycp 29473 2006-03-28 13:18:12Z fehr $
+ $Id: inst_custom_part.ycp 29641 2006-04-03 16:37:17Z fehr $
*/
{
@@ -1031,12 +1031,7 @@
``{
// dont show "system partitions"
string fstype = partition["fstype"]:"";
- boolean hide = false;
- if( size(filter( string v, Partitions::not_shown_partitions,
- ``(issubstring(fstype, v)) ))>0 )
- {
- hide = true;
- }
+ boolean hide = partition["fsid"]:0 == Partitions::fsid_mac_hidden;
if( !hide && search( partition["device"]:"", "/dev/evms/" )==0 )
{
y2milestone( "evms p: %1", partition );
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.13.44/storage/src/inst_target_part.ycp new/yast2-storage-2.13.45/storage/src/inst_target_part.ycp
--- old/yast2-storage-2.13.44/storage/src/inst_target_part.ycp 2006-02-02 17:45:48.000000000 +0100
+++ new/yast2-storage-2.13.45/storage/src/inst_target_part.ycp 2006-04-03 18:37:20.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 27550 2006-02-02 16:45:49Z fehr $
+ * $Id: inst_target_part.ycp 29641 2006-04-03 16:37:17Z fehr $
*/
{
textdomain "storage";
@@ -201,10 +201,10 @@
symbol ret = nil;
// TODO: UI::ControlWidget(dlg, `id(`full), `SetFocus());
- if( target["label"]:""=="mac" && UI::WidgetExists( `id(`full) ))
- {
- UI::ChangeWidget( `id(`full), `Enabled, false );
- }
+ //if( target["label"]:""=="mac" && UI::WidgetExists( `id(`full) ))
+ //{
+ //UI::ChangeWidget( `id(`full), `Enabled, false );
+ //}
boolean ok = false;
while(!ok)
@@ -223,7 +223,8 @@
``{
symbol ptype = pentry["type"]:`unknown;
integer ui_id = 0;
- if (ptype != `extended)
+ if( ptype != `extended &&
+ pentry["fsid"]:0 != Partitions::fsid_mac_hidden )
{
ui_id = pentry["ui_id"]:0;
if (ui_id != 0)
@@ -353,9 +354,9 @@
if( ptype != `extended )
{
ui_id = p["ui_id"]:0;
- boolean selection =
- !UI::WidgetExists( `id(ui_id) ) ||
- (UI::QueryWidget( `id(ui_id), `Value)==true);
+ boolean selection = p["fsid"]:0 != Partitions::fsid_mac_hidden &&
+ (!UI::WidgetExists( `id(ui_id) ) ||
+ (UI::QueryWidget( `id(ui_id), `Value)==true));
y2milestone( "sel:%1", selection );
if( win_partition_to_delete == p["nr"]:-2 )
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.13.44/storage/src/modules/Partitions.ycp new/yast2-storage-2.13.45/storage/src/modules/Partitions.ycp
--- old/yast2-storage-2.13.44/storage/src/modules/Partitions.ycp 2006-01-30 15:53:10.000000000 +0100
+++ new/yast2-storage-2.13.45/storage/src/modules/Partitions.ycp 2006-04-03 18:37:20.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Provides information about partitions
*
- * $Id: Partitions.ycp 27442 2006-01-30 14:53:09Z fehr $
+ * $Id: Partitions.ycp 29641 2006-04-03 16:37:17Z fehr $
*/
{
module "Partitions";
@@ -29,7 +29,9 @@
global integer fsid_fat16 = 6;
global integer fsid_fat32 = 12;
global integer fsid_prep_chrp_boot = 0x41;
+ global integer fsid_mac_hidden = 0x101;
global integer fsid_mac_hfs = 0x102;
+ global integer fsid_mac_ufs = 0x106;
global integer fsid_gpt_boot = 0x103;
global integer fsid_gpt_service = 0x104;
global integer fsid_gpt_msftres = 0x105;
@@ -627,6 +629,7 @@
if ( fs_id == 0x103) return( "EFI boot");
if ( fs_id == 0x104) return( "Service");
if ( fs_id == 0x105) return( "Microsoft reserved");
+ if ( fs_id == 0x106) return( "Apple_UFS");
return( "unknown" );
};
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.13.44/storage/src/modules/Storage.ycp new/yast2-storage-2.13.45/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.13.44/storage/src/modules/Storage.ycp 2006-03-29 13:34:53.000000000 +0200
+++ new/yast2-storage-2.13.45/storage/src/modules/Storage.ycp 2006-04-03 13:48:19.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 29503 2006-03-29 11:34:49Z fehr $
+ * $Id: Storage.ycp 29608 2006-04-03 11:48:12Z fehr $
*/
{
@@ -2729,6 +2729,18 @@
});
}
+global define boolean CheckSwapable( string dev )
+ {
+ string cmd = "swapon " + dev;
+ boolean ok = (integer)SCR::Execute(.target.bash, cmd )==0;
+ if( ok )
+ {
+ cmd = "swapoff " + dev;
+ SCR::Execute(.target.bash, cmd );
+ }
+ return( ok );
+ }
+
/**
* mark swap-partitions with pseudo Mountpoint swap in targetMap
* @param target Disk map
@@ -2736,28 +2748,34 @@
*/
global define map AddSwapMp( map target )
``{
- list swaps = [];
- if( !Stage::initial() )
- swaps = SwappingPartitions();
+ list swaps = SwappingPartitions();
y2milestone( "AddSwapMp swaps %1", swaps );
foreach(string diskdev, map disk, target,
``{
disk["partitions"] = maplist(map part, disk["partitions"]:[],
- ``{
- if( (Stage::initial() &&
- !Partitions::IsDosWinNtPartition(part["fsid"]:0) &&
- part["detected_fs"]:`unknown==`swap &&
- !part["old_swap"]:false &&
- search( diskdev, "/dev/evms" )!=0 ) ||
- (!Stage::initial() &&
- contains( swaps, part["device"]:"" )))
- {
- part["mount"] = "swap";
- ChangeVolumeProperties( part );
- y2milestone( "AddSwapMp %1", part );
- }
- return( part );
- });
+ ``{
+ if( (Stage::initial() &&
+ !Partitions::IsDosWinNtPartition(part["fsid"]:0) &&
+ part["detected_fs"]:`unknown==`swap &&
+ !part["old_swap"]:false &&
+ search( diskdev, "/dev/evms" )!=0 ) ||
+ (contains( swaps, part["device"]:"" )))
+ {
+ boolean ok = true;
+ if( !contains( swaps, part["device"]:"" ))
+ {
+ ok = CheckSwapable( part["device"]:"" );
+ y2milestone( "AddSwapMp initial ok:%1", ok );
+ }
+ if( ok )
+ {
+ part["mount"] = "swap";
+ ChangeVolumeProperties( part );
+ y2milestone( "AddSwapMp %1", part );
+ }
+ }
+ return( part );
+ });
target[diskdev] = disk;
});
return( target );
@@ -5034,5 +5052,25 @@
y2milestone( "SwitchUiAutomounter exit" );
}
+global void RemoveDmMapsTo( string device )
+ {
+ y2milestone( "RemoveDmMapsTo device:%1", device );
+ InitLibstorage();
+ if( LibStorage::StorageInterface::checkDmMapsTo( sint, device ))
+ {
+ LibStorage::StorageInterface::removeDmMapsTo( sint, device );
+ }
+ else
+ {
+ map d = GetDiskPartition( device );
+ string ddev = d["disk"]:"";
+ if( size(ddev)>0 && ddev!=device &&
+ LibStorage::StorageInterface::checkDmMapsTo( sint, ddev ) )
+ {
+ LibStorage::StorageInterface::removeDmMapsTo( sint, ddev );
+ }
+ }
+ }
+
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...