[prev in list] [next in list] [prev in thread] [next in thread]
List: opensuse-commit
Subject: commit yast2-storage
From: root () Hilbert ! suse ! de (h_root)
Date: 2008-08-30 0:17:11
Message-ID: 20080830001712.26F1667815D () Hilbert ! suse ! de
[Download RAW message or body]
Hello community,
here is the log from the commit of package yast2-storage
checked in at Sat Aug 30 02:17:11 CEST 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-08-27 17:06:59.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2008-08-29 16:54:48.040833000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 27 17:34:10 CEST 2008 - aschnell@suse.de
+
+- fixed documentation in StorageInterface.h
+- version 2.17.23
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.17.22.tar.bz2
New:
----
yast2-storage-2.17.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.A11781/_old 2008-08-30 02:16:11.000000000 +0200
+++ /var/tmp/diff_new_pack.A11781/_new 2008-08-30 02:16:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.17.22)
+# spec file for package yast2-storage (Version 2.17.23)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-storage
-Version: 2.17.22
+Version: 2.17.23
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.17.22.tar.bz2
+Source0: yast2-storage-2.17.23.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ \
libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig \
update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings \
yast2-testsuite Requires: parted yast2-storage-lib = %version \
yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup @@ -57,7 \
+57,7 @@ Arvin Schnell <aschnell@suse.de>
%prep
-%setup -n yast2-storage-2.17.22
+%setup -n yast2-storage-2.17.23
%build
%{prefix}/bin/y2tool y2autoconf
@@ -181,6 +181,9 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Wed Aug 27 2008 aschnell@suse.de
+- fixed documentation in StorageInterface.h
+- version 2.17.23
* Tue Aug 26 2008 aschnell@suse.de
- fixed udev data for multipath and dmraid
- version 2.17.22
++++++ yast2-storage-2.17.22.tar.bz2 -> yast2-storage-2.17.23.tar.bz2 ++++++
++++ 8017 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.17.22/configure.in \
new/yast2-storage-2.17.23/configure.in
--- old/yast2-storage-2.17.22/configure.in 2008-08-27 16:36:22.000000000 +0200
+++ new/yast2-storage-2.17.23/configure.in 2008-08-29 16:52:57.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.17.22, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.17.23, http://bugs.opensuse.org/, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.22"
+VERSION="2.17.23"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell <aschnell@suse.de>"
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.17.22/libstorage/src/Storage.cc \
new/yast2-storage-2.17.23/libstorage/src/Storage.cc
--- old/yast2-storage-2.17.22/libstorage/src/Storage.cc 2008-08-25 15:50:40.000000000 \
+0200
+++ new/yast2-storage-2.17.23/libstorage/src/Storage.cc 2008-08-29 16:00:40.000000000 \
+0200 @@ -4348,27 +4348,25 @@
}
-string Storage::getAllUsedFs() const
- {
- list<FsType> fs;
+list<string> Storage::getAllUsedFs() const
+{
+ set<FsType> fs;
ConstVolPair p = volPair( Volume::notDeleted );
for( ConstVolIterator v=p.begin(); v!=p.end(); ++v )
- {
+ {
FsType t = v->getFs();
- if( t!=FSUNKNOWN && t!=FSNONE &&
- find( fs.begin(), fs.end(), t )==fs.end() )
- fs.push_back(t);
- }
- string ret;
- for( list<FsType>::const_iterator i=fs.begin(); i!=fs.end(); ++i )
- {
- if( !ret.empty() )
- ret += ' ';
- ret += Volume::fsTypeString(*i);
- }
- y2mil( "ret:" << ret );
- return( ret );
+ if (t!=FSUNKNOWN && t!=FSNONE)
+ fs.insert(t);
+ }
+ list<string> ret;
+ for( set<FsType>::const_iterator i=fs.begin(); i!=fs.end(); ++i )
+ {
+ ret.push_back(Volume::fsTypeString(*i));
}
+ y2mil( "ret:" << ret );
+ return ret;
+}
+
bool
Storage::getFsCapabilities (FsType fstype, FsCapabilities& fscapabilities) const
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.17.22/libstorage/src/Storage.h \
new/yast2-storage-2.17.23/libstorage/src/Storage.h
--- old/yast2-storage-2.17.22/libstorage/src/Storage.h 2008-08-27 15:17:37.000000000 \
+0200
+++ new/yast2-storage-2.17.23/libstorage/src/Storage.h 2008-08-29 15:59:12.000000000 \
+0200 @@ -293,7 +293,7 @@
bool getFsCapabilities( storage::FsType fstype,
storage::FsCapabilities& fscapabilities) const;
- string getAllUsedFs() const;
+ list<string> getAllUsedFs() const;
void setExtError( const string& txt );
int createPartition( const string& disk, storage::PartitionType type,
unsigned long start, unsigned long size,
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.17.22/libstorage/src/StorageInterface.h \
new/yast2-storage-2.17.23/libstorage/src/StorageInterface.h
--- old/yast2-storage-2.17.22/libstorage/src/StorageInterface.h 2008-08-27 \
15:17:37.000000000 +0200
+++ new/yast2-storage-2.17.23/libstorage/src/StorageInterface.h 2008-08-29 \
16:03:41.000000000 +0200 @@ -861,9 +861,8 @@
/**
* Get list of filesystem types present on any block devices.
- * List elements are separated by blanks.
*/
- virtual string getAllUsedFs() const = 0;
+ virtual list<string> getAllUsedFs() const = 0;
/**
* Print all detected entities to a stream.
@@ -1563,7 +1562,7 @@
* Remove a LVM logical volume snapshot
*
* @param vg name of volume group
- * @param device name of logical volume snapshot
+ * @param name name of logical volume snapshot
* @return zero if all is ok, a negative number to indicate an error
*/
virtual int removeLvmLvSnapshot(const string& vg, const string& name) = 0;
@@ -1573,7 +1572,8 @@
*
* @pre This can only be done after the snapshot has been created on disk.
*
- * @param name name of snapshot
+ * @param vg name of volume group
+ * @param name name of logical volume snapshot
* @param info record that gets filled with snapshot special data
* @return zero if all is ok, a negative number to indicate an error
*/
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.17.22/storage/src/include/custom_part_check_generated.ycp \
new/yast2-storage-2.17.23/storage/src/include/custom_part_check_generated.ycp
--- old/yast2-storage-2.17.22/storage/src/include/custom_part_check_generated.ycp 2008-08-05 \
17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/custom_part_check_generated.ycp 2008-08-29 \
15:02:17.000000000 +0200 @@ -24,7 +24,7 @@
*
*************************************************************
- $Id: custom_part_check_generated.ycp 49681 2008-08-05 09:22:23Z aschnell $
+ $Id: custom_part_check_generated.ycp 50483 2008-08-29 13:02:17Z aschnell $
*/
{
@@ -341,8 +341,7 @@
});
- whole_disk = whole_disk || diskinfo["type"]:`CT_UNKNOWN==`CT_LVM ||
- diskinfo["type"]:`CT_UNKNOWN==`CT_EVMS;
+ whole_disk = whole_disk || diskinfo["type"]:`CT_UNKNOWN==`CT_LVM;
diskinfo = add( diskinfo, "whole_disk", whole_disk );
all_whole_disk = all_whole_disk && whole_disk;
targetMap = add( targetMap, disk, diskinfo );
@@ -742,11 +741,6 @@
if( !tg["/dev/"+p["used_by"]:"","create"]:false )
ppl = add( ppl, p );
}
- else if( p["used_by_type"]:`UB_NONE==`UB_EVMS )
- {
- if( !tg["/dev/evms/"+p["used_by"]:"","create"]:false )
- ppl = add( ppl, p );
- }
});
pl = ppl;
}
@@ -788,13 +782,6 @@
Remove it from the volume group before editing it.
"),curr_part["used_by"]:"" ));
}
- else if( used == `UB_EVMS )
- {
- // popup text %1 is replaced by a name e.g. system
- Popup::Message(sformat(_("The selected device is used by EVMS volume (%1).
-Remove the EVMS volume before editing it.
-"), curr_part["used_by"]:"" ));
- }
else if( used != `UB_NONE )
{
// popup text %1 is replaced by a name e.g. system
@@ -847,17 +834,9 @@
Remove it from the RAID before deleting it.
"), curr_part["used_by"]:"", part_name ));
}
-
- else if( used == `UB_EVMS)
- {
- // popup text %2 is a device name, %1 is the EVMS name
- Popup::Message(sformat(_("The device (%2) is used by EVMS object (%1).
-Remove the EVMS object before deleting it.
-"), curr_part["used_by"]:"", part_name ));
- }
else
{
- // popup text %2 is a device name, %1 is the EVMS name
+ // popup text, %1 and %2 are device names
Popup::Message(sformat(_("The device (%2) is used by %1.
Remove %1 before deleting it.
"), curr_part["used_by"]:"", part_name ));
@@ -929,7 +908,7 @@
}
if( !ok )
{
- // popup text %2 is a device name, %1 is the EVMS name
+ // popup text, %1 is a device name
Popup::Message(sformat(_("The device (%1) cannot be removed
Since it is a logical partition and another logical
partition with higher number is in use.
@@ -1023,15 +1002,6 @@
deleting the extended partition.
"));
}
- else if( used == `UB_EVMS )
- {
- // popup text, Do not translate EVMS.
- Popup::Message(_("
-The selected extended partition contains at least one partition
-that is used by an EVMS volume. Remove the EVMS volume
-before deleting the extended partition.
-"));
- }
else if( used != `UB_NONE )
{
// popup text, Do not translate RAID.
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.17.22/storage/src/include/custom_part_dialogs.ycp \
new/yast2-storage-2.17.23/storage/src/include/custom_part_dialogs.ycp
--- old/yast2-storage-2.17.22/storage/src/include/custom_part_dialogs.ycp 2008-08-05 \
17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/custom_part_dialogs.ycp 2008-08-29 \
15:02:17.000000000 +0200 @@ -16,7 +16,7 @@
*
*************************************************************
- $Id: custom_part_dialogs.ycp 49585 2008-08-01 13:55:43Z aschnell $
+ $Id: custom_part_dialogs.ycp 50483 2008-08-29 13:02:17Z aschnell $
*/
{
@@ -1610,15 +1610,6 @@
deleting the device.
"));
}
- else if( used == `UB_EVMS )
- {
- // popup text, Do not translate EVMS.
- Popup::Message(_("
-The selected device contains at least one partition
-that is used by an EVMS device. Delete the EVMS device
-before deleting the device.
-"));
- }
else if( used != `UB_NONE )
{
// popup text
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.17.22/storage/src/include/custom_part_helptexts.ycp \
new/yast2-storage-2.17.23/storage/src/include/custom_part_helptexts.ycp
--- old/yast2-storage-2.17.22/storage/src/include/custom_part_helptexts.ycp 2008-08-05 \
17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/custom_part_helptexts.ycp 2008-08-29 \
15:02:17.000000000 +0200 @@ -20,7 +20,7 @@
*
*************************************************************
- $Id: custom_part_helptexts.ycp 42953 2007-12-11 11:52:35Z fehr $
+ $Id: custom_part_helptexts.ycp 50483 2008-08-29 13:02:17Z aschnell $
*/
@@ -311,7 +311,7 @@
");
// helptext expert partitioning. 19
help_text = help_text + _("<p>
-<b>Used By</b> tells if a device is used by LVM, RAID or EVMS. If you do not use \
such +<b>Used By</b> tells if a device is used by LVM or RAID. If you do not use such
things, it is perfectly normal for this column to be empty.
</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.17.22/storage/src/include/custom_part_lib.ycp \
new/yast2-storage-2.17.23/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.17.22/storage/src/include/custom_part_lib.ycp 2008-08-05 \
17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/custom_part_lib.ycp 2008-08-29 \
10:35:17.000000000 +0200 @@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 45104 2008-02-28 16:02:02Z fehr $
+ $Id: custom_part_lib.ycp 50460 2008-08-28 14:07:16Z aschnell $
*
*/
@@ -412,7 +412,7 @@
{
allowed = false;
// error popup text
- Popup::Error(_("Invalid character in mount point. Dont use \"`'!\"%#\" in a \
mount point.")); + Popup::Error(_("Invalid character in mount point. Do not use \
\"`'!\"%#\" in a mount point.")); }
// check if the mount point is a system mount point
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.17.22/storage/src/include/ep-all.ycp \
new/yast2-storage-2.17.23/storage/src/include/ep-all.ycp
--- old/yast2-storage-2.17.22/storage/src/include/ep-all.ycp 2008-08-05 \
17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/ep-all.ycp 2008-08-28 \
14:36:51.000000000 +0200 @@ -24,13 +24,32 @@
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
`VBox(
+ // dialog heading, %1 is replaced with hostname
`IconAndHeading(sformat(_("Available Storage on %1"), short_hostname), \
all_icon), `Table(`id(`table), `opt(`keepSorting, `notify),
table_header, table_contents)
))
);
- string helptext = _("<p>Help about view with all devices TODO.</p>");
+ // helptext
+ string helptext = _("<p>This view shows all storage devices
+available.</p>");
+
+ map display_info = UI::GetDisplayInfo();
+
+ if (!display_info["TextMode"]:false)
+ {
+ // helptext
+ helptext = helptext + _("<p>By double clicking on a table entry
+you can navigate to the view with detailed information about the
+device.</p>");
+ }
+ else
+ {
+ // helptext
+ helptext = helptext + _("<p>By selecting a table entry you can
+navigate to the view with detailed information about the device.</p>");
+ }
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
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.17.22/storage/src/include/ep-dm.ycp \
new/yast2-storage-2.17.23/storage/src/include/ep-dm.ycp
--- old/yast2-storage-2.17.22/storage/src/include/ep-dm.ycp 2008-08-15 \
18:13:06.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/ep-dm.ycp 2008-08-28 \
15:18:10.000000000 +0200 @@ -38,7 +38,10 @@
)
);
- string helptext = _("<p>DM TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all Device Mapper devices
+except for those already included in some other view. Thus Multipath Disks,
+BIOS RAIDs and LVM logical volumes are not shown here.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
@@ -66,7 +69,9 @@
)
);
- string helptext = _("<p>DM TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows detailed information about the
+selected Device Mapper device.</p>");
Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields));
}
@@ -111,7 +116,9 @@
)
);
- string helptext = _("<p>DM TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all devices used by the
+selected Device Mapper device.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
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.17.22/storage/src/include/ep-hd-dialogs.ycp \
new/yast2-storage-2.17.23/storage/src/include/ep-hd-dialogs.ycp
--- old/yast2-storage-2.17.22/storage/src/include/ep-hd-dialogs.ycp 2008-08-13 \
15:35:57.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/ep-hd-dialogs.ycp 2008-08-28 \
16:01:14.000000000 +0200 @@ -139,7 +139,7 @@
}
else if (size_k < min_size_k || size_k > max_size_k)
{
- Popup::Error(sformat(_("The size entered is invalid. Enter a size beteen %1 \
and %2."), + Popup::Error(sformat(_("The size entered is invalid. Enter a size \
between %1 and %2."), Storage::KByteToHumanString(min_size_k),
Storage::KByteToHumanString(max_size_k)));
widget = `again;
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.17.22/storage/src/include/ep-hd.ycp \
new/yast2-storage-2.17.23/storage/src/include/ep-hd.ycp
--- old/yast2-storage-2.17.22/storage/src/include/ep-hd.ycp 2008-08-18 \
16:50:01.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/ep-hd.ycp 2008-08-28 \
16:26:33.000000000 +0200 @@ -98,7 +98,9 @@
)
);
- string helptext = _("<p>HD TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all hard disks including
+iSCSI disks, BIOS RAIDs and Multipath disks and their partitions.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
@@ -217,7 +219,9 @@
)
);
- string helptext = _("<p>HD TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows detailed information about the
+selected hard disk.</p>");
Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields));
}
@@ -291,7 +295,9 @@
)
));
- string helptext = _("<p>HD TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all partitions of the selected
+hard disk.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
@@ -355,7 +361,10 @@
)
);
- string helptext = _("<p>Disk TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all devices used by the
+selected hard disk. The table is non-empty only for BIOS RAIDs and Multipath
+Disks.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
@@ -427,7 +436,9 @@
)
);
- string helptext = _("<p>HD TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows detailed information about the
+selected partition.</p>");
Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields));
}
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.17.22/storage/src/include/ep-log.ycp \
new/yast2-storage-2.17.23/storage/src/include/ep-log.ycp
--- old/yast2-storage-2.17.22/storage/src/include/ep-log.ycp 2008-08-05 \
17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/ep-log.ycp 2008-08-28 \
14:58:57.000000000 +0200 @@ -24,7 +24,10 @@
)
));
- Wizard::RestoreHelp("Log help TODO");
+ // helptext, %1 is replaced by a filename
+ string helptext = sformat(_("This view shows the content of %1."), file);
+
+ Wizard::RestoreHelp(helptext);
LogViewCore::Start(`id(`log), $[ "file" : file ]);
}
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.17.22/storage/src/include/ep-lvm-dialogs.ycp \
new/yast2-storage-2.17.23/storage/src/include/ep-lvm-dialogs.ycp
--- old/yast2-storage-2.17.22/storage/src/include/ep-lvm-dialogs.ycp 2008-08-13 \
15:35:57.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/ep-lvm-dialogs.ycp 2008-08-28 \
16:01:10.000000000 +0200 @@ -389,7 +389,7 @@
}
else if (size_k < min_size_k || size_k > max_size_k)
{
- Popup::Error(sformat(_("The size entered is invalid. Enter a size beteen %1 \
and %2."), + Popup::Error(sformat(_("The size entered is invalid. Enter a size \
between %1 and %2."), Storage::KByteToHumanString(min_size_k),
Storage::KByteToHumanString(max_size_k)));
widget = `again;
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.17.22/storage/src/include/ep-lvm.ycp \
new/yast2-storage-2.17.23/storage/src/include/ep-lvm.ycp
--- old/yast2-storage-2.17.22/storage/src/include/ep-lvm.ycp 2008-08-05 \
17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/ep-lvm.ycp 2008-08-28 \
16:23:07.000000000 +0200 @@ -42,7 +42,9 @@
)
);
- string helptext = _("<p>LVM TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all LVM volume groups and
+their logical volumes.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
@@ -80,7 +82,9 @@
)
);
- string helptext = _("<p>LVM TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows detailed information about the
+selected volume group.</p>");
Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields));
}
@@ -135,7 +139,9 @@
)
);
- string helptext = _("<p>LVM TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all logical volumes of the
+selected volume group.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
@@ -191,7 +197,9 @@
)
);
- string helptext = _("<p>LVM TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all physical volumes used by
+the selected volume group.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
@@ -255,7 +263,9 @@
)
);
- string helptext = _("<p>LVM TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows detailed information about the
+selected logical volume.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
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.17.22/storage/src/include/ep-raid.ycp \
new/yast2-storage-2.17.23/storage/src/include/ep-raid.ycp
--- old/yast2-storage-2.17.22/storage/src/include/ep-raid.ycp 2008-08-08 \
22:31:53.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/ep-raid.ycp 2008-08-28 \
16:26:10.000000000 +0200 @@ -42,7 +42,8 @@
)
);
- string helptext = _("<p>RAID TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all RAIDs except of BIOS RAIDs.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
@@ -84,7 +85,9 @@
)
);
- string helptext = _("<p>RAID TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows detailed information about the
+selected RAID.</p>");
Wizard::RestoreHelp(helptext + StorageFields::OverviewHelptext(fields));
}
@@ -135,7 +138,9 @@
)
);
- string helptext = _("<p>RAID TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows all devices used by the
+selected RAID.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
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.17.22/storage/src/include/ep-unused.ycp \
new/yast2-storage-2.17.23/storage/src/include/ep-unused.ycp
--- old/yast2-storage-2.17.22/storage/src/include/ep-unused.ycp 2008-08-05 \
17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/ep-unused.ycp 2008-08-28 \
15:16:04.000000000 +0200 @@ -53,7 +53,10 @@
))
);
- string helptext = _("<p>Unused TODO</p>");
+ // helptext
+ string helptext = _("<p>This view shows devices that have no mount
+point assigned to them, disks that are unpartitioned and logical volumes that
+have no logical volumes.</p>");
Wizard::RestoreHelp(helptext + StorageFields::TableHelptext(fields));
}
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.17.22/storage/src/include/target_modify.ycp \
new/yast2-storage-2.17.23/storage/src/include/target_modify.ycp
--- old/yast2-storage-2.17.22/storage/src/include/target_modify.ycp 2008-08-05 \
17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/include/target_modify.ycp 2008-08-29 \
14:34:02.000000000 +0200 @@ -9,7 +9,7 @@
*
*
*
- * $Id: target_modify.ycp 24036 2005-07-14 12:16:17Z arvin $
+ * $Id: target_modify.ycp 50480 2008-08-29 12:34:01Z aschnell $
*/
{
@@ -21,6 +21,7 @@
import "Partitions";
import "Storage";
+/*
define void RemoveUsedNonEvmsDm( map<string,map> target )
``{
boolean ret = true;
@@ -54,7 +55,9 @@
y2milestone( "RemoveUsedNonEvmsDm %1",
SCR::Execute( .target.bash_output, "/sbin/dmsetup ls" ));
}
+*/
+/*
define map<integer,map> HandleDeletedVgs( map<string,map> tg,
map<integer,map> modify_targets )
``{
@@ -77,5 +80,6 @@
y2milestone( "HandleDeletedVgs ret %1", modify_targets );
return( modify_targets );
}
+*/
}
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.17.22/storage/src/inst_disk_proposal.ycp \
new/yast2-storage-2.17.23/storage/src/inst_disk_proposal.ycp
--- old/yast2-storage-2.17.22/storage/src/inst_disk_proposal.ycp 2008-08-27 \
16:55:41.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/inst_disk_proposal.ycp 2008-08-28 \
16:04:59.000000000 +0200 @@ -241,7 +241,7 @@
To make only small adjustments to the proposed
setup (like e.g. changing filesystem types), choose
<b>%1</b> and do these modification in the expert
-partioner dialog.</p>
+partitioner dialog.</p>
"), deletechars(modify_str,"&"));
// help text continued
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.17.22/storage/src/modules/Storage.ycp \
new/yast2-storage-2.17.23/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.17.22/storage/src/modules/Storage.ycp 2008-08-27 \
16:59:47.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/modules/Storage.ycp 2008-08-29 \
16:51: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 50418 2008-08-27 14:59:47Z aschnell $
+ * $Id: Storage.ycp 50490 2008-08-29 14:51:19Z aschnell $
*/
{
@@ -220,6 +220,7 @@
* @param string dev
* @return string EvmsDevDisk
*/
+/*
global string EvmsDevDisk( string dev )
{
string ret = "/dev/" + substring( dev, 10 );
@@ -233,16 +234,13 @@
ret = String::Replace( ret, "|", "/" );
return( ret );
}
-
+*/
/* Storage = TargetMap
/* Storage = $[ "targets" : $[],
- "lvm_view_all_mnt" : true,
"whole_disk" : false,
"must_reread_partitions" : false,
"win_device" : false,
- "raidtab_created" : false,
- "use_lvm" : false,
"testsuite" : false,
"do_resize" : "",
"part_proposal_mode" : "",
@@ -253,18 +251,12 @@
map StorageMap = $[];
- map<integer,map> StorageMaps = $[];
/* stringkeys for access to the Storage map */
- string lvm_view_all_mnt_key = "lvm_view_all_mnt";
string targets_key = "targets";
- string targets_backup_key = "targets_backup";
- string targets_backup_l_key = "targets_l_backup";
- string targets_backup_m_key = "targets_m_backup";
string part_mode_key = "part_mode";
string part_disk_key = "part_disk";
string whole_disk_key = "whole_disk";
- string raidtab_created_key = "raidtab_created";
string testsuite_key = "testsuite";
string do_resize_key = "do_resize";
string win_device_key = "win_device";
@@ -272,13 +264,7 @@
string part_proposal_mode_key = "part_proposal_mode";
string part_proposal_first_key = "part_proposal_first";
string part_proposal_active_key = "part_proposal_active";
- string use_lvm_key = "use_lvm";
- string storage_map_key = "storage_map";
- string storage_type_key = "storage_type";
- string storage_doc_key = "storage_doc";
- symbol record_key = `record;
- symbol custom_key = `custom;
boolean probe_done = false;
symbol exit_key = `next;
any sint = nil;
@@ -408,9 +394,7 @@
global define map<string,map> GetTargetMap();
-/**
-*
-*/
+
define list<map> GetDiskPartitionTg( string device, map<string,map> tg )
``{
@@ -2131,22 +2115,6 @@
StorageMap = add( StorageMap, testsuite_key, value );
}
- global define boolean GetLvmViewAllMnt()``{
- return StorageMap[lvm_view_all_mnt_key]:true;
- }
-
- global define void SetLvmViewAllMnt( boolean value ) ``{
- StorageMap = add( StorageMap, lvm_view_all_mnt_key, value );
- }
-
- global define boolean GetRaidtabCreated()``{
- return StorageMap[raidtab_created_key]:false;
- }
-
- global define void SetRaidtabCreated( boolean value ) ``{
- StorageMap = add( StorageMap, raidtab_created_key, value );
- }
-
global define string GetDoResize()``{
return StorageMap[do_resize_key]:"NO";
}
@@ -2188,118 +2156,6 @@
}
-
-
- /* StorageMaps = [
- 1: $[ storage_map_key : $[ Storage_01],
- storage_type_key : `record,
- ],
- 2, $[ storage_map_key : $[ Storage_02],
- storage_type_key : `custom,
- storage_doc_key : "create partition /dev/hda2"
- ],
- 3: $[ storage_map_key : $[ Storage_03 ],
- storage_type_key : `custom,
- storage_doc_key : "delete partition /dev/hda1"
- ],
- 4: $[ storage_map_key : $[ Storage_04 ],
- storage_type_key : `record
- ]
- ];
- */
-
-
-
- /* Record - Rollback - Commit */
- /* update focus and Storage - StorageStack */
-
- /* Find the next free position in the map StorageMaps
- * @return integer
- */
- define integer NextStorageMapsPos() ``{
- return (size( StorageMaps) + 1);
- }
-
-
- define integer FindLastRecordEntry() ``{
- map<integer,any> all_record_entries = (map<integer,any>)filter (integer key, map \
entry , StorageMaps, ``( entry[storage_type_key]:custom_key == \
record_key ));
- list<integer> all_record_keys = (list<integer>) maplist(integer key, any entry , \
all_record_entries, ``( key ));
-
- if( size( all_record_entries ) > 0 )
- return sort(integer x, integer y, all_record_keys , ``(y < x))[0]:1;
- else return 0;
- }
-
-
- define void Rollback2Pos(integer pos ) ``{
- StorageMap = StorageMaps[pos,storage_map_key]:$[];
- StorageMaps = filter(integer key, map entry, StorageMaps, ``( key < pos ));
- }
-
-
- define void AddEntry2StorageMaps(symbol type_key, string doc )``{
- map storage_maps_entry = $[];
-
- storage_maps_entry = add(storage_maps_entry, storage_map_key , StorageMap );
- storage_maps_entry = add(storage_maps_entry, storage_type_key , type_key );
-
- if( doc != "" )
- storage_maps_entry = add(storage_maps_entry, storage_type_key , doc );
-
- StorageMaps = add( StorageMaps, NextStorageMapsPos(), storage_maps_entry );
- }
-
-
- /**
- *
- * @return boolean
- */
-/*
- global define void Record()``{
- AddEntry2StorageMaps( record_key, "");
- }
-*/
-
- /**
- *
- * @return boolean
- */
-/*
- global define boolean Rollback()``{
- integer last_record_entry = FindLastRecordEntry();
- if( last_record_entry != 0 )
- {
- Rollback2Pos( last_record_entry );
- return true;
- }
- else
- {
- return false;
- }
- }
-*/
-
- /**
- *
- * @return boolean
- */
-/*
-global define boolean Commit()
- ``{
- integer last_record_entry = FindLastRecordEntry();
- if( last_record_entry != 0 )
- {
- StorageMaps = filter( integer key, map entry, StorageMaps,
- ``( key < last_record_entry ));
- return true;
- }
- else
- {
- return false;
- }
- }
-*/
-
global define void InstallCallbacks()
{
StorageClients::InstallCallbacks();
@@ -2311,9 +2167,6 @@
``{
map m = (map)SCR::Execute(.target.bash_output, "date +%s.%N" );
y2milestone( "constructor Storage() time:%1", m["stdout"]:"" );
- StorageMap[targets_backup_key] = $[];
- StorageMap[targets_backup_l_key] = $[];
- StorageMap[targets_backup_m_key] = $[];
if( Mode::normal() )
{
Storage::SetPartMode( "CUSTOM" );
@@ -2377,117 +2230,6 @@
symbol extended_type_key= `extended;
-
-
-
-global define map<string,map> RemoveAllPartEntry( map<string,map> tg, string skey, \
string value )
- ``{
- map<string,map> new_tg = tg;
-
- foreach(string dev, map disk, tg,
- ``{
- boolean changed = false;
- list new_partitions = [];
- foreach (map partition, disk["partitions"]:[],
- ``{
- if( partition[skey]:"" == value )
- {
- partition = filter(string key, any value_inner, (map<string,any>)partition, ``( \
key != skey));
- changed = true;
- }
- new_partitions = add( new_partitions , partition);
- });
-
- if( changed )
- {
- disk["partitions"] = new_partitions;
- new_tg[dev] = disk;
- }
- });
- return( new_tg );
- };
-
-global define list<map> RenumberS390Partitions( string dname,
- list<map> partitions )
- ``{
- integer cnt = 1;
- partitions = sort( map a, map b, partitions,
- ``(a["region",0]:0<b["region",0]:0));
- partitions = maplist( map p, partitions,
- ``{
- if( p["nr"]:0 != cnt )
- {
- if( !haskey( p, "ori_nr" ) )
- {
- p["ori_nr"] = p["nr"]:0;
- }
- p["nr"] = cnt;
- p["device"] = GetDeviceName( dname, cnt );
- }
- cnt = cnt+1;
- return( p );
- });
- y2milestone( "RenumberS390Partions %1", partitions );
- return( partitions );
- }
-
-global define map<string, map>
-RenameTgDevices( map<string, map> tg, map<string, string> ren )
- ``{
- y2milestone( "RenameTgDevices ren:%1", ren );
- foreach( string dev, map co, tg,
- ``{
- if( search( dev, "/dev/evms/" ) == 0 )
- {
- y2milestone( "RenameTgDevices before added:%1 removed:%2",
- co["added"]:[], co["removed"]:[] );
- if( size(co["added"]:[])>0 )
- {
- co["added"] =
- maplist( string d, co["added"]:[],
- ``(haskey( ren, d )?(ren[d]:""):d));
- }
- if( size(co["removed"]:[])>0 )
- {
- co["removed"] =
- maplist( string d, co["removed"]:[],
- ``(haskey( ren, d )?(ren[d]:""):d));
- }
- y2milestone( "RenameTgDevices after added:%1 removed:%2",
- co["added"]:[], co["removed"]:[] );
- tg[dev] = co;
- }
- });
- return( tg );
- }
-
-global define map<integer, map>
-RenameMtDevices( map<integer, map> mt, map<string, string> ren )
- ``{
- y2milestone( "RenameMtDevices ren:%1", ren );
- foreach( integer num, map entry, mt,
- ``{
- if( entry["type"]:""=="create_vg" && size(entry["devices"]:[])>0 )
- {
- y2milestone( "RenameMtDevices before entry:%1", entry );
- entry["devices"] =
- maplist( string d, entry["devices"]:[],
- ``(haskey( ren, d )?(ren[d]:""):d));
- y2milestone( "RenameMtDevices after entry:%1", entry );
- mt[num] = entry;
- }
- if( (entry["type"]:""=="create_pv" || entry["type"]:""=="remove_pv") &&
- haskey( ren, entry["device"]:"" ))
- {
- y2milestone( "RenameMtDevices before entry:%1", entry );
- entry["device"] = ren[entry["device"]:""]:"";
- y2milestone( "RenameMtDevices after entry:%1", entry );
- mt[num] = entry;
- }
- });
- return( mt );
- }
-
global map NextPartition( string disk, symbol ptype )
{
y2milestone( "NextPartition disk:%1 ptype:%2", disk, ptype );
@@ -4434,15 +4176,6 @@
};
- /* Functions for testing */
-
- global define void DebugStorage()``{
-
- y2milestone("StorageMaps: %1",StorageMaps);
- y2milestone("Storage:%1",StorageMap);
- }
-
-
/**
* Check if a disk is a real disk and not RAID or LVM
*
@@ -4726,76 +4459,49 @@
return( ret );
}
-global define list<string> AddPackageList()
- ``{
+
+global list<string> AddPackageList()
+{
list<string> pl = hw_packages;
- boolean mount_lvm = false;
- boolean need_evms = false;
+
map<string,map> tg = GetTargetMap();
- map<string,map> tt = filter( string k, map e, tg,
- ``(e["type"]:`CT_UNKNOWN==`CT_LVM ));
- boolean have_lvm = size(tt)>0;
- if( have_lvm )
- {
- list<map> part = [];
- foreach( string k, map e, tt,
- ``{
- part = (list<map>)merge( part, e["partitions"]:[]);
- });
- mount_lvm = size(filter( map p, part, ``(size(p["mount"]:"")>0)))>0;
- }
- tt = filter( string k, map e, tg, ``(k=="/dev/evms"||search(k, \
"/dev/evms/")==0));
- if( size(filter( string k, map e, tg, ``(e["is_container"]:false &&
- search(e["name"]:"","lvm/")!=0 &&
- search(e["name"]:"","lvm2/")!=0)))>0)
- {
- y2milestone( "non lvm evms container" );
- need_evms = true;
- }
- if( !need_evms )
- {
- list<map> part = [];
- foreach( string k, map e, tt,
- ``{
- part = (list<map>)merge( part, e["partitions"]:[]);
- });
- need_evms = size(filter( map p, part, ``(size(p["mount"]:"")>0)))>0;
- }
- y2milestone( "AddPackageList have_lvm %1 mount_lvm %2 need_evms %3",
- have_lvm, mount_lvm, need_evms );
- if( have_lvm && (mount_lvm||!need_evms))
- {
- pl = add( pl, "lvm2" );
- }
- if( need_evms )
- {
- pl = add( pl, "evms" );
- pl = add( pl, "yast2-storage-evms" );
- }
+
+ boolean need_lvm = false;
boolean need_quota = false;
boolean need_crypt = false;
- foreach( string k, map e, tg,
- ``{
+
+ foreach( string k, map e, tg, {
+ if (e["type"]:`CT_UNKNOWN == `CT_LVM)
+ need_lvm = true;
if( size(filter( map p, e["partitions"]:[],
``(FileSystems::HasQuota(p))))>0 )
need_quota = true;
if( size(filter( map p, e["partitions"]:[],
``(p["enc_type"]:`none != `none)))>0 )
need_crypt = true;
- });
+ });
+
+ y2milestone("AddPackageList need lvm:%1 quota:%2 crypt:%3", need_lvm, \
need_quota, need_crypt); +
+ if (need_lvm)
+ {
+ pl = add(pl, "lvm2");
+ }
if( need_quota )
- {
+ {
pl = add( pl, "quota" );
- }
+ }
if( need_crypt )
- {
+ {
pl = add( pl, "cryptsetup" );
pl = add( pl, "pam_mount" );
- }
- y2milestone( "AddPackageList ret %1", pl );
- return( pl );
}
+ y2milestone("AddPackageList ret %1", pl);
+ return pl;
+}
+
+
global define list GetForeignPrimary()
``{
list ret = [];
@@ -4893,66 +4599,6 @@
return( pt );
}
-//-----------------------------------------------------
-//
-// change an entry in /etc/fstab
-//
-global define void ChangeLineFstab( map entry )
- ``{
- string tabpath = PathToDestdir( "/etc/fstab" );
- if( Installation::scr_destdir != "/" )
- {
- if( SCR::Read( .target.size, tabpath )>= 0 )
- SCR::Execute( .target.remove, tabpath );
- }
- map fstab = Partitions::GetFstab( tabpath );
- list lines = Storage::FindFstabLines( fstab, entry["mount"]:"",
- entry["spec"]:"", "x", "x" );
- list fstlist = [ entry["spec"]:"", entry["mount"]:"",
- entry["vfstype"]:"", entry["mntops"]:"",
- sformat("%1",entry["freq"]:0),
- sformat("%1",entry["passno"]:0) ];
- y2milestone( "lines %1", lines );
- if( size(lines)==0 )
- {
- AsciiFile::AppendLine( fstab, fstlist );
- }
- else
- {
- integer field = 0;
- while( field<4 )
- {
- AsciiFile::ChangeLineField( fstab, lines[0]:-1, field,
- fstlist[field]:"" );
- field = field+1;
- }
- }
- string dir = entry["mount"]:"";
- if( substring( dir, 0, 1 )== "/" )
- {
- dir = PathToDestdir( dir );
- if( SCR::Read( .target.size, dir )<=0 )
- {
- SCR::Execute( .target.mkdir, dir );
- }
- }
- AsciiFile::RewriteFile( fstab, tabpath );
- };
-
-global define map MakeCdromFstabEntry( map cd )
- ``{
- map entry = FileSystems::GetFstabDefaultMap( "cdrom" );
- string cdmount = cd["linkname"]:"";
- entry["spec"] = cdmount;
- entry["mount"] = "/media/"+substring(cdmount,5);
- string enc = FileSystems::LangTypicalEncoding();
- if( !contains( [ "iso8859-1", "iso8859-15", "" ], enc ))
- {
- entry["mntops"] = entry["mntops"]:"" + ",iocharset=" + enc;
- }
- y2milestone( "ret %1", entry );
- return( entry );
- };
define void HandleModulesOnBoot( map<string,map> targetMap )
``{
@@ -5036,33 +4682,6 @@
y2milestone( "return" );
}
-void UpdateBootFstabEvms()
- {
- string tabpath = PathToDestdir( "/etc/fstab" );
- y2milestone( "UpdateBootFstabEvms %1",
- SCR::Execute( .target.bash_output, "grep /boot " + tabpath ));
- map fstab = Partitions::GetFstab( tabpath );
- list lines = AsciiFile::FindLineField( fstab, 1, Partitions::BootMount() );
- y2milestone( "UpdateBootFstabEvms lines %1", lines );
- map l = AsciiFile::GetLine( fstab, lines[0]:-1 );
- if( search( l["fields",0]:"", "/dev/evms" )!=0 )
- {
- map<string,map> tg = filter( string k, map e, GetTargetMap(),
- ``(IsRealDisk( e )) );
- map p = GetPartition( tg, l["fields",0]:"" );
- y2milestone( "UpdateBootFstabEvms p %1", p );
- if( size(p)>0 )
- {
- AsciiFile::ChangeLineField( fstab, lines[0]:-1, 0,
- "/dev/evms/"+substring(p["device"]:"",5));
- AsciiFile::RewriteFile( fstab, tabpath );
- }
- }
- y2milestone( "UpdateBootFstabEvms %1",
- SCR::Execute( .target.bash_output, "grep /boot " + tabpath ));
- }
-
-global define boolean BootEvms();
/**
* Writes fstab to the disk
@@ -5091,8 +4710,6 @@
Storage::AddFstabEntry( m );
num = num+1;
});
- if( BootEvms() )
- UpdateBootFstabEvms();
HandleModulesOnBoot( GetTargetMap() );
}
@@ -5164,56 +4781,6 @@
return( tg );
}
-global define list<list<string> > AutodetectMultipathRaid( map<string,map> tg )
- ``{
- list<list<string> > ret = [];
- map<string, list> disks = (map<string, list>) $[];
- foreach(string dev, map disk, tg,
- ``{
- string id = disk["unique"]:"";
- integer pos = search( id, "." );
- if( pos != nil )
- {
- id = substring( id, pos+1 );
- if( haskey( disks, id ) )
- {
- disks[id] = add( disks[id]:[], dev );
- }
- else
- {
- disks[id] = [ dev ];
- }
- }
- });
- disks = (map<string, list>) filter(string key, list entry, disks, \
``(size(entry)>=2) );
- y2milestone( "disks %1", disks );
- foreach( string key, list entry, disks,
- ``{
- foreach(map p, tg[entry[0]:"","partitions"]:[],
- ``{
- boolean ok = true;
- list<string> dl = [];
- foreach(string disk, (list<string>)entry,
- ``{
- string dev = p["device"]:"";
- map p1 = GetPartition( tg, dev );
- if( p1["type"]:`primary == `extended ||
- p1["used_by_type"]:`UB_NONE!=`UB_NONE ||
- size(p1["mount"]:"")>0 )
- {
- ok = false;
- }
- dl = add( dl, dev );
- });
- if( ok )
- {
- ret = add( ret, dl );
- }
- });
- });
- y2milestone( "ret %1", ret );
- return( ret );
- }
global define boolean PerformLosetup( map& loop, boolean format )
``{
@@ -5842,6 +5409,7 @@
return( ret );
}
+/*
global define list GetUsedLvmGroups( map<string,map> tg )
``{
list groups = [];
@@ -5860,6 +5428,7 @@
y2milestone( "GetUsedLvmGroups ret %1", groups );
return( groups );
};
+*/
/**
* Get used real disks
@@ -5868,6 +5437,7 @@
* @param boolean ignore boot
* @return list <string> disks List of disks
*/
+/*
global define list<string> GetUsedRealDisksNew( map<string,map> tg,
boolean ignore_boot )
``{
@@ -5899,12 +5469,16 @@
ignore_boot, disks );
return( disks );
};
+*/
+/*
global define list<string> GetUsedRealDisks( map<string,map> tg )
{
return( GetUsedRealDisksNew( tg, false ));
};
+*/
+/*
global define list<string> GetEvmsRealDisk( map<string,map> tg, map p )
``{
list<string> rdisk = [];
@@ -5962,7 +5536,9 @@
y2milestone( "GetEvmsRealDisk %1 is %2", p["device"]:"", rdisk );
return( rdisk );
}
+*/
+/*
global define list<string> GetUsedEvmsDisks( map<string,map> tg )
``{
list<string> disks = [];
@@ -6007,8 +5583,9 @@
y2milestone( "GetUsedEvmsDisks ret %1", disks );
return( disks );
};
+*/
-
+/*
global list<map> GetPrepBoot( map<string,map> tg )
{
list<map> ret = [];
@@ -6024,6 +5601,7 @@
y2milestone( "GetPrepBoot ret:%1", ret );
return( ret );
}
+*/
void CallInsserv( boolean on, string name )
{
@@ -6041,13 +5619,16 @@
}
}
-global define void FinishInstall()
- ``{
- y2milestone( "FinishInstall initial:%1", Stage::initial() );
+global void FinishInstall()
+{
+ y2milestone("FinishInstall initial:%1", Stage::initial());
+
map<string,map> tg = GetTargetMap();
+
if( Stage::initial() )
{
HandleModulesOnBoot( tg );
+/*
list evms = GetUsedEvmsDisks( tg );
y2milestone( "FinishInstall evms %1", evms );
if( size(evms)>0 )
@@ -6099,14 +5680,16 @@
i = i+1;
}
}
+*/
}
+
boolean need_crypt = false;
boolean need_md = false;
boolean need_lvm = false;
boolean need_dmraid = false;
boolean need_dmmultipath = false;
- foreach( string k, map e, tg,
- ``{
+
+ foreach( string k, map e, tg, {
if( size(filter( map p, e["partitions"]:[],
``(p["enc_type"]:`none != `none)))>0 )
need_crypt = true;
@@ -6118,19 +5701,20 @@
need_dmraid = true;
if( e["type"]:`CT_UNKNOWN==`CT_DMMULTIPATH )
need_dmmultipath = true;
- });
+ });
+
y2milestone( "FinishInstall need crypto:%1 md:%2 lvm:%3 dmraid:%4 \
dmmultipath:%5",
need_crypt, need_md, need_lvm, need_dmraid, need_dmmultipath );
- string cmd = "";
- map bo = $[];
+
if( need_crypt )
CallInsserv( true, "crypto" );
CallInsserv( need_md, "md" );
CallInsserv( need_lvm, "lvm" );
CallInsserv( need_dmraid, "dmraid" );
// activation of multipath is task of yast2-multipath
- y2milestone( "FinishInstall done" );
- }
+
+ y2milestone("FinishInstall done");
+}
global define map GetEntryForMountpoint( string mp )
``{
@@ -6671,10 +6255,7 @@
global boolean BootEvms()
{
- map cfg = GetControlCfg();
- boolean ret = cfg["evms_boot"]:false;
- y2milestone( "BootEvms ret %1", ret );
- return( ret );
+ return false;
}
global string ProposalVM()
@@ -6805,50 +6386,26 @@
return( ret );
}
-global string GetUsedFs()
+
+global list<string> GetUsedFs()
{
if (!InitLibstorage(false))
return nil;
- string r = LibStorage::StorageInterface::getAllUsedFs( sint );
- list<string> lr = sort(splitstring(r," \t"));
- r = mergestring( lr, " " );
- y2milestone( "GetUsedFs ret:%1", r );
- return( r );
+ list<string> r = LibStorage::StorageInterface::getAllUsedFs(sint);
+ y2milestone("GetUsedFs ret:%1", r);
+ return r;
}
-list FindUsedFsLine( map file )
- {
- list ret = [];
- list<list> t = maplist( integer k, map e, file["l"]:$[],
- ``([k, e["line"]:""]));
- t = filter( list e, t, ``(search(e[1]:"","USED_FS_LIST")==0));
- y2milestone( "FindUsedFsLine t:%1", t );
- ret = t[0]:[];
- y2milestone( "FindUsedFsLine ret:%1", ret );
- return( ret );
- }
global void SaveUsedFs()
- {
- y2milestone( "SaveUsedFs" );
- string s = GetUsedFs();
- map file = $[];
- AsciiFile::ReadFile( file, "/etc/sysconfig/storage" );
- list l = FindUsedFsLine( file );
- string e = "USED_FS_LIST=\"" + s + "\"";
- integer lineno = l[0]:(size(file["l"]:$[]) + 1);
- if( size(l)==0 )
- file["l",lineno] = $[];
- if( file["l",lineno,"line"]:""!=e )
- {
- file["l",lineno,"line"] = e;
- file["l",lineno,"changed"] = true;
- AsciiFile::RewriteFile( file, "/etc/sysconfig/storage" );
- }
- }
+{
+ y2milestone("SaveUsedFs");
+ SCR::Write(.sysconfig.storage.USED_FS_LIST, mergestring(GetUsedFs(), " "));
+}
+
-global boolean Storage::IsPersistent( map p )
+global boolean IsPersistent( map p )
{
boolean ret = contains( [ `lvm, `sw_raid, `dm ], p["type"]:`unknown );
if( !ret && contains( [ `evms, `primary, `logical, `extended ],
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.17.22/storage/src/storage_finish.ycp \
new/yast2-storage-2.17.23/storage/src/storage_finish.ycp
--- old/yast2-storage-2.17.22/storage/src/storage_finish.ycp 2008-08-05 \
17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.23/storage/src/storage_finish.ycp 2008-08-29 \
10:35:17.000000000 +0200 @@ -8,7 +8,7 @@
* Authors:
* Jiri Srain <jsrain@suse.cz>
*
- * $Id: storage_finish.ycp 49562 2008-08-01 08:57:04Z aschnell $
+ * $Id: storage_finish.ycp 50466 2008-08-28 19:53:30Z aschnell $
*
*/
@@ -59,13 +59,6 @@
if( !Mode::update () )
{
SCR::Execute (.target.mkdir, Installation::sourcedir);
-
- // copy /etc/raidtab to target if it was created
-
- if (Storage::GetRaidtabCreated())
- {
- InjectFile ("/etc/raidtab");
- }
Storage::FinishInstall ();
}
else
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.17.22/VERSION \
new/yast2-storage-2.17.23/VERSION
--- old/yast2-storage-2.17.22/VERSION 2008-08-26 13:43:30.000000000 +0200
+++ new/yast2-storage-2.17.23/VERSION 2008-08-29 16:52:30.000000000 +0200
@@ -1 +1 @@
-2.17.22
+2.17.23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic