Hello community,
here is the log from the commit of package yast2-storage
checked in at Fri May 11 10:17:37 CEST 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-05-03 14:25:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-05-10 16:05:20.000000000 +0200
@@ -1,0 +2,14 @@
+Thu May 10 15:49:40 CEST 2007 - fehr@suse.de
+
+- disable EVMS proposal completely [#272736]
+- make sure thet /dev/evms/sda1 gets into /etc/fstab for all cases
+ where evms_boot in control.xml is set to true.
+- version 2.15.11
+
+-------------------------------------------------------------------
+Mon May 7 13:55:08 CEST 2007 - fehr@suse.de
+
+- do not create file 65-cdrom-rules any more (#271424)
+- fix problem when reusing existing partition (#267212)
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.15.10.tar.bz2
New:
----
yast2-storage-2.15.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.o31893/_old 2007-05-11 10:17:24.000000000 +0200
+++ /var/tmp/diff_new_pack.o31893/_new 2007-05-11 10:17:24.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.15.10)
+# spec file for package yast2-storage (Version 2.15.11)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-storage
-Version: 2.15.10
+Version: 2.15.11
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.15.10.tar.bz2
+Source0: yast2-storage-2.15.11.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite
# Required only in inst-sys
@@ -44,7 +44,7 @@
%prep
-%setup -n yast2-storage-2.15.10
+%setup -n yast2-storage-2.15.11
%build
%{prefix}/bin/y2tool y2autoconf
@@ -92,7 +92,6 @@
/usr/share/YaST2/clients/disk_worker.ycp
/usr/share/YaST2/clients/lvm_config.ycp
/usr/share/YaST2/clients/lvm_config_ui.ycp
-/usr/share/YaST2/clients/create_udev_cdrom.ycp
/usr/share/YaST2/modules/*
%dir /usr/share/YaST2/data
/usr/share/YaST2/data/*.ycp
@@ -170,6 +169,14 @@
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Thu May 10 2007 - fehr@suse.de
+- disable EVMS proposal completely [#272736]
+- make sure thet /dev/evms/sda1 gets into /etc/fstab for all cases
+ where evms_boot in control.xml is set to true.
+- version 2.15.11
+* Mon May 07 2007 - fehr@suse.de
+- do not create file 65-cdrom-rules any more (#271424)
+- fix problem when reusing existing partition (#267212)
* Thu May 03 2007 - fehr@suse.de
- fix wrong warning about unreadable DASD (#269230)
- enable swap again in filesystem selection (#270857)
++++++ yast2-storage-2.15.10.tar.bz2 -> yast2-storage-2.15.11.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.10/storage/src/create_udev_cdrom.ycp new/yast2-storage-2.15.11/storage/src/create_udev_cdrom.ycp
--- old/yast2-storage-2.15.10/storage/src/create_udev_cdrom.ycp 2006-04-03 18:28:15.000000000 +0200
+++ new/yast2-storage-2.15.11/storage/src/create_udev_cdrom.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-/**
- * File:
- * create_udev_cdrom.ycp
- *
- * Authors:
- * Thomas Fehr
- *
- * $Id: $
- *
- * YCP code to create a new file cdrom-rules for udev.
- *
- */
-
-{
-
-import "StorageDevices";
-
-textdomain "storage";
-
- string fname = StorageDevices::UdevCdromPath();
-
- if( SCR::Read( .target.size, fname )>0 )
- {
- string cmd = "cp -av " + fname + " " + fname + ".old";
- y2milestone( "cmd %1", cmd );
- SCR::Execute(.target.bash, cmd );
- SCR::Execute(.target.remove, fname );
- }
- StorageDevices::MakeCDLinks();
-}
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.10/storage/src/include/auto_part_ui.ycp new/yast2-storage-2.15.11/storage/src/include/auto_part_ui.ycp
--- old/yast2-storage-2.15.10/storage/src/include/auto_part_ui.ycp 2006-10-30 16:35:55.000000000 +0100
+++ new/yast2-storage-2.15.11/storage/src/include/auto_part_ui.ycp 2007-05-10 15:50:50.000000000 +0200
@@ -9,7 +9,7 @@
*
*
*
- * $Id: auto_part_ui.ycp 33868 2006-10-30 15:35:53Z fehr $
+ * $Id: auto_part_ui.ycp 37909 2007-05-10 13:50:48Z fehr $
*
* used globals:
*
@@ -278,7 +278,7 @@
`Left(`HBox(`HSpacing(3), `CheckBox(`id(`lvm), `opt(`notify),
// Label text
_("Create &LVM Based Proposal"), cfg["prop_lvm"]:false ))));
- if( cfg["evms_config"]:false )
+ if( cfg["evms_config"]:false && false ) // No evms proposal for SLES10 !!
vb = add( vb,
`Left(`HBox(`HSpacing(3), `CheckBox(`id(`evms), `opt(`notify),
// Label text
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.10/storage/src/include/do_proposal_flexible.ycp new/yast2-storage-2.15.11/storage/src/include/do_proposal_flexible.ycp
--- old/yast2-storage-2.15.10/storage/src/include/do_proposal_flexible.ycp 2007-04-25 16:06:29.000000000 +0200
+++ new/yast2-storage-2.15.11/storage/src/include/do_proposal_flexible.ycp 2007-05-07 19:03:30.000000000 +0200
@@ -14,7 +14,7 @@
*
*************************************************************
- $Id: do_proposal_flexible.ycp 37714 2007-04-25 14:06:28Z fehr $
+ $Id: do_proposal_flexible.ycp 37859 2007-05-07 17:03:29Z fehr $
*/
{
@@ -1217,11 +1217,15 @@
addl = add( addl, llg["ext_pnr",0]:5 );
llg["ext_pnr"] = remove( llg["ext_pnr"]:[0], 0 );
}
- else
+ else if( !e["exists"]:false )
{
addl = add( addl, llg["free_pnr",0]:1 );
llg["free_pnr"] = remove( llg["free_pnr"]:[0], 0 );
}
+ else
+ {
+ addl = add( addl, e["nr"]:0 );
+ }
llg["gap",gindex,"added"] =
add( llg["gap",gindex,"added"]:[], addl );
if( pindex+1 < size(ps) )
@@ -2800,6 +2804,8 @@
disk["partitions"] = p;
map r = can_swap_reuse( s, disk["partitions"]:[], target );
boolean have_swap = size(r)>0;
+ y2milestone( "get_inst_proposal have_boot %1 have_swap %2",
+ have_boot, have_swap );
if( haskey( r, "partitions" ))
disk["partitions"] = r["partitions"]:[];
else if( haskey( r, "targets" ))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.10/storage/src/inst_part_proposal.ycp new/yast2-storage-2.15.11/storage/src/inst_part_proposal.ycp
--- old/yast2-storage-2.15.10/storage/src/inst_part_proposal.ycp 2007-02-12 18:08:16.000000000 +0100
+++ new/yast2-storage-2.15.11/storage/src/inst_part_proposal.ycp 2007-05-10 15:50:50.000000000 +0200
@@ -17,7 +17,7 @@
*
*************************************************************
- $Id: inst_part_proposal.ycp 36054 2007-02-12 17:08:14Z fehr $
+ $Id: inst_part_proposal.ycp 37909 2007-05-10 13:50:48Z fehr $
*/
@@ -121,7 +121,7 @@
`Left( `RadioButton (`id ("lvm"), lvm_str, false ))
);
- if( cfg["evms_config"]:false )
+ if( cfg["evms_config"]:false && false ) // No EVMS proposal for SLES10!!
{
bframe = add( bframe, `VSpacing (0.2) );
bframe = add( bframe,
@@ -179,7 +179,7 @@
advanced options like RAID and encryption.</p>
"), deletechars(detailed_str,"&"));
- if( cfg["evms_config"]:false )
+ if( cfg["evms_config"]:false && false ) // No EVMS proposal for SLES10!!
// help text continued
// %1 is replaced by button text
help_text = help_text + _("<p>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.10/storage/src/Makefile.am new/yast2-storage-2.15.11/storage/src/Makefile.am
--- old/yast2-storage-2.15.10/storage/src/Makefile.am 2006-04-03 18:28:16.000000000 +0200
+++ new/yast2-storage-2.15.11/storage/src/Makefile.am 2007-05-07 13:57:23.000000000 +0200
@@ -1,7 +1,7 @@
#
# Makefile.am for storage/src
#
-# $Id: Makefile.am 29407 2006-03-27 11:33:40Z fehr $
+# $Id: Makefile.am 37852 2007-05-07 11:57:22Z fehr $
#
SUBDIRS = include modules proposal
@@ -18,7 +18,6 @@
inst_resize_ui.ycp \
inst_target_part.ycp \
inst_target_selection.ycp \
- create_udev_cdrom.ycp \
storage_finish.ycp
EXTRA_DIST = $(client_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.10/storage/src/Makefile.in new/yast2-storage-2.15.11/storage/src/Makefile.in
--- old/yast2-storage-2.15.10/storage/src/Makefile.in 2007-03-13 09:53:41.000000000 +0100
+++ new/yast2-storage-2.15.11/storage/src/Makefile.in 2007-05-11 10:09:27.000000000 +0200
@@ -17,7 +17,7 @@
#
# Makefile.am for storage/src
#
-# $Id: Makefile.am 29407 2006-03-27 11:33:40Z fehr $
+# $Id: Makefile.am 37852 2007-05-07 11:57:22Z fehr $
#
# Makefile.am.common -*- Makefile -*-
@@ -240,7 +240,6 @@
inst_resize_ui.ycp \
inst_target_part.ycp \
inst_target_selection.ycp \
- create_udev_cdrom.ycp \
storage_finish.ycp
EXTRA_DIST = $(client_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.10/storage/src/modules/StorageDevices.ycp new/yast2-storage-2.15.11/storage/src/modules/StorageDevices.ycp
--- old/yast2-storage-2.15.10/storage/src/modules/StorageDevices.ycp 2007-02-21 16:53:41.000000000 +0100
+++ new/yast2-storage-2.15.11/storage/src/modules/StorageDevices.ycp 2007-05-07 13:57:24.000000000 +0200
@@ -14,7 +14,7 @@
* - removable drives (ZIP)
* - floppy devices
*
- * $Id: StorageDevices.ycp 36352 2007-02-21 15:53:38Z fehr $
+ * $Id: StorageDevices.ycp 37852 2007-05-07 11:57:22Z fehr $
*
* Author:
* Klaus Kaempf (initial)
@@ -641,50 +641,6 @@
}
-/*
- * symlink_cdrom
- *
- * make proper symlink for cd-rom/dvd/cdrecorder drive
- *
- * @param map cdinfo result of .probe.cdrom
- */
-
-// count the links for "pseudo" devices
-
-define void symlink_cdrom( map cdinfo )
- ``{
- y2milestone( "device %1 link %2", cdinfo["dev_name"]:"",
- cdinfo["linkname"]:"" );
- if( size(cdinfo["linkname"]:"")>0 && size(cdinfo["dev_name"]:"")>0 )
- {
- string link = cdinfo["linkname"]:"";
- string device = cdinfo["dev_name"]:"";
-
- if( Installation::scr_destdir != "/" )
- {
- link = Installation::scr_destdir + link;
- }
- y2milestone( "pathname %1 links to %2", link, device );
- SCR::Execute (.target.symlink, substring(device,5), link);
- }
- return;
- }
-
-define string UdevBusEntry( string bus )
- ``{
- return( sformat( "BUS=\"%1\",", bus ));
- }
-
-define string UdevPlaceEntry( string place )
- ``{
- return( sformat( "ID=\"%1\",", place ));
- }
-
-global define string UdevSylinkEntry( list<string> links )
- ``{
- return( sformat( "SYMLINK+=\"%1\"", mergestring( links, " ") ));
- }
-
global define string UdevCdromPath()
``{
string pathname = "/etc/udev/rules.d/65-cdrom.rules";
@@ -695,94 +651,6 @@
return( pathname );
}
-global define map GetSysfsCdrom()
- ``{
- map file = $[];
- AsciiFile::SetComment( file, "^[ \t]*#" );
- AsciiFile::SetDelimiter( file, " " );
- AsciiFile::ReadFile( file, UdevCdromPath() );
- return( file );
- }
-
-global define string UdevPathEntry( map drive )
- {
- string ret = "";
- list<string> l = drive["dev_names"]:[];
- y2milestone( "UdevPathEntry l:%1", l );
- l = filter( string n, l, ``(search(n,"by-path")!=nil));
- y2milestone( "UdevPathEntry l:%1", l );
- ret = l[0]:"";
- if( size(ret)>0 )
- {
- ret = substring( ret, search(ret,"by-path")+8 );
- ret = "ENV{ID_PATH}==\""+ret+"\"";
- }
- y2milestone( "UdevPathEntry ret:%1", ret );
- return( ret );
- }
-
-global define string MakeUdevRulesLine( map drive )
- ``{
- y2milestone( "MakeUdevRulesLine %1", drive );
- string line = "";
- string bpath = UdevPathEntry(drive);
- y2milestone( "MakeUdevRulesLine path:%1", bpath );
- if( size(bpath)>0 )
- {
- line = sformat( "SUBSYSTEM==\"block\", %1, SYSFS{removable}==\"1\", %2",
- bpath, UdevSylinkEntry(drive["udev_links"]:[]) );
- }
- else
- {
- y2error( "No udev path id found for %1", drive );
- }
- y2milestone( "MakeUdevRulesLine ret %1", line );
- return( line );
- }
-
-global define list<integer> FindUdevRulesLine( map sysfs, map entry )
- ``{
- list<integer> a = AsciiFile::FindLineField( sysfs, 1, UdevPathEntry(entry)+"," );
- y2milestone( "FindUdevRulesLine entry %1", entry );
- y2milestone( "FindUdevRulesLine %1", a );
- return( a );
- }
-
-/*
- * Symlink (/mnt)/dev/cdromX to all real cdrom devices (/dev/sr0, etc.)
- * create type dependant links (i.e. /dev/dvd for a DVD drive
- * but make sure that at least /dev/cdrom exists.
- */
-
-global define void MakeCDLinks ()
- ``{
- if( ProbeCDROMs() )
- {
- map udev_file = GetSysfsCdrom();
- y2milestone( "MakeCDLinks Lines:%1", AsciiFile::NumLines( udev_file ) );
- y2milestone( "MakeCDLinks udev_file:%1", udev_file );
- if( AsciiFile::NumLines( udev_file )==0 )
- {
- AsciiFile::AppendLine( udev_file, [ "# cdrom links generated by YaST2" ] );
- AsciiFile::AppendLine( udev_file, [ "# " ] );
-
- foreach( map drive, cddrives,
- ``{
- string line = MakeUdevRulesLine(drive);
- if( size(line)>0 )
- AsciiFile::AppendLine( udev_file, [ line ]);
- });
- y2milestone( "MakeCDLinks %1", cddrives );
- string dir = substring( UdevCdromPath(), 0, findlastof( UdevCdromPath(), "/" ) );
- y2milestone( "MakeCDLinks dir %1", dir );
- if( SCR::Read( .target.size, dir )<=0 )
- SCR::Execute( .target.mkdir, dir );
- AsciiFile::RewriteFile( udev_file, UdevCdromPath() );
- }
- }
- return;
- }
-
/*
* Initialize
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.10/storage/src/modules/Storage.ycp new/yast2-storage-2.15.11/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.15.10/storage/src/modules/Storage.ycp 2007-04-26 11:47:18.000000000 +0200
+++ new/yast2-storage-2.15.11/storage/src/modules/Storage.ycp 2007-05-10 15:50:50.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 37730 2007-04-26 09:47:16Z fehr $
+ * $Id: Storage.ycp 37909 2007-05-10 13:50:48Z fehr $
*/
{
@@ -4405,9 +4405,18 @@
y2milestone( "UpdateBootFstabEvms lines %1", lines );
map l = AsciiFile::GetLine( fstab, lines[0]:-1 );
if( search( l["fields",0]:"", "/dev/evms" )!=0 )
- AsciiFile::ChangeLineField( fstab, lines[0]:-1, 0,
- "/dev/evms/"+substring(l["fields",0]:"",5));
- AsciiFile::RewriteFile( fstab, tabpath );
+ {
+ 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 ));
}
@@ -4417,7 +4426,6 @@
global define void WriteFstab()
``{
y2milestone( "WriteFstab called" );
- StorageDevices::MakeCDLinks();
Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "proc" ) );
Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "sys" ) );
Storage::AddFstabEntry( FileSystems::GetFstabDefaultMap( "debug" ) );
@@ -5111,7 +5119,12 @@
of = "/etc/udev/rules.d/55-cdrom.rules";
y2milestone( "removing obsolete %1", of );
SCR::Execute( .target.remove, of );
- StorageDevices::MakeCDLinks();
+ }
+ 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();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.10/VERSION new/yast2-storage-2.15.11/VERSION
--- old/yast2-storage-2.15.10/VERSION 2007-05-03 14:25:58.000000000 +0200
+++ new/yast2-storage-2.15.11/VERSION 2007-05-10 16:05:25.000000000 +0200
@@ -1 +1 @@
-2.15.10
+2.15.11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org