Author: aschnell
Date: Thu Jul 23 09:43:24 2009
New Revision: 58136
URL: http://svn.opensuse.org/viewcvs/yast?rev=58136&view=rev
Log:
- show ignore_fstab flag in mount-by information (fate #305150)
Modified:
trunk/storage/package/yast2-storage.changes
trunk/storage/storage/src/modules/Storage.ycp
trunk/storage/storage/src/modules/StorageFields.ycp
Modified: trunk/storage/package/yast2-storage.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=58136&r1=58135&r2=58136&view=diff
==============================================================================
--- trunk/storage/package/yast2-storage.changes (original)
+++ trunk/storage/package/yast2-storage.changes Thu Jul 23 09:43:24 2009
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Jul 23 09:40:45 CEST 2009 - aschnell@suse.de
+
+- show ignore_fstab flag in mount-by information (fate #305150)
+
+-------------------------------------------------------------------
Wed Jul 22 11:46:56 CEST 2009 - aschnell@suse.de
- added graphical representation of logical volumes of volume group
Modified: trunk/storage/storage/src/modules/Storage.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Storage.ycp?rev=58136&r1=58135&r2=58136&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/Storage.ycp (original)
+++ trunk/storage/storage/src/modules/Storage.ycp Thu Jul 23 09:43:24 2009
@@ -433,6 +433,18 @@
}
+ global boolean SetIgnoreFstab(string device, boolean val)
+ {
+ return LibStorage::StorageInterface::setIgnoreFstab(sint, device, val) == 0;
+ }
+
+
+ global boolean GetIgnoreFstab(string device, boolean& val)
+ {
+ return LibStorage::StorageInterface::getIgnoreFstab(sint, device, val) == 0;
+ }
+
+
global define map GetTargetMap();
Modified: trunk/storage/storage/src/modules/StorageFields.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageFields.ycp?rev=58136&r1=58135&r2=58136&view=diff
==============================================================================
--- trunk/storage/storage/src/modules/StorageFields.ycp (original)
+++ trunk/storage/storage/src/modules/StorageFields.ycp Thu Jul 23 09:43:24 2009
@@ -337,13 +337,19 @@
ret = ret + _("<b>Mount By</b> indicates how the file system
is mounted: (Kernel) by Kernel Name, (Label) by File System Label, (UUID) by
File System UUID, (ID) by Device ID, and (Path) by Device Path.");
+ if (Mode::normal())
+ // helptext for table column and overview entry
+ ret = ret + " " + _("A question mark (?) indicates that
+the file system is not listed in <tt>/etc/fstab</tt>. It is either mounted
+manually or by some automount system. When changing setting of this volume
+YaST will not update <tt>/etc/fstab</tt>.");
break;
case `mount_point:
// helptext for table column and overview entry
ret = ret + _("<b>Mount Point</b> shows where the file system
is mounted.");
- if (Mode::normal() || true)
+ if (Mode::normal())
// helptext for table column and overview entry
ret = ret + " " + _("An asterisk (*) after the mount point
indicates a file system that is currently not mounted (for example, because it
@@ -449,11 +455,13 @@
map data = (part == nil ? disk : part);
symbol type = ( part == nil ? disk["type"]:`primary : part["type"]:`CT_DISK );
+ string device = data["device"]:"";
+
switch (field)
{
case `device:
{
- string value = data["device"]:"";
+ string value = device;
if (style == `table)
return value;
else
@@ -543,7 +551,7 @@
{
boolean value = data["enc_type"]:`none != `none;
if (style == `table)
- {
+ {
if (value)
{
if (UI::GetDisplayInfo()["HasIconSupport"]:false)
@@ -574,8 +582,13 @@
case `mount_point:
{
string value = data["mount"]:"";
- if (Mode::normal() && data["inactive"]:false )
- value = value + " *";
+
+ if (Mode::normal())
+ {
+ if (data["inactive"]:false )
+ value = value + " *";
+ }
+
if (style == `table)
return value;
else
@@ -586,11 +599,20 @@
case `mount_by:
{
string value = "";
+
if (data["mount"]:"" != "") {
map tmp = $[ `device : "Kernel", `uuid : "UUID", `label : "Label", `id : "ID", `path : "Path" ];
symbol mount_by = data["mountby"]:`device;
value = tmp[mount_by]:"";
}
+
+ if (Mode::normal())
+ {
+ boolean tmp = false;
+ if (Storage::GetIgnoreFstab(device, tmp) && tmp)
+ value = "?";
+ }
+
if (style == `table)
return value;
else
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
