Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Tue Aug 4 12:18:23 CEST 2009.
--------
--- yast2-storage/yast2-storage.changes 2009-07-27 17:53:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2009-08-04 09:55:34.000000000 +0200
@@ -1,0 +2,17 @@
+Mon Aug 03 11:04:19 CEST 2009 - aschnell@suse.de
+
+- require yast2-dbus-client (splitted of from yast2-core)
+
+-------------------------------------------------------------------
+Fri Jul 31 12:50:36 CEST 2009 - aschnell@suse.de
+
+- readded warning when trying to edit/delete partitions used for
+ installation (bug#445484)
+
+-------------------------------------------------------------------
+Fri Jul 31 11:02:57 CEST 2009 - aschnell@suse.de
+
+- new module StorageUpdate with update related functions
+- 2.18.18
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.18.17.tar.bz2
New:
----
yast2-storage-2.18.18.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.Dc9twB/_old 2009-08-04 12:17:43.000000000 +0200
+++ /var/tmp/diff_new_pack.Dc9twB/_new 2009-08-04 12:17:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.18.17)
+# spec file for package yast2-storage (Version 2.18.18)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-storage
-Version: 2.18.17
+Version: 2.18.18
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.18.17.tar.bz2
+Source0: yast2-storage-2.18.18.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
@@ -32,6 +32,7 @@
BuildRequires: yast2-perl-bindings yast2-testsuite
Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`)
Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.19 yast2-libyui >= 2.18.7
+Requires: yast2-dbus-client
%ifarch s390 s390x
Requires: yast2-s390
%endif
@@ -51,7 +52,7 @@
devices during installation and on an installed system.
%prep
-%setup -n yast2-storage-2.18.17
+%setup -n yast2-storage-2.18.18
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-storage-2.18.17.tar.bz2 -> yast2-storage-2.18.18.tar.bz2 ++++++
++++ 1637 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.18.17/VERSION new/yast2-storage-2.18.18/VERSION
--- old/yast2-storage-2.18.17/VERSION 2009-07-27 17:42:31.000000000 +0200
+++ new/yast2-storage-2.18.18/VERSION 2009-07-31 11:03:43.000000000 +0200
@@ -1 +1 @@
-2.18.17
+2.18.18
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.18.17/configure.in new/yast2-storage-2.18.18/configure.in
--- old/yast2-storage-2.18.17/configure.in 2009-07-28 10:33:57.000000000 +0200
+++ new/yast2-storage-2.18.18/configure.in 2009-08-04 09:54:30.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.17, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.18.18, 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.17"
+VERSION="2.18.18"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
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.18.17/storage/src/include/ep-hd-lib.ycp new/yast2-storage-2.18.18/storage/src/include/ep-hd-lib.ycp
--- old/yast2-storage-2.18.17/storage/src/include/ep-hd-lib.ycp 2009-07-21 16:37:06.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/include/ep-hd-lib.ycp 2009-07-31 12:49:04.000000000 +0200
@@ -238,9 +238,12 @@
}
map target_map = Storage::GetTargetMap();
- map data = Storage::GetPartition(target_map, device);
+ map part = Storage::GetPartition(target_map, device);
- if (!isempty(data["used_by_device"]:""))
+ if (!Storage::CanEdit(part, true))
+ return;
+
+ if (!isempty(part["used_by_device"]:""))
{
// error popup, %1 is replace by partition device name e.g. /dev/sdb1
Popup::Error(sformat(_("The partition %1 is in use. It cannot be
@@ -248,16 +251,16 @@
return;
}
- if (data["type"]:`primary == `extended)
+ if (part["type"]:`primary == `extended)
{
// error popup text
Popup::Error(_("An extended partition cannot be edited."));
return;
}
- if (DlgEditPartition(data))
+ if (DlgEditPartition(part))
{
- Storage::ChangeVolumeProperties(data);
+ Storage::ChangeVolumeProperties(part);
UpdateMainStatus();
UpdateNavigationTree(nil);
@@ -278,7 +281,7 @@
map target_map = Storage::GetTargetMap();
map disk = Storage::GetDisk(target_map, device);
- map data = Storage::GetPartition(target_map, device);
+ map part = Storage::GetPartition(target_map, device);
if (disk["readonly"]:false)
{
@@ -286,7 +289,7 @@
return;
}
- if (!isempty(data["used_by_device"]:""))
+ if (!isempty(part["used_by_device"]:""))
{
// error popup, %1 is replace by partition device name, e.g. /dev/sdb1
Popup::Error(sformat(_("The partition %1 is in use. It cannot be
@@ -294,17 +297,17 @@
return;
}
- if (data["type"]:`primary == `extended)
+ if (part["type"]:`primary == `extended)
{
// error popup text
Popup::Error(_("An extended partition cannot be resized."));
return;
}
- //Need to pass data on the whole disk, to determine free/available space
- if (DlgResizePartition(data, disk))
+ // Need to pass data on the whole disk, to determine free/available space
+ if (DlgResizePartition(part, disk))
{
- Storage::ResizePartition(device, disk["device"]:"error", data["region", 1]:0);
+ Storage::ResizePartition(device, disk["device"]:"error", part["region", 1]:0);
UpdateMainStatus();
TreePanel::Create();
@@ -322,6 +325,13 @@
return;
}
+ map target_map = Storage::GetTargetMap();
+ map disk = Storage::GetDisk(target_map, device);
+ map part = Storage::GetPartition(target_map, device);
+
+ if (!Storage::CanDelete(part, disk, true))
+ return;
+
string parent = ParentDevice(device);
string next = NextDeviceAfterDelete(device);
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.18.17/storage/src/include/ep-summary.ycp new/yast2-storage-2.18.18/storage/src/include/ep-summary.ycp
--- old/yast2-storage-2.18.17/storage/src/include/ep-summary.ycp 2009-07-21 16:37:06.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/include/ep-summary.ycp 2009-07-29 15:04:37.000000000 +0200
@@ -10,17 +10,20 @@
textdomain "storage";
+ import "HTML";
+
+
void CreateSummaryPanel(any user_data)
{
string part_summary = Storage::ChangeText();
- string config_summary = ( StorageSettings::GetModified() ?
- StorageSettings::Summary() :
- _("<p>No changes to storage settings.</p>") );
-
if (isempty(part_summary))
- {
- part_summary = _("<p>No changes to partitioning.</p>");
- }
+ part_summary = HTML::Heading(_("<p>No changes to partitioning.</p>"));
+ else
+ part_summary = HTML::Heading(_("<p>Changes to partitioning:</p>")) + part_summary;
+
+ string config_summary = HTML::Heading(_("<p>No changes to storage settings.</p>"));
+ if (StorageSettings::GetModified())
+ config_summary = HTML::Heading(_("<p>Storage settings:</p>")) + StorageSettings::Summary();
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
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.18.17/storage/src/inst_prepdisk.ycp new/yast2-storage-2.18.18/storage/src/inst_prepdisk.ycp
--- old/yast2-storage-2.18.17/storage/src/inst_prepdisk.ycp 2009-07-21 16:37:07.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/inst_prepdisk.ycp 2009-07-31 11:36:31.000000000 +0200
@@ -23,7 +23,6 @@
{
textdomain "storage";
- import "Installation";
import "Mode";
import "Stage";
import "Wizard";
@@ -152,9 +151,9 @@
y2milestone( "cmd %1", cmd );
map m = (map) SCR::Execute(.target.bash_output, cmd );
y2milestone( "ret %1", m );
- string destproc = Installation::scr_destdir+"/proc";
+ string destproc = Storage::PathToDestdir("/proc");
SCR::Execute (.target.mount, ["proc", destproc], "-t proc");
- destproc = Installation::scr_destdir+"/sys";
+ destproc = Storage::PathToDestdir("/sys");
SCR::Execute (.target.mount, ["sysfs", destproc], "-t sysfs");
}
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.18.17/storage/src/modules/Makefile.am new/yast2-storage-2.18.18/storage/src/modules/Makefile.am
--- old/yast2-storage-2.18.17/storage/src/modules/Makefile.am 2009-07-21 16:37:06.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/modules/Makefile.am 2009-07-31 10:42:23.000000000 +0200
@@ -15,9 +15,10 @@
StorageControllers.ycp \
StorageDevices.ycp \
StorageFields.ycp \
+ StorageIcons.ycp \
StorageProposal.ycp \
StorageSettings.ycp \
- StorageIcons.ycp \
+ StorageUpdate.ycp \
TreePanel.ycp \
TabPanel.ycp \
MiniWorkflow.ycp \
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.18.17/storage/src/modules/Partitions.ycp new/yast2-storage-2.18.18/storage/src/modules/Partitions.ycp
--- old/yast2-storage-2.18.17/storage/src/modules/Partitions.ycp 2009-07-24 15:38:51.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/modules/Partitions.ycp 2009-08-03 16:58:28.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Provides information about partitions
*
- * $Id: Partitions.ycp 58150 2009-07-24 13:38:53Z aschnell $
+ * $Id: Partitions.ycp 58262 2009-08-03 14:58:29Z aschnell $
*/
{
module "Partitions";
@@ -749,6 +749,17 @@
return ret;
}
+
+ global integer MaxSizeK(string dlabel)
+ {
+ integer ret = 0;
+ any caps = LibStorage::DlabelCapabilities::new("LibStorage::DlabelCapabilities");
+ if (LibStorage::StorageInterface::getDlabelCapabilities(sint, dlabel, caps))
+ ret = LibStorage::DlabelCapabilities::swig_maxSizeK_get(caps);
+ y2milestone("MaxSizeK dlabel:%1 ret:%2", dlabel, ret);
+ return ret;
+ }
+
global define string RdonlyText( string disk, boolean expert_partitioner )
``{
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.18.17/storage/src/modules/Storage.ycp new/yast2-storage-2.18.18/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.18.17/storage/src/modules/Storage.ycp 2009-07-28 11:05:43.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/modules/Storage.ycp 2009-08-03 17:05:26.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 58185 2009-07-28 09:05:45Z aschnell $
+ * $Id: Storage.ycp 58262 2009-08-03 14:58:29Z aschnell $
*/
{
module "Storage";
@@ -27,7 +27,6 @@
textdomain "storage";
import "Arch";
- import "AsciiFile";
import "Directory";
import "FileSystems";
import "FileUtils";
@@ -41,10 +40,8 @@
import "HTML";
import "StorageDevices";
import "StorageClients";
- import "ProductFeatures";
import "Stage";
import "String";
- import "Region";
import "Hotplug";
import "LibStorage";
@@ -2066,22 +2063,10 @@
return ret;
}
-global integer MaxSizeLabelK( map disk )
- {
- integer ret = 0;
- string dlabel = disk["label"]:"";
- any caps = LibStorage::DlabelCapabilities::new("LibStorage::DlabelCapabilities");
- if (LibStorage::StorageInterface::getDlabelCapabilities(sint, dlabel, caps))
- {
- ret = LibStorage::DlabelCapabilities::swig_maxSizeK_get(caps);
- }
- y2milestone("MaxSizeLabelK %1 is %2", dlabel, ret);
- return ret;
- }
global integer MaxCylLabel( map disk, integer start_cyl )
{
- integer ret = MaxSizeLabelK(disk);
+ integer ret = Partitions::MaxSizeK(disk["label"]:"");
y2milestone( "MaxCylLabel val_k:%1 cyl_size:%2", ret, disk["cyl_size"]:1 );
integer cylk2 = disk["cyl_size"]:1/512;
if( cylk2<2 )
@@ -4411,13 +4396,12 @@
return( ret );
}
-global define string PathToDestdir( string pt )
- ``{
- if( Installation::scr_destdir != "/" )
- {
- pt = Installation::scr_destdir + pt;
- }
- return( pt );
+
+ global string PathToDestdir(string p)
+ {
+ if (Installation::scr_destdir != "/")
+ p = Installation::scr_destdir + p;
+ return p;
}
@@ -4677,68 +4661,6 @@
return( ret );
}
-global define void UpdateFstabSubfs()
- ``{
- y2milestone( "UpdateFstabSubfs removing fstab entries for cdrom and floppy" );
- string tabpath = PathToDestdir( "/etc/fstab" );
- map fstab = Partitions::GetFstab( tabpath );
- integer line = 0;
- list<integer> rem_lines = [];
- while( line<=AsciiFile::NumLines( fstab ) )
- {
- map l = AsciiFile::GetLine( fstab, line );
- if( search( l["fields",1]:"", "/media/floppy" )==0 )
- {
- rem_lines = add( rem_lines, line );
- }
- else if( search( l["fields",1]:"", "/media/cdrom" )==0 ||
- search( l["fields",1]:"", "/media/dvd" )==0 ||
- search( l["fields",1]:"", "/media/cdrecorder" )==0 ||
- search( l["fields",1]:"", "/media/dvdrecorder" )==0 ||
- search( l["fields",1]:"", "/cdrom" )==0 ||
- search( l["fields",1]:"", "/dvd" )==0 ||
- search( l["fields",1]:"", "/cdrecorder" )==0 ||
- search( l["fields",1]:"", "/dvdrecorder" )==0 )
- {
- rem_lines = add( rem_lines, line );
- }
- line = line+1;
- }
- y2milestone( "UpdateFstabSubfs %1", rem_lines );
- if( size(rem_lines)>0 )
- {
- rem_lines = sort(rem_lines);
- AsciiFile::RemoveLines( fstab, rem_lines );
- }
- AsciiFile::RewriteFile( fstab, tabpath );
- }
-
-global define void UpdateFstabSysfs()
- ``{
- y2milestone( "UpdateFstabSysfs called" );
- string tabpath = PathToDestdir( "/etc/fstab" );
- map fstab = Partitions::GetFstab( tabpath );
- integer line = 0;
- boolean have_sysfs = false;
- while( !have_sysfs && line<=AsciiFile::NumLines( fstab ) )
- {
- map l = AsciiFile::GetLine( fstab, line );
- have_sysfs = l["fields",1]:"" == "/sys";
- line = line+1;
- }
- if( !have_sysfs )
- {
- map entry = FileSystems::GetFstabDefaultMap( "sys" );
- list fstlist = [ entry["spec"]:"", entry["mount"]:"",
- entry["vfstype"]:"", entry["mntops"]:"",
- sformat("%1",entry["freq"]:0),
- sformat("%1",entry["passno"]:0) ];
- y2milestone( "UpdateFstabSysfs entry %1", entry );
- y2milestone( "UpdateFstabSysfs fstlist %1", fstlist );
- AsciiFile::AppendLine( fstab, fstlist );
- AsciiFile::RewriteFile( fstab, tabpath );
- }
- }
global string HdToIseries( string input )
``{
@@ -4817,221 +4739,6 @@
return( ret );
}
-global define void UpdateFstabIseriesVd()
- ``{
- y2milestone( "UpdateFstabIseriesVd updating hdx to iseries/vdx" );
- string tabpath = PathToDestdir( "/etc/fstab" );
- map fstab = Partitions::GetFstab( tabpath );
- integer line = 0;
- string n = "";
- while( line<=AsciiFile::NumLines( fstab ) )
- {
- map l = AsciiFile::GetLine( fstab, line );
- n = HdToIseries( l["fields",0]:"" );
- if( n != l["fields",0]:"" )
- {
- AsciiFile::ChangeLineField( fstab, line, 0, n );
- }
- line = line+1;
- }
- AsciiFile::RewriteFile( fstab, tabpath );
- tabpath = PathToDestdir( "/etc/cryptotab" );
- map crtab = Partitions::GetCrypto( tabpath );
- line = 0;
- while( line<=AsciiFile::NumLines( crtab ) )
- {
- map l = AsciiFile::GetLine( crtab, line );
- n = HdToIseries( l["fields",1]:"" );
- if( n != l["fields",1]:"" )
- {
- AsciiFile::ChangeLineField( crtab, line, 1, n );
- }
- line = line+1;
- }
- AsciiFile::RewriteFile( crtab, tabpath );
- }
-
-global define void UpdateCdromLinks( map diskmap )
- ``{
- y2milestone( "UpdateCdromLinks map %1", diskmap );
- foreach( string link, StorageDevices::TypeNames,
- ``{
- string dev = "/dev/" + link;
- string cont = (string)SCR::Read( .target.symlink, dev );
- if( cont!=nil && search( cont, "/dev/") != 0 )
- cont = "/dev/" + cont;
- y2milestone( "UpdateCdromLinks dev %1 cont %2", dev, cont );
- if( cont!=nil && haskey( diskmap, cont ) && size(diskmap[cont]:"")>0 )
- {
- y2milestone( "Change symlink %1 from %2 -> %3", dev, cont,
- diskmap[cont]:"" );
- SCR::Execute( .target.remove, dev );
- SCR::Execute( .target.symlink, substring(diskmap[cont]:"",5), dev );
- }
- });
- }
-
-global define void UpdateFstabPersistentNames()
- ``{
- y2milestone( "UpdateFstabPersistentDevNames updating to SLES10 names" );
- string tabpath = PathToDestdir( "/etc/fstab" );
- map fstab = Partitions::GetFstab( tabpath );
- integer line = 0;
- string n = "";
- while( line<=AsciiFile::NumLines( fstab ) )
- {
- map l = AsciiFile::GetLine( fstab, line );
- n = SLES9PersistentDevNames( l["fields",0]:"" );
- if( n != l["fields",0]:"" )
- {
- AsciiFile::ChangeLineField( fstab, line, 0, n );
- }
- line = line+1;
- }
- AsciiFile::RewriteFile( fstab, tabpath );
- }
-
-global void UpdateFstabEvms2Lvm() {
- y2milestone( "UpdateFstabEvms2Lvm migrating EVMS to LVM" );
- string tabpath = PathToDestdir( "/etc/fstab" );
- map fstab = Partitions::GetFstab( tabpath );
- integer line = 0;
- string n = "";
- while( line<=AsciiFile::NumLines( fstab ) ) {
- map l = AsciiFile::GetLine( fstab, line );
- n = l["fields",0]:"";
- if (substring (n, 0, 15) == "/dev/evms/lvm2/")
- {
- n = "/dev/" + substring (n, 15);
- AsciiFile::ChangeLineField( fstab, line, 0, n );
- }
- line = line+1;
- }
- AsciiFile::RewriteFile( fstab, tabpath );
-}
-
-global define void UpdateFstabDiskmap( map diskmap )
- ``{
- y2milestone( "UpdateFstabDiskmap map %1", diskmap );
- string tabpath = PathToDestdir( "/etc/fstab" );
- map fstab = Partitions::GetFstab( tabpath );
- integer line = 0;
- string n = "";
- while( line<=AsciiFile::NumLines( fstab ) )
- {
- map l = AsciiFile::GetLine( fstab, line );
- n = HdDiskMap( l["fields",0]:"", diskmap );
- if( n != l["fields",0]:"" )
- {
- AsciiFile::ChangeLineField( fstab, line, 0, n );
- }
- line = line+1;
- }
- AsciiFile::RewriteFile( fstab, tabpath );
- tabpath = PathToDestdir( "/etc/cryptotab" );
- map crtab = Partitions::GetCrypto( tabpath );
- line = 0;
- while( line<=AsciiFile::NumLines( crtab ) )
- {
- map l = AsciiFile::GetLine( crtab, line );
- n = HdDiskMap( l["fields",1]:"", diskmap );
- if( n != l["fields",1]:"" )
- {
- AsciiFile::ChangeLineField( crtab, line, 1, n );
- }
- line = line+1;
- }
- AsciiFile::RewriteFile( crtab, tabpath );
- }
-
-global define void UpdateMdadm()
- ``{
- y2milestone( "UpdateMdadm" );
- string cpath = PathToDestdir( "/etc/mdadm.conf" );
- map file = $[];
- AsciiFile::SetComment( file, "^[ \t]*#" );
- AsciiFile::ReadFile( file, cpath );
- integer line = 0;
- boolean changed = false;
- while( line<=AsciiFile::NumLines( file ) )
- {
- if( search( file["l",line,"line"]:"", "DEVICE" )!=nil &&
- search( file["l",line,"line"]:"", "/dev/" )!=nil )
- {
- changed = true;
- file["l",line,"line"] = "DEVICE partitions";
- y2milestone( "UpdateMdadm %1", file["l",line]:$[] );
- }
- line = line+1;
- }
- if( changed )
- AsciiFile::RewriteFile( file, cpath );
- }
-
-global define void UpdateCryptoType()
- ``{
- y2milestone( "UpdateCryptoType" );
- string tabpath = PathToDestdir( "/etc/fstab" );
- map fstab = Partitions::GetFstab( tabpath );
- integer line = 0;
- integer pos = 0;
- string searchstr = "encryption=twofish256";
- while( line<=AsciiFile::NumLines( fstab ) )
- {
- map l = AsciiFile::GetLine( fstab, line );
- pos = search( l["fields",3]:"", searchstr );
- if( pos != nil )
- {
- string new = substring( l["fields",3]:"", 0, pos );
- new = new + "encryption=twofishSL92";
- new = new + substring( l["fields",3]:"", pos+size(searchstr) );
- y2milestone( "new options line in %1 is %2", l, new );
- AsciiFile::ChangeLineField( fstab, line, 3, new );
- }
- line = line+1;
- }
- AsciiFile::RewriteFile( fstab, tabpath );
- tabpath = PathToDestdir( "/etc/cryptotab" );
- map crtab = Partitions::GetCrypto( tabpath );
- line = 0;
- while( line<=AsciiFile::NumLines( crtab ) )
- {
- map l = AsciiFile::GetLine( crtab, line );
- if( l["fields",4]:"" == "twofish256" )
- {
- y2milestone( "set twofishSL92 in line %1", l );
- AsciiFile::ChangeLineField( crtab, line, 4, "twofishSL92" );
- }
- line = line+1;
- }
- AsciiFile::RewriteFile( crtab, tabpath );
- }
-
-global define void UpdateFstabUsbdevfs()
- ``{
- y2milestone( "UpdateFstabUsbdevfs updating usbdevfs to usbfs" );
- boolean changed = false;
- string tabpath = PathToDestdir( "/etc/fstab" );
- map fstab = Partitions::GetFstab( tabpath );
- integer line = 0;
- while( line<=AsciiFile::NumLines( fstab ) )
- {
- map l = AsciiFile::GetLine( fstab, line );
- if( l["fields",2]:"" == "usbdevfs" )
- {
- AsciiFile::ChangeLineField( fstab, line, 2, "usbfs" );
- AsciiFile::ChangeLineField( fstab, line, 0, "usbfs" );
- changed = true;
- }
- line = line+1;
- }
- if( changed )
- {
- y2milestone( "UpdateFstabUsbdevfs changed" );
- AsciiFile::RewriteFile( fstab, tabpath );
- }
- }
-
global define map BuildDiskmap( map oldv )
``{
@@ -5077,113 +4784,6 @@
return( DiskMap );
}
-// flag indicates calling Storage::Update()
-global boolean called_update = false;
-
-
-/**
- * Updates fstab on disk
- *
- * @param map old version
- * @param map new version
- *
- * @struct version $[
- * // This means version 9.1
- * "major" : 9,
- * "minor" : 1,
- * ]
- */
-global define void Update( map oldv, map newv )
- {
- if (!called_update)
- {
- 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" ) )
- {
- 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();
-
- 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 () )
- {
- 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
- {
- y2milestone("Skip calling Update() -> It was already called");
- }
- }
global define list<string> GetTranslatedDevices( map oldv, map newv,
list<string> names )
@@ -5629,10 +5229,7 @@
string lower_point = tolower( mount_point );
if( lower_point != "" && mount_point != lower_point)
{
- if( Installation::scr_destdir != "/" )
- {
- lower_point = Installation::scr_destdir + lower_point;
- }
+ lower_point = PathToDestdir(lower_point);
y2milestone( "symlink %1 -> %2",
substring(mount_point,(findlastof(mount_point,"/")+1)),
lower_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.18.17/storage/src/modules/StorageControllers.ycp new/yast2-storage-2.18.18/storage/src/modules/StorageControllers.ycp
--- old/yast2-storage-2.18.17/storage/src/modules/StorageControllers.ycp 2009-07-21 16:37:06.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/modules/StorageControllers.ycp 2009-07-29 15:01:47.000000000 +0200
@@ -9,7 +9,7 @@
*
* SCR: Read(.probe.storage)
*
- * $Id: StorageControllers.ycp 57177 2009-05-14 12:59:54Z aschnell $
+ * $Id: StorageControllers.ycp 58204 2009-07-29 13:01:50Z aschnell $
*/
{
module "StorageControllers";
@@ -18,7 +18,6 @@
import "ModuleLoading";
import "HwStatus";
import "Initrd";
- import "Kernel";
import "Storage";
import "StorageDevices";
import "StorageClients";
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.18.17/storage/src/modules/StorageSettings.ycp new/yast2-storage-2.18.18/storage/src/modules/StorageSettings.ycp
--- old/yast2-storage-2.18.17/storage/src/modules/StorageSettings.ycp 2009-07-21 16:37:06.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/modules/StorageSettings.ycp 2009-07-29 15:22:42.000000000 +0200
@@ -14,6 +14,7 @@
import "Storage";
import "Partitions";
import "Integer";
+ import "HTML";
symbol display_name = nil;
@@ -145,31 +146,19 @@
}
+
global string Summary()
{
- string ListOfVisibleFields( list <string> labels)
- {
- string ret = "<ul>";
-
- foreach(string lab, labels, {
- ret = ret + "<li>" + lab + "</li>";
- });
-
- return ret + "</ul>";
+ list<string> tmp = [
+ _("Default Mount-by:") + " " + substring(tostring(Storage::GetDefaultMountBy()), 1),
+ _("Default Filesystem:") + " " + substring(tostring(Partitions::DefaultFs()), 1),
+ _("Show Storage Devices by:") + " " + substring(tostring(display_name), 1),
+ _("Visible Information on Storage Devices:") + " " + HTML::List(visible_fields)
+ ];
+ return HTML::List(tmp);
}
- string new_summary = "<h1>Storage Settings</h1>" + "<ul>";
-
- new_summary = new_summary + "<li>" + _("<b>Default Mount-by:</b> ") + substring(tostring(Storage::GetDefaultMountBy()), 1) + "</li>";
- new_summary = new_summary + "<li>" + _("<b>Default Filesystem:</b> ") + substring(tostring(Partitions::DefaultFs()), 1) + "</li>";
- new_summary = new_summary + "<li>" + _("<b>Show Storage Devices by:</b> ") + substring(tostring(display_name), 1) + "</li>";
- new_summary = new_summary + "<li>" + _("<b>Visible Information on Storage Devices:</b> ") + ListOfVisibleFields(visible_fields) + "</li>";
-
- new_summary = new_summary + "</ul>";
-
- return new_summary;
- }
global void Save()
{
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.18.17/storage/src/modules/StorageUpdate.ycp new/yast2-storage-2.18.18/storage/src/modules/StorageUpdate.ycp
--- old/yast2-storage-2.18.17/storage/src/modules/StorageUpdate.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.18.18/storage/src/modules/StorageUpdate.ycp 2009-07-31 11:51:41.000000000 +0200
@@ -0,0 +1,395 @@
+/**
+ * Module: StorageUpdate.ycp
+ *
+ * Authors: Thomas Fehr
+ * Arvin Schnell
+ */
+{
+ module "StorageUpdate";
+
+ textdomain "storage";
+
+
+ import "Arch";
+ import "AsciiFile";
+ import "FileSystems";
+ import "Partitions";
+ import "Storage";
+
+
+ // flag indicates calling StorageUpdate::Update()
+ boolean called_update = false;
+
+
+ void UpdateFstabSubfs()
+ {
+ y2milestone( "UpdateFstabSubfs removing fstab entries for cdrom and floppy" );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ integer line = 0;
+ list<integer> rem_lines = [];
+ while( line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ if( search( l["fields",1]:"", "/media/floppy" )==0 )
+ {
+ rem_lines = add( rem_lines, line );
+ }
+ else if( search( l["fields",1]:"", "/media/cdrom" )==0 ||
+ search( l["fields",1]:"", "/media/dvd" )==0 ||
+ search( l["fields",1]:"", "/media/cdrecorder" )==0 ||
+ search( l["fields",1]:"", "/media/dvdrecorder" )==0 ||
+ search( l["fields",1]:"", "/cdrom" )==0 ||
+ search( l["fields",1]:"", "/dvd" )==0 ||
+ search( l["fields",1]:"", "/cdrecorder" )==0 ||
+ search( l["fields",1]:"", "/dvdrecorder" )==0 )
+ {
+ rem_lines = add( rem_lines, line );
+ }
+ line = line+1;
+ }
+ y2milestone( "UpdateFstabSubfs %1", rem_lines );
+ if( size(rem_lines)>0 )
+ {
+ rem_lines = sort(rem_lines);
+ AsciiFile::RemoveLines( fstab, rem_lines );
+ }
+ AsciiFile::RewriteFile( fstab, tabpath );
+ }
+
+
+ void UpdateFstabSysfs()
+ {
+ y2milestone( "UpdateFstabSysfs called" );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ integer line = 0;
+ boolean have_sysfs = false;
+ while( !have_sysfs && line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ have_sysfs = l["fields",1]:"" == "/sys";
+ line = line+1;
+ }
+ if( !have_sysfs )
+ {
+ map entry = FileSystems::GetFstabDefaultMap( "sys" );
+ list fstlist = [ entry["spec"]:"", entry["mount"]:"",
+ entry["vfstype"]:"", entry["mntops"]:"",
+ sformat("%1",entry["freq"]:0),
+ sformat("%1",entry["passno"]:0) ];
+ y2milestone( "UpdateFstabSysfs entry %1", entry );
+ y2milestone( "UpdateFstabSysfs fstlist %1", fstlist );
+ AsciiFile::AppendLine( fstab, fstlist );
+ AsciiFile::RewriteFile( fstab, tabpath );
+ }
+ }
+
+
+ void UpdateFstabPersistentNames()
+ {
+ y2milestone( "UpdateFstabPersistentDevNames updating to SLES10 names" );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ integer line = 0;
+ string n = "";
+ while( line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ n = Storage::SLES9PersistentDevNames( l["fields",0]:"" );
+ if( n != l["fields",0]:"" )
+ {
+ AsciiFile::ChangeLineField( fstab, line, 0, n );
+ }
+ line = line+1;
+ }
+ AsciiFile::RewriteFile( fstab, tabpath );
+ }
+
+
+ void UpdateFstabEvms2Lvm()
+ {
+ y2milestone( "UpdateFstabEvms2Lvm migrating EVMS to LVM" );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ integer line = 0;
+ string n = "";
+ while( line<=AsciiFile::NumLines( fstab ) ) {
+ map l = AsciiFile::GetLine( fstab, line );
+ n = l["fields",0]:"";
+ if (substring (n, 0, 15) == "/dev/evms/lvm2/")
+ {
+ n = "/dev/" + substring (n, 15);
+ AsciiFile::ChangeLineField( fstab, line, 0, n );
+ }
+ line = line+1;
+ }
+ AsciiFile::RewriteFile( fstab, tabpath );
+ }
+
+
+ void UpdateMdadm()
+ {
+ y2milestone( "UpdateMdadm" );
+ string cpath = Storage::PathToDestdir( "/etc/mdadm.conf" );
+ map file = $[];
+ AsciiFile::SetComment( file, "^[ \t]*#" );
+ AsciiFile::ReadFile( file, cpath );
+ integer line = 0;
+ boolean changed = false;
+ while( line<=AsciiFile::NumLines( file ) )
+ {
+ if( search( file["l",line,"line"]:"", "DEVICE" )!=nil &&
+ search( file["l",line,"line"]:"", "/dev/" )!=nil )
+ {
+ changed = true;
+ file["l",line,"line"] = "DEVICE partitions";
+ y2milestone( "UpdateMdadm %1", file["l",line]:$[] );
+ }
+ line = line+1;
+ }
+ if( changed )
+ AsciiFile::RewriteFile( file, cpath );
+ }
+
+
+ void UpdateFstabDiskmap(map diskmap)
+ {
+ y2milestone( "UpdateFstabDiskmap map %1", diskmap );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ integer line = 0;
+ string n = "";
+ while( line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ n = Storage::HdDiskMap( l["fields",0]:"", diskmap );
+ if( n != l["fields",0]:"" )
+ {
+ AsciiFile::ChangeLineField( fstab, line, 0, n );
+ }
+ line = line+1;
+ }
+ AsciiFile::RewriteFile( fstab, tabpath );
+ tabpath = Storage::PathToDestdir( "/etc/cryptotab" );
+ map crtab = Partitions::GetCrypto( tabpath );
+ line = 0;
+ while( line<=AsciiFile::NumLines( crtab ) )
+ {
+ map l = AsciiFile::GetLine( crtab, line );
+ n = Storage::HdDiskMap( l["fields",1]:"", diskmap );
+ if( n != l["fields",1]:"" )
+ {
+ AsciiFile::ChangeLineField( crtab, line, 1, n );
+ }
+ line = line+1;
+ }
+ AsciiFile::RewriteFile( crtab, tabpath );
+ }
+
+
+ void UpdateFstabUsbdevfs()
+ {
+ y2milestone( "UpdateFstabUsbdevfs updating usbdevfs to usbfs" );
+ boolean changed = false;
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ integer line = 0;
+ while( line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ if( l["fields",2]:"" == "usbdevfs" )
+ {
+ AsciiFile::ChangeLineField( fstab, line, 2, "usbfs" );
+ AsciiFile::ChangeLineField( fstab, line, 0, "usbfs" );
+ changed = true;
+ }
+ line = line+1;
+ }
+ if( changed )
+ {
+ y2milestone( "UpdateFstabUsbdevfs changed" );
+ AsciiFile::RewriteFile( fstab, tabpath );
+ }
+ }
+
+
+ void UpdateFstabIseriesVd()
+ {
+ y2milestone( "UpdateFstabIseriesVd updating hdx to iseries/vdx" );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ integer line = 0;
+ string n = "";
+ while( line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ n = Storage::HdToIseries( l["fields",0]:"" );
+ if( n != l["fields",0]:"" )
+ {
+ AsciiFile::ChangeLineField( fstab, line, 0, n );
+ }
+ line = line+1;
+ }
+ AsciiFile::RewriteFile( fstab, tabpath );
+ tabpath = Storage::PathToDestdir( "/etc/cryptotab" );
+ map crtab = Partitions::GetCrypto( tabpath );
+ line = 0;
+ while( line<=AsciiFile::NumLines( crtab ) )
+ {
+ map l = AsciiFile::GetLine( crtab, line );
+ n = Storage::HdToIseries( l["fields",1]:"" );
+ if( n != l["fields",1]:"" )
+ {
+ AsciiFile::ChangeLineField( crtab, line, 1, n );
+ }
+ line = line+1;
+ }
+ AsciiFile::RewriteFile( crtab, tabpath );
+ }
+
+
+ void UpdateCryptoType()
+ {
+ y2milestone( "UpdateCryptoType" );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ integer line = 0;
+ integer pos = 0;
+ string searchstr = "encryption=twofish256";
+ while( line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ pos = search( l["fields",3]:"", searchstr );
+ if( pos != nil )
+ {
+ string new = substring( l["fields",3]:"", 0, pos );
+ new = new + "encryption=twofishSL92";
+ new = new + substring( l["fields",3]:"", pos+size(searchstr) );
+ y2milestone( "new options line in %1 is %2", l, new );
+ AsciiFile::ChangeLineField( fstab, line, 3, new );
+ }
+ line = line+1;
+ }
+ AsciiFile::RewriteFile( fstab, tabpath );
+ tabpath = Storage::PathToDestdir( "/etc/cryptotab" );
+ map crtab = Partitions::GetCrypto( tabpath );
+ line = 0;
+ while( line<=AsciiFile::NumLines( crtab ) )
+ {
+ map l = AsciiFile::GetLine( crtab, line );
+ if( l["fields",4]:"" == "twofish256" )
+ {
+ y2milestone( "set twofishSL92 in line %1", l );
+ AsciiFile::ChangeLineField( crtab, line, 4, "twofishSL92" );
+ }
+ line = line+1;
+ }
+ AsciiFile::RewriteFile( crtab, tabpath );
+ }
+
+
+ /**
+ * Updates fstab on disk
+ *
+ * @param map old version
+ * @param map new version
+ *
+ * @struct version $[
+ * // This means version 9.1
+ * "major" : 9,
+ * "minor" : 1,
+ * ]
+ */
+ global void Update(map oldv, map newv)
+ {
+ if (!called_update)
+ {
+ 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" ) )
+ {
+ 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();
+
+ map dm = Storage::BuildDiskmap( oldv );
+ if( size(dm)>0 )
+ {
+ UpdateFstabDiskmap( dm );
+ UpdateMdadm();
+ }
+ if( oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0<=2))
+ {
+ 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
+ {
+ y2milestone("Skip calling Update() -> It was already called");
+ }
+ }
+}
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.18.17/storage/src/storage_finish.ycp new/yast2-storage-2.18.18/storage/src/storage_finish.ycp
--- old/yast2-storage-2.18.17/storage/src/storage_finish.ycp 2009-07-21 16:37:07.000000000 +0200
+++ new/yast2-storage-2.18.18/storage/src/storage_finish.ycp 2009-07-31 11:55:18.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Jiri Srain
*
- * $Id: storage_finish.ycp 57297 2009-05-22 11:55:13Z aschnell $
+ * $Id: storage_finish.ycp 58237 2009-07-31 09:55:20Z aschnell $
*
*/
@@ -18,6 +18,7 @@
import "Storage";
import "StorageSettings";
+import "StorageUpdate";
import "Mode";
import "Installation";
import "Initrd";
@@ -62,7 +63,7 @@
}
else
{
- Storage::Update (Installation::installedVersion, Installation::updateVersion);
+ StorageUpdate::Update(Installation::installedVersion, Installation::updateVersion);
}
if (Storage::CheckForLvmRootFs() )
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org