Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Thu Jul 23 17:11:21 CEST 2009.
--------
--- yast2-storage/yast2-storage.changes 2009-07-16 11:55:57.000000000 +0200
+++ yast2-storage/yast2-storage.changes 2009-07-23 13:20:31.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Jul 23 13:35:57 CEST 2009 - kmachalkova@suse.cz
+
+- Added called_update flag to prevent multiple calls of
+ Storage::Update (breaks bootloader on kernel update - bnc#477778)
+ (patch by juhliarik)
+- 2.18.16
+
+-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.18.14.tar.bz2
New:
----
yast2-storage-2.18.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.HPUZri/_old 2009-07-23 17:10:49.000000000 +0200
+++ /var/tmp/diff_new_pack.HPUZri/_new 2009-07-23 17:10:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.18.14)
+# spec file for package yast2-storage (Version 2.18.16)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-storage
-Version: 2.18.14
-Release: 2
+Version: 2.18.16
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.18.14.tar.bz2
+Source0: yast2-storage-2.18.16.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
@@ -51,7 +51,7 @@
devices during installation and on an installed system.
%prep
-%setup -n yast2-storage-2.18.14
+%setup -n yast2-storage-2.18.16
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-storage-2.18.14.tar.bz2 -> yast2-storage-2.18.16.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.14/VERSION new/yast2-storage-2.18.16/VERSION
--- old/yast2-storage-2.18.14/VERSION 2009-07-09 15:34:16.000000000 +0200
+++ new/yast2-storage-2.18.16/VERSION 2009-07-23 13:17:43.000000000 +0200
@@ -1 +1 @@
-2.18.14
+2.18.16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.14/configure new/yast2-storage-2.18.16/configure
--- old/yast2-storage-2.18.14/configure 2009-07-16 11:50:44.000000000 +0200
+++ new/yast2-storage-2.18.16/configure 2009-07-23 13:19:06.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-storage 2.18.14.
+# Generated by GNU Autoconf 2.63 for yast2-storage 2.18.16.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.18.14'
-PACKAGE_STRING='yast2-storage 2.18.14'
+PACKAGE_VERSION='2.18.16'
+PACKAGE_STRING='yast2-storage 2.18.16'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1532,7 +1532,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-storage 2.18.14 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.18.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1603,7 +1603,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.18.14:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.18.16:";;
esac
cat <<\_ACEOF
@@ -1713,7 +1713,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.18.14
+yast2-storage configure 2.18.16
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1727,7 +1727,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-storage $as_me 2.18.14, which was
+It was created by yast2-storage $as_me 2.18.16, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2574,7 +2574,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.18.14'
+ VERSION='2.18.16'
cat >>confdefs.h <<_ACEOF
@@ -2798,7 +2798,7 @@
-VERSION="2.18.14"
+VERSION="2.18.16"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -17259,7 +17259,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-storage $as_me 2.18.14, which was
+This file was extended by yast2-storage $as_me 2.18.16, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17322,7 +17322,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-storage config.status 2.18.14
+yast2-storage config.status 2.18.16
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.14/configure.in new/yast2-storage-2.18.16/configure.in
--- old/yast2-storage-2.18.14/configure.in 2009-07-16 11:50:28.000000000 +0200
+++ new/yast2-storage-2.18.16/configure.in 2009-07-23 13:18:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.18.14, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.18.16, 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.18.14"
+VERSION="2.18.16"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.14/storage/src/include/ep-hd.ycp new/yast2-storage-2.18.16/storage/src/include/ep-hd.ycp
--- old/yast2-storage-2.18.14/storage/src/include/ep-hd.ycp 2009-06-09 14:40:06.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/include/ep-hd.ycp 2009-07-23 13:17:42.000000000 +0200
@@ -271,92 +271,9 @@
);
}
- term partitions_bargraph = `Empty();
-
- if (UI::HasSpecialWidget(`BarGraph))
- {
- map ddata = Storage::GetDisk(target_map, device);
-
- if (ddata["used_by_type"]:`UB_NONE == `UB_NONE)
- {
- list <integer> bits = [];
- list <string> labels = [];
- string emptyspace = _("Unpartitioned Space");
-
- // Filter out extended partitions
- list <map> partitions = (list <map>) filter ( map one_part, ddata["partitions"]:[], {
- return ( (one_part["type"]:`none == `primary) || (one_part["type"]:`none == `logical) );
- });
- // and sort the remaining ones by start cyl
- partitions = (list <map> ) sort (map m, map n, partitions, {
- return Region::Start( m["region"]:[] ) < Region::Start( n["region"]:[] );
- });
-
- // Clean disk (or 1 big extended partition)
- if (isempty(partitions))
- {
- bits = [100];
- labels = [ emptyspace + "\n" + Storage::KByteToHumanString(ddata["size_k"]:0)];
- }
- else
- {
- integer i = 0;
- integer part_count = size(partitions);
- integer ccyl = 0;
- integer endcyl = ddata["cyl_count"]:1;
-
- while(ccyl < endcyl)
- {
- map part = partitions[ i ]:$[];
- list <integer> region = partitions[ i, "region" ]:[];
- ccyl = Region::Start( region );
- integer next_cyl = 0;
-
- // this is the last partition in a row, look at the last cylinder of the disk
- if ( (i+1) == part_count)
- {
- next_cyl = endcyl;
- }
- // somewhere in the middle, look where the next partition starts
- else
- {
- next_cyl = Region::Start( partitions[ i+1, "region" ]:[] );
- }
-
- integer tmp = 100*Region::Length( region )/ddata["cyl_count"]:1; //in %
- string descr = part["device"]:"" + "\n" + Storage::KByteToHumanString(part["size_k"]:0);
- y2debug("this cyl: %1 text: %2 end cyl: %3 next cyl: %4", ccyl, descr, Region::End( region), next_cyl);
-
- // Guarantee some minimal share (1%) of total graph width to a segment
- // It prevents small partitions e.g. swaps from disappearing completely
- bits = add( bits, (tmp < 1) ? 1 : tmp );
- labels = add( labels, descr);
-
- // Now there is some xtra space between the end of this partition and the start of the next one
- // or the end of the disk if
- // 1. end +1th cyl is not the next one
- // 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
- if ( ( Region::End( region ) != next_cyl ) &&
- ( (Region::End( region) + 1) != next_cyl )
- )
- {
- integer tmp2 = 100*( next_cyl - Region::End(region))/ddata["cyl_count"]:1;
- bits = add( bits, (tmp2 < 1) ? 1 : tmp2);
- labels = add( labels, emptyspace + "\n" + Storage::ByteToHumanString( (next_cyl - Region::End(region)) * ddata["cyl_size"]:1));
- }
-
- ccyl = next_cyl;
- i = i+1;
- }
- }
-
- partitions_bargraph = `BarGraph(`id(`bgraph), bits, labels);
- }
- }
-
UI::ReplaceWidget(`tab_panel,
`VBox(
- partitions_bargraph,
+ DiskBarGraph(device),
`Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu),
table_header, table_contents),
`HBox(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.14/storage/src/include/ep-lib.ycp new/yast2-storage-2.18.16/storage/src/include/ep-lib.ycp
--- old/yast2-storage-2.18.14/storage/src/include/ep-lib.ycp 2009-06-03 00:22:34.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/include/ep-lib.ycp 2009-07-23 13:17:42.000000000 +0200
@@ -295,4 +295,119 @@
Storage::SetTargetMap(ti[0]:$[]);
}
}
+
+
+ term DiskBarGraph(string device)
+ {
+ if (!UI::HasSpecialWidget(`BarGraph))
+ return `Empty();
+
+ map target_map = Storage::GetTargetMap();
+ map disk = Storage::GetDisk(target_map, device);
+
+ if (disk["used_by_type"]:`UB_NONE != `UB_NONE)
+ return `Empty();
+
+ list <integer> bits = [];
+ list <string> labels = [];
+
+ void AddSegment(integer bit, string label, integer size_k)
+ {
+ // Guarantee some minimal share (1%) of total graph width to the segment.
+ // Prevents small partitions e.g. swaps from disappearing completely.
+ bits = add(bits, bit < 1 ? 1 : bit);
+ labels = add(labels, label + "\n" + Storage::KByteToHumanString(size_k));
+ }
+
+ switch (disk["type"]:`UNKNOWN)
+ {
+ case `CT_DISK:
+ case `CT_DMRAID:
+ case `CT_DMMULTIPATH:
+ {
+ string emptyspace = _("Unpartitioned Space");
+
+ // Filter out extended partitions
+ list <map> partitions = (list <map>) filter ( map one_part, disk["partitions"]:[], {
+ return ( (one_part["type"]:`none == `primary) || (one_part["type"]:`none == `logical) );
+ });
+ // and sort the remaining ones by start cyl
+ partitions = (list <map> ) sort (map m, map n, partitions, {
+ return Region::Start( m["region"]:[] ) < Region::Start( n["region"]:[] );
+ });
+
+ // Clean disk (or 1 big extended partition)
+ if (isempty(partitions))
+ {
+ bits = [100];
+ labels = [ emptyspace + "\n" + Storage::KByteToHumanString(disk["size_k"]:0)];
+ }
+ else
+ {
+ integer i = 0;
+ integer part_count = size(partitions);
+ integer ccyl = 0;
+ integer endcyl = disk["cyl_count"]:1;
+
+ while (ccyl < endcyl)
+ {
+ map part = partitions[ i ]:$[];
+ list <integer> region = partitions[ i, "region" ]:[];
+ ccyl = Region::Start( region );
+ integer next_cyl = 0;
+
+ // this is the last partition in a row, look at the last cylinder of the disk
+ if ( (i+1) == part_count)
+ {
+ next_cyl = endcyl;
+ }
+ // somewhere in the middle, look where the next partition starts
+ else
+ {
+ next_cyl = Region::Start( partitions[ i+1, "region" ]:[] );
+ }
+
+ integer tmp = 100 * Region::Length(region) / disk["cyl_count"]:1;
+ y2debug("i:%1 this cyl:%2 end cyl:%3 next cyl:%4", i, ccyl, Region::End(region), next_cyl);
+ AddSegment(tmp, part["device"]:"", part["size_k"]:0);
+
+ // Now there is some xtra space between the end of this partition and the start of the next one
+ // or the end of the disk if
+ // 1. end +1th cyl is not the next one
+ // 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
+ if ( ( Region::End( region ) != next_cyl ) &&
+ ( (Region::End( region) + 1) != next_cyl ) )
+ {
+ integer tmp2 = 100*( next_cyl - Region::End(region))/disk["cyl_count"]:1;
+ AddSegment(tmp2, emptyspace, ((next_cyl - Region::End(region)) * disk["cyl_size"]:1) / 1024);
+ }
+
+ ccyl = next_cyl;
+ i = i+1;
+ }
+ }
+ }
+ break;
+
+ case `CT_LVM:
+ {
+ list <map> partitions = disk["partitions"]:[];
+
+ integer disk_size_k = disk["size_k"]:1;
+ integer disk_free_k = disk_size_k;
+
+ foreach(map partition, partitions, {
+ integer size_k = partition["size_k"]:0;
+ disk_free_k = disk_free_k - size_k;
+ AddSegment(100 * size_k / disk_size_k, partition["device"]:"", size_k);
+ });
+
+ if (disk_free_k > 0)
+ AddSegment(100 * disk_free_k / disk_size_k, _("Unallocated Space"), disk_free_k);
+ }
+ break;
+ }
+
+ return `BarGraph(bits, labels);
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.14/storage/src/include/ep-lvm.ycp new/yast2-storage-2.18.16/storage/src/include/ep-lvm.ycp
--- old/yast2-storage-2.18.14/storage/src/include/ep-lvm.ycp 2009-06-09 14:40:49.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/include/ep-lvm.ycp 2009-07-23 13:17:42.000000000 +0200
@@ -243,6 +243,7 @@
UI::ReplaceWidget(`tab_panel,
`VBox(
+ DiskBarGraph(device),
`Table(`id(`table), `opt(`keepSorting, `notify, `notifyContextMenu),
table_header, table_contents),
`HBox(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.14/storage/src/modules/Storage.ycp new/yast2-storage-2.18.16/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.18.14/storage/src/modules/Storage.ycp 2009-07-16 11:50:22.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/modules/Storage.ycp 2009-07-23 13:17:42.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 58067 2009-07-16 09:50:21Z aschnell $
+ * $Id: Storage.ycp 58137 2009-07-23 11:16:13Z kmachalkova $
*/
{
module "Storage";
@@ -82,6 +82,7 @@
// end of resizing functions
+
global void UpdateClassified(string key, string pwd);
@@ -433,6 +434,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();
@@ -5063,6 +5076,10 @@
return( DiskMap );
}
+// flag indicates calling Storage::Update()
+global boolean called_update = false;
+
+
/**
* Updates fstab on disk
*
@@ -5076,85 +5093,94 @@
* ]
*/
global define void Update( map oldv, map newv )
- ``{
- y2milestone( "Update old:%1 new:%2", oldv, newv );
-
- // Enterprise products do not have minor release number
- // map enterprise releases to corresponding code bases of SL
- map sles_major_to_minor = $[ 8 : 2, 9 : 1, 10 : 1 ];
- if( haskey( oldv, "major" ) && !haskey( oldv, "minor" ) )
- {
- oldv["minor"] = sles_major_to_minor[oldv["major"]:0]:0;
- y2milestone( "Update old:%1", oldv );
- }
- if( haskey( newv, "major" ) && !haskey( newv, "minor" ) )
+ {
+ if (!called_update)
{
- newv["minor"] = sles_major_to_minor[newv["major"]:0]:0;
- y2milestone( "Update new:%1", newv );
- }
- if( !haskey( oldv, "major" ) || !haskey( newv, "major" ) )
- y2error( "Missing key major or minor" );
+ y2milestone( "Update old:%1 new:%2", oldv, newv );
- if( oldv["major"]:0<=9 )
- {
- UpdateFstabSysfs();
- }
- if( oldv["major"]:0<9 )
- {
- UpdateFstabUsbdevfs();
- }
- if( oldv["major"]:0==9 )
- {
- UpdateFstabPersistentNames();
- }
+ // Enterprise products do not have minor release number
+ // map enterprise releases to corresponding code bases of SL
+ map sles_major_to_minor = $[ 8 : 2, 9 : 1, 10 : 1 ];
+ if( haskey( oldv, "major" ) && !haskey( oldv, "minor" ) )
+ {
+ oldv["minor"] = sles_major_to_minor[oldv["major"]:0]:0;
+ y2milestone( "Update old:%1", oldv );
+ }
+ if( haskey( newv, "major" ) && !haskey( newv, "minor" ) )
+ {
+ newv["minor"] = sles_major_to_minor[newv["major"]:0]:0;
+ y2milestone( "Update new:%1", newv );
+ }
+ if( !haskey( oldv, "major" ) || !haskey( newv, "major" ) )
+ y2error( "Missing key major or minor" );
+
+ if( oldv["major"]:0<=9 )
+ {
+ UpdateFstabSysfs();
+ }
+ if( oldv["major"]:0<9 )
+ {
+ UpdateFstabUsbdevfs();
+ }
+ if( oldv["major"]:0==9 )
+ {
+ UpdateFstabPersistentNames();
+ }
- // remove EVMS
- // FIXME add appropriate condition if needed (does not seem so)
- UpdateFstabEvms2Lvm();
+ // remove EVMS
+ // FIXME add appropriate condition if needed (does not seem so)
+ UpdateFstabEvms2Lvm();
- map dm = BuildDiskmap( oldv );
- if( size(dm)>0 )
- {
- UpdateFstabDiskmap( dm );
- UpdateMdadm();
- }
- if( oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0<=2))
- {
- Storage::UpdateCryptoType();
- }
- if( oldv["major"]:0<10 || (oldv["major"]:0==10 && oldv["minor"]:0==0) )
- {
- string of = "/etc/udev/rules.d/20-cdrom.rules";
- y2milestone( "removing obsolete %1", of );
- SCR::Execute( .target.remove, of );
- of = "/etc/udev/rules.d/55-cdrom.rules";
- y2milestone( "removing obsolete %1", of );
- SCR::Execute( .target.remove, of );
- }
- if( oldv["major"]:0<10 || (oldv["major"]:0==10 && oldv["minor"]:0<=2) )
- {
- string of = "/etc/udev/rules.d/65-cdrom.rules";
- y2milestone( "removing obsolete %1", of );
- SCR::Execute( .target.remove, of );
- }
- if( oldv["major"]:0<10 || (oldv["major"]:0==10 && oldv["minor"]:0==0))
- UpdateFstabSubfs();
- if( oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0==0))
- {
- if( Arch::board_iseries () )
+ map dm = BuildDiskmap( oldv );
+ if( size(dm)>0 )
{
- UpdateFstabIseriesVd();
+ UpdateFstabDiskmap( dm );
+ UpdateMdadm();
}
- string cmd = "cd / && /sbin/insserv -r /etc/init.d/boot.evms";
- y2milestone( "Update cmd %1", cmd );
- map bo = (map)SCR::Execute (.target.bash_output, cmd );
- y2milestone( "Update bo %1", bo );
- }
- if( oldv["major"]:0<10 || (oldv["major"]:0==10 && oldv["minor"]:0<=2))
+ if( oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0<=2))
+ {
+ Storage::UpdateCryptoType();
+ }
+ if( oldv["major"]:0<10 || (oldv["major"]:0==10 && oldv["minor"]:0==0) )
+ {
+ string of = "/etc/udev/rules.d/20-cdrom.rules";
+ y2milestone( "removing obsolete %1", of );
+ SCR::Execute( .target.remove, of );
+ of = "/etc/udev/rules.d/55-cdrom.rules";
+ y2milestone( "removing obsolete %1", of );
+ SCR::Execute( .target.remove, of );
+ }
+ if( oldv["major"]:0<10 || (oldv["major"]:0==10 && oldv["minor"]:0<=2) )
+ {
+ string of = "/etc/udev/rules.d/65-cdrom.rules";
+ y2milestone( "removing obsolete %1", of );
+ SCR::Execute( .target.remove, of );
+ }
+ if( oldv["major"]:0<10 || (oldv["major"]:0==10 && oldv["minor"]:0==0))
+ UpdateFstabSubfs();
+ if( oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0==0))
+ {
+ if( Arch::board_iseries () )
+ {
+ UpdateFstabIseriesVd();
+ }
+ string cmd = "cd / && /sbin/insserv -r /etc/init.d/boot.evms";
+ y2milestone( "Update cmd %1", cmd );
+ map bo = (map)SCR::Execute (.target.bash_output, cmd );
+ y2milestone( "Update bo %1", bo );
+ }
+ if( oldv["major"]:0<10 || (oldv["major"]:0==10 && oldv["minor"]:0<=2))
+ {
+ string cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto";
+ map bo = (map)SCR::Execute (.target.bash_output, cmd );
+ y2milestone( "Update bo %1", bo );
+ }
+ // set flag -> it indicates that Update was already called
+ called_update = true;
+ }
+ else
{
- string cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto";
- map bo = (map)SCR::Execute (.target.bash_output, cmd );
- y2milestone( "Update bo %1", bo );
+ y2milestone("Skip calling Update() -> It was already called");
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.18.14/storage/src/modules/StorageFields.ycp new/yast2-storage-2.18.16/storage/src/modules/StorageFields.ycp
--- old/yast2-storage-2.18.14/storage/src/modules/StorageFields.ycp 2009-06-09 14:47:57.000000000 +0200
+++ new/yast2-storage-2.18.16/storage/src/modules/StorageFields.ycp 2009-07-23 13:17:42.000000000 +0200
@@ -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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org