Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Mon Aug 9 02:12:10 CEST 2010.
--------
--- yast2-storage/yast2-storage.changes 2010-07-23 09:55:23.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2010-08-06 11:54:38.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Aug 03 12:45:44 CEST 2010 - aschnell@suse.de
+
+- increased proposed size for /boot to 150 MB (bnc #627288)
+- 2.20.1
+
+-------------------------------------------------------------------
+Thu Jul 29 15:53:11 CEST 2010 - fehr@suse.de
+
+- fix bug that destroys encrypted volumes when wron password is
+ entered in read fstab dialog (#625490)
+- replace "nofail" with "noauto" for encrypted volumes in fstab
+ during update
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.20.0.tar.bz2
New:
----
yast2-storage-2.20.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.NbxrJ6/_old 2010-08-09 02:11:58.000000000 +0200
+++ /var/tmp/diff_new_pack.NbxrJ6/_new 2010-08-09 02:11:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.20.0)
+# spec file for package yast2-storage (Version 2.20.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-storage
-Version: 2.20.0
+Version: 2.20.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.20.0.tar.bz2
+Source0: yast2-storage-2.20.1.tar.bz2
Prefix: /usr
@@ -31,7 +31,7 @@
License: GPLv2+
BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files
-BuildRequires: libstorage-devel >= 2.20.0 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools
+BuildRequires: libstorage-devel >= 2.20.1 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools
BuildRequires: yast2-perl-bindings yast2-testsuite >= 2.19.0
Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`)
Requires: yast2-perl-bindings perl = %{perl_version}
@@ -56,7 +56,7 @@
devices during installation and on an installed system.
%prep
-%setup -n yast2-storage-2.20.0
+%setup -n yast2-storage-2.20.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-storage-2.20.0.tar.bz2 -> yast2-storage-2.20.1.tar.bz2 ++++++
++++ 5567 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.20.0/VERSION new/yast2-storage-2.20.1/VERSION
--- old/yast2-storage-2.20.0/VERSION 2010-07-05 14:41:19.000000000 +0200
+++ new/yast2-storage-2.20.1/VERSION 2010-08-06 11:48:28.000000000 +0200
@@ -1 +1 @@
-2.20.0
+2.20.1
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.20.0/configure.in new/yast2-storage-2.20.1/configure.in
--- old/yast2-storage-2.20.0/configure.in 2010-07-23 09:52:18.000000000 +0200
+++ new/yast2-storage-2.20.1/configure.in 2010-08-06 11:52:31.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.20.0, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.20.1, 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.20.0"
+VERSION="2.20.1"
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.20.0/storage/src/include/auto_part_prepare.ycp new/yast2-storage-2.20.1/storage/src/include/auto_part_prepare.ycp
--- old/yast2-storage-2.20.0/storage/src/include/auto_part_prepare.ycp 2010-01-05 15:49:22.000000000 +0100
+++ new/yast2-storage-2.20.1/storage/src/include/auto_part_prepare.ycp 2010-08-04 15:38:19.000000000 +0200
@@ -8,7 +8,7 @@
* cover the whole disk, including unpartitioned
* areas as 'dummy' partitions.
*
- * $Id: auto_part_prepare.ycp 59894 2009-12-02 14:26:01Z aschnell $
+ * $Id: auto_part_prepare.ycp 62341 2010-08-04 13:38:18Z aschnell $
*
*/
{
@@ -26,7 +26,7 @@
y2milestone( "prepare_partitions bytes_per_unit: %1 disk_size:%2",
bytes_per_unit, disk_size );
- integer size_of_boot = Partitions::MinimalNeededBootsize();
+ integer size_of_boot = Partitions::ProposedBootsize();
integer size_of_swap = 1024 * 1024 * Partitions::SwapSizeMb(0);
// The minimum size needed to install a default system
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.20.0/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.20.1/storage/src/include/custom_part_dialogs.ycp
--- old/yast2-storage-2.20.0/storage/src/include/custom_part_dialogs.ycp 2010-04-16 10:33:57.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/include/custom_part_dialogs.ycp 2010-07-29 15:58:44.000000000 +0200
@@ -16,7 +16,7 @@
*
*************************************************************
- $Id: custom_part_dialogs.ycp 61723 2010-04-16 08:33:56Z aschnell $
+ $Id: custom_part_dialogs.ycp 62316 2010-07-29 13:54:42Z fehr $
*/
{
@@ -41,20 +41,23 @@
symbol check_devices_used( list<map> partitions, boolean not_cr );
-define string DlgCreateCryptFs( string device, integer minpwlen, boolean format,
+define string DlgPasswdCryptFs( string device, integer minpwlen, boolean format,
boolean tmpcrypt )
``{
string helptext = GetCreateCryptFsHelptext(minpwlen, format, tmpcrypt);
- y2milestone( "DlgCreateCryptFs device:%1 minpwlen:%2 format:%3 tmpcrypt:%4",
+ y2milestone( "DlgPasswdCryptFs device:%1 minpwlen:%2 format:%3 tmpcrypt:%4",
device, minpwlen, format, tmpcrypt );
// heading text
string h = _("Enter your Password for the Encrypted File System.");
- // label text
- string label = _("Don't forget what you enter here!");
+ string label = "";
+ if( format )
+ // label text
+ label = _("Don't forget what you enter here!");
if( tmpcrypt )
{
- label = label + " ";
+ if( size(label)>0 )
+ label = label + " ";
label = label + _("Empty password allowed.");
}
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.20.0/storage/src/include/ep-hd.ycp new/yast2-storage-2.20.1/storage/src/include/ep-hd.ycp
--- old/yast2-storage-2.20.0/storage/src/include/ep-hd.ycp 2010-06-21 17:42:32.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/include/ep-hd.ycp 2010-08-04 18:50:27.000000000 +0200
@@ -209,11 +209,13 @@
fields = (list<symbol>) merge(fields, [ `heading_md, `raid_type, `chunk_size, `parity_algorithm ]);
}
- if (contains([ `CT_DISK ], ctype))
+ if (contains([ `CT_DISK ], ctype) && target_map[device, "transport"]:`unknown == `fc)
{
fields = (list<symbol>) merge(fields, [`heading_fc, `fc_wwpn, `fc_port_id, `fc_fcp_lun ]);
}
+ fields = StorageSettings::FilterOverview(fields);
+
term buttons = `HBox();
if ((integer) SCR::Read(.target.size, "/usr/sbin/smartctl") > 0)
@@ -227,7 +229,7 @@
UI::ReplaceWidget(`tab_panel,
`VBox(
`HStretch(),
- StorageFields::Overview(StorageSettings::FilterOverview(fields), target_map, device),
+ StorageFields::Overview(fields, target_map, device),
add(buttons, `HStretch())
)
);
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.20.0/storage/src/include/ep-import.ycp new/yast2-storage-2.20.1/storage/src/include/ep-import.ycp
--- old/yast2-storage-2.20.0/storage/src/include/ep-import.ycp 2010-07-08 16:13:49.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/include/ep-import.ycp 2010-07-29 15:58:44.000000000 +0200
@@ -357,31 +357,59 @@
boolean format_sys = true;
string device = FstabAddDialog(target_map, fstabs, format_sys);
+ map new_target_map = $[];
+ boolean import_ok = false;
if (!isempty(device))
{
y2milestone("ImportMountPoints device:%1", device);
list<map> fstab = (list<map>) fstabs[device]:[];
+ import_ok = true;
- map new_target_map = AddFstabToTargetMap(target_map, fstab, format_sys);
+ new_target_map = AddFstabToTargetMap(target_map, fstab, format_sys);
foreach(string d, map disk, new_target_map, {
foreach(map p, disk["partitions"]:[], {
+ string key = (p["type"]:`unknown != `loop) ? (p["device"]:"error") : (p["fpath"]:"error");
if (!isempty(p["mount"]:"") && p["enc_type"]:`none!=`none &&
- !p["tmpcrypt"]:false)
+ !p["tmpcrypt"]:false && Storage::NeedCryptPwd(key) )
{
- string pwd = DlgCreateCryptFs( p["device"]:"", 1, false, false );
- if( pwd != nil && !isempty(pwd) )
- Storage::SetCryptPwd( p["device"]:"", pwd );
+ boolean ok = false;
+ string dev = p["device"]:"";
+ string pwd = "";
+ do
+ {
+ ok = false;
+ pwd = DlgPasswdCryptFs( dev, 1, false, false );
+ if( pwd != nil && !isempty(pwd) )
+ {
+ if( Storage::CheckCryptOk( dev, pwd, true,
+ false ) )
+ {
+ ok = Storage::SetCryptPwd( dev, pwd ) &&
+ Storage::SetCrypt( dev, true, false );
+ }
+ else
+ {
+ Popup::Error(_("Wrong Password provided."));
+ }
+ }
+ else if( size(pwd)==0 )
+ {
+ ok = true;
+ import_ok = false;
+ }
+ }
+ while( !ok );
+
}
});
});
- Storage::SetTargetMap(new_target_map);
}
+ if( import_ok )
+ Storage::SetTargetMap(new_target_map);
else
- {
Storage::RestoreTargetBackup("import");
- }
Storage::DisposeTargetBackup("import");
}
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.20.0/storage/src/modules/Partitions.ycp new/yast2-storage-2.20.1/storage/src/modules/Partitions.ycp
--- old/yast2-storage-2.20.0/storage/src/modules/Partitions.ycp 2010-07-06 15:38:10.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/modules/Partitions.ycp 2010-08-03 12:58:14.000000000 +0200
@@ -6,7 +6,7 @@
*
* Purpose: Provides information about partitions
*
- * $Id: Partitions.ycp 62181 2010-07-05 13:21:08Z aschnell $
+ * $Id: Partitions.ycp 62332 2010-08-03 10:58:13Z aschnell $
*/
{
module "Partitions";
@@ -83,8 +83,7 @@
global const list<integer> no_windows = [ 0x12, 0x82, 0xde, fsid_gpt_boot, fsid_gpt_service,
fsid_gpt_msftres ];
-
- integer minimal_needed_bootsize = 0;
+ map boot_size_k = $[];
symbol default_fs = `unknown;
symbol default_boot_fs = `unknown;
@@ -160,48 +159,58 @@
}
-global define integer MinimalNeededBootsize()
- ``{
- if( minimal_needed_bootsize == 0 )
+map BootSizeK()
+{
+ if (isempty(boot_size_k))
+ {
+ boot_size_k = $[ `proposed : 150 * 1024,
+ `minimal : 64 * 1024,
+ `maximal : 750 * 1024 ];
+
+ if (Arch::ia64())
{
- minimal_needed_bootsize = 64 * 1024 * 1024;
- if( Arch::ia64() )
- {
- minimal_needed_bootsize = 200*1024*1024;
- }
- else if( Arch::board_chrp() )
- {
- minimal_needed_bootsize = 200*1024*1024;
- }
- else if( Arch::board_prep() )
- {
- minimal_needed_bootsize = 200*1024*1024;
- }
- else if( Arch::board_iseries() )
- {
- minimal_needed_bootsize = 200*1024*1024;
- }
- else if( Arch::board_mac() )
- {
- minimal_needed_bootsize = 32*1024*1024;
- }
+ boot_size_k[`proposed] = 200 * 1024;
+ boot_size_k[`minimal] = 180 * 1024;
+ }
+ else if (Arch::board_chrp() || Arch::board_prep() || Arch::board_iseries())
+ {
+ boot_size_k[`proposed] = 200 * 1024;
+ boot_size_k[`minimal] = 180 * 1024;
+ }
+ else if (Arch::board_mac())
+ {
+ boot_size_k[`proposed] = 32 * 1024;
+ boot_size_k[`minimal] = 800;
}
- return( minimal_needed_bootsize );
- }
-global define integer MinimalRequiredBootsize()
- ``{
- integer need = MinimalNeededBootsize();
- integer ret = need;
- if( Arch::ia64() )
- ret = ret / 10 * 9;
- else if( Arch::board_mac() )
- ret = 800 * 1024;
- if( ret!=need )
- y2milestone( "MinimalRequiredBootsize ret %1 Req:%2", ret, need );
- return( ret );
+ y2milestone("BootSizeK boot_size_k:%1", boot_size_k);
}
+ return boot_size_k;
+}
+
+
+global integer MinimalNeededBootsize()
+{
+ return 1024 * BootSizeK()[`proposed]:0;
+}
+
+global integer ProposedBootsize()
+{
+ return 1024 * BootSizeK()[`proposed]:0;
+}
+
+global integer MinimalBootsize()
+{
+ return 1024 * BootSizeK()[`minimal]:0;
+}
+
+global integer MaximalBootsize()
+{
+ return 1024 * BootSizeK()[`maximal]:0;
+}
+
+
global define integer BootCyl()
``{
if( boot_cyl == 0 )
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.20.0/storage/src/modules/Storage.ycp new/yast2-storage-2.20.1/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.20.0/storage/src/modules/Storage.ycp 2010-07-23 09:52:10.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/modules/Storage.ycp 2010-08-06 10:38:52.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 62278 2010-07-20 10:07:01Z fehr $
+ * $Id: Storage.ycp 62345 2010-08-05 09:07:32Z aschnell $
*/
{
module "Storage";
@@ -217,6 +217,20 @@
]
];
+map conv_transport =
+ $[ "def_sym" : `unknown,
+ "def_int" : LibStorage::TUNKNOWN(),
+ "m" : $[ LibStorage::SBP() : `sbp,
+ LibStorage::ATA() : `ata,
+ LibStorage::FC() : `fc,
+ LibStorage::ISCSI() : `iscsi,
+ LibStorage::SAS() : `sas,
+ LibStorage::SATA() : `sata,
+ LibStorage::SPI() : `spi,
+ LibStorage::USB() : `usb
+ ]
+ ];
+
map DiskMapVersion = $[];
map DiskMap = $[];
@@ -1185,6 +1199,10 @@
d["label"] = LibStorage::DiskInfo::swig_disklabel_get(dinfo);
d["max_logical"] = LibStorage::DiskInfo::swig_maxLogical_get(dinfo);
d["max_primary"] = LibStorage::DiskInfo::swig_maxPrimary_get(dinfo);
+
+ integer t = LibStorage::DiskInfo::swig_transport_get(dinfo);
+ d["transport"] = toSymbol(conv_transport, t);
+
boolean bt = LibStorage::DiskInfo::swig_iscsi_get(dinfo);
if( bt )
d["iscsi"] = true;
@@ -1639,7 +1657,7 @@
map toDiskMap( map disk, map cinfo )
{
list<string> l = [ "size_k", "cyl_size", "cyl_count", "sector_size", "label", "name", "device",
- "max_logical", "max_primary", "type", "readonly",
+ "max_logical", "max_primary", "type", "readonly", "transport", "iscsi",
"used_by", "used_by_type", "used_by_device", "partitions", "dasdfmt",
"udev_id", "udev_path" ];
foreach( string s, l,
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.20.0/storage/src/modules/StorageFields.ycp new/yast2-storage-2.20.1/storage/src/modules/StorageFields.ycp
--- old/yast2-storage-2.20.0/storage/src/modules/StorageFields.ycp 2010-07-23 09:52:10.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/modules/StorageFields.ycp 2010-08-04 18:52:34.000000000 +0200
@@ -733,7 +733,10 @@
case `bus:
{
- string value = data["bus"]:"";
+ map names = $[ `sbp : "Firewire", `ata : "ATA",
+ `fc : "Fibre Channel", `iscsi : "iSCSI", `sas : "SAS",
+ `sata : "SATA", `spi : "SCSI", `usb : "USB" ];
+ string value = names[data["transport"]:`unknown]:"";
if (style == `table)
return value;
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.20.0/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.20.1/storage/src/modules/StorageProposal.ycp
--- old/yast2-storage-2.20.0/storage/src/modules/StorageProposal.ycp 2010-01-13 11:41:10.000000000 +0100
+++ new/yast2-storage-2.20.1/storage/src/modules/StorageProposal.ycp 2010-08-03 12:27:26.000000000 +0200
@@ -419,13 +419,13 @@
{
map pb = $[];
pb["mount"] = Partitions::BootMount();
- pb["size"] = Partitions::MinimalNeededBootsize();
+ pb["size"] = Partitions::ProposedBootsize();
pb["fsys"] = Partitions::DefaultBootFs();
pb["id"] = Partitions::FsidBoot();
pb["auto_added"] = true;
pb["max_cyl"] = Partitions::BootCyl();
pb["primary"] = Partitions::BootPrimary();
- pb["maxsize"] = 500*1024*1024;
+ pb["maxsize"] = Partitions::MaximalBootsize();
tc["partitions"] = add( tc["partitions"]:[], pb );
y2milestone( "try_add_boot disk_cyl %1 boot_cyl %2 need_boot %3 typ %4",
disk["cyl_count"]:0, Partitions::BootCyl(),
@@ -2179,7 +2179,7 @@
{
if( partition["size"]:0 == -1 )
{
- partition["size"] = Partitions::MinimalNeededBootsize();
+ partition["size"] = Partitions::ProposedBootsize();
}
if( partition["fsys"]:`none == `none )
{
@@ -2398,7 +2398,7 @@
{
if( part["size"]:0 == -1 )
{
- part["size"] = Partitions::MinimalNeededBootsize();
+ part["size"] = Partitions::ProposedBootsize();
}
if( part["fsys"]:`none == `none )
{
@@ -2513,11 +2513,11 @@
pl = filter( map p, partitions,
``(!p["delete"]:false &&
p["size_k"]:0*1024 >=
- Partitions::MinimalRequiredBootsize()));
+ Partitions::MinimalBootsize()));
map boot = find( map p, pl,
``((p["fsid"]:0 == Partitions::fsid_gpt_boot) ||
(p["fsid"]:0 == Partitions::FsidBoot() &&
- p["size_k"]:0<500*1024)||
+ p["size_k"]:0*1024 <= Partitions::MaximalBootsize()) ||
(p["detected_fs"]:`unknown==`hfs &&
p["boot"]:false && label=="mac") ||
(p["fsid"]:0 == Partitions::fsid_prep_chrp_boot &&
@@ -2764,7 +2764,7 @@
if( contains( linux_pid, p["fsid"]:0 ) ||
(p["fsid"]:0 == Partitions::fsid_gpt_boot) ||
(p["fsid"]:0 == Partitions::FsidBoot() &&
- p["size_k"]:0<500*1024)||
+ p["size_k"]:0*1024 <= Partitions::MaximalBootsize()) ||
(Partitions::PrepBoot() &&
(p["fsid"]:0 == Partitions::fsid_prep_chrp_boot||
p["fsid"]:0 == 0x06)))
@@ -3690,7 +3690,7 @@
target = AddWinInfo(target);
ret["target"] = target;
map boot = $[ "mount" : Partitions::BootMount(),
- "size" : Partitions::MinimalNeededBootsize(),
+ "size" : Partitions::ProposedBootsize(),
"fsys" : Partitions::DefaultBootFs(),
"id" : Partitions::FsidBoot(),
"max_cyl" : Partitions::BootCyl() ];
@@ -3942,7 +3942,7 @@
target = remove_vm(target,key);
ret["target"] = target;
map boot = $[ "mount" : Partitions::BootMount(),
- "size" : Partitions::MinimalNeededBootsize(),
+ "size" : Partitions::ProposedBootsize(),
"fsys" : Partitions::DefaultBootFs(),
"id" : Partitions::FsidBoot(),
"max_cyl" : Partitions::BootCyl() ];
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.20.0/storage/src/modules/StorageUpdate.ycp new/yast2-storage-2.20.1/storage/src/modules/StorageUpdate.ycp
--- old/yast2-storage-2.20.0/storage/src/modules/StorageUpdate.ycp 2010-01-05 15:49:22.000000000 +0100
+++ new/yast2-storage-2.20.1/storage/src/modules/StorageUpdate.ycp 2010-07-29 15:58:44.000000000 +0200
@@ -288,6 +288,35 @@
AsciiFile::RewriteFile( crtab, tabpath );
}
+void UpdateFstabCryptNofail()
+ {
+ y2milestone( "UpdateFstabCryptNofail called" );
+ string tabpath = Storage::PathToDestdir( "/etc/fstab" );
+ map fstab = Partitions::GetFstab( tabpath );
+ integer line = 0;
+ boolean update = false;
+ while( line<=AsciiFile::NumLines( fstab ) )
+ {
+ map l = AsciiFile::GetLine( fstab, line );
+ if( search( l["fields",0]:"", "/dev/mapper/cr_" )==0 )
+ {
+ list<string> ls = splitstring( l["fields",3]:"", "," );
+ ls = filter( string s, ls, ``(s!="noauto"));
+ if( size(filter( string s, ls, ``(s=="nofail")))==0 )
+ {
+ ls = add( ls, "nofail" );
+ AsciiFile::ChangeLineField( fstab, line, 3,
+ mergestring( ls, "," ));
+ update = true;
+ }
+ }
+ line = line+1;
+ }
+ if( update )
+ {
+ AsciiFile::RewriteFile( fstab, tabpath );
+ }
+ }
/**
* Updates fstab on disk
@@ -388,6 +417,8 @@
bo = (map)SCR::Execute (.target.bash_output, cmd );
y2milestone( "Update bo %1", bo );
}
+ if( oldv["major"]:0<11 || (oldv["major"]:0==11 && oldv["minor"]:0<=2))
+ UpdateFstabCryptNofail();
// set flag -> it indicates that Update was already called
called_update = true;
}
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.20.0/storage/src/testsuite/tests/empty-efi1.out new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty-efi1.out
--- old/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi1.out 2010-07-06 15:38:10.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty-efi1.out 2010-08-03 12:48:40.000000000 +0200
@@ -1,4 +1,4 @@
Dump Proposal:
-Dump Create boot volume /dev/sda1 (70.60 MB) with vfat
+Dump Create boot volume /dev/sda1 (156.88 MB) with vfat
Dump Create swap volume /dev/sda2 (517.72 MB)
-Dump Create root volume /dev/sda3 (297.51 GB) with ext4
+Dump Create root volume /dev/sda3 (297.43 GB) with ext4
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.20.0/storage/src/testsuite/tests/empty-efi2.out new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty-efi2.out
--- old/yast2-storage-2.20.0/storage/src/testsuite/tests/empty-efi2.out 2010-07-06 15:38:10.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty-efi2.out 2010-08-03 12:48:45.000000000 +0200
@@ -1,5 +1,5 @@
Dump Proposal:
-Dump Create boot volume /dev/sda1 (70.60 MB) with vfat
+Dump Create boot volume /dev/sda1 (156.88 MB) with vfat
Dump Create swap volume /dev/sda2 (2.01 GB)
Dump Create root volume /dev/sda3 (20.00 GB) with ext4
-Dump Create volume /dev/sda4 (276.01 GB) for /home with ext4
+Dump Create volume /dev/sda4 (275.93 GB) for /home with ext4
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.20.0/storage/src/testsuite/tests/empty3.out new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty3.out
--- old/yast2-storage-2.20.0/storage/src/testsuite/tests/empty3.out 2010-04-07 11:37:12.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty3.out 2010-08-03 12:48:06.000000000 +0200
@@ -1,6 +1,6 @@
Dump Proposal:
-Dump Create boot volume /dev/sda1 (70.60 MB) with ext4
-Dump Create volume /dev/sda2 (29.99 GB)
-Dump Create volume group system (29.99 GB) from /dev/sda2 [destructive]
+Dump Create boot volume /dev/sda1 (156.88 MB) with ext4
+Dump Create volume /dev/sda2 (29.98 GB)
+Dump Create volume group system (29.98 GB) from /dev/sda2 [destructive]
Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4
Dump Create swap logical volume /dev/system/swap (512.00 MB)
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.20.0/storage/src/testsuite/tests/empty4.out new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty4.out
--- old/yast2-storage-2.20.0/storage/src/testsuite/tests/empty4.out 2010-04-07 11:37:12.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty4.out 2010-08-03 12:47:55.000000000 +0200
@@ -1,7 +1,7 @@
Dump Proposal:
-Dump Create boot volume /dev/sda1 (70.60 MB) with ext4
-Dump Create volume /dev/sda2 (29.99 GB)
-Dump Create volume group system (29.99 GB) from /dev/sda2 [destructive]
-Dump Create logical volume /dev/system/home (19.49 GB) for /home with ext4
+Dump Create boot volume /dev/sda1 (156.88 MB) with ext4
+Dump Create volume /dev/sda2 (29.98 GB)
+Dump Create volume group system (29.98 GB) from /dev/sda2 [destructive]
+Dump Create logical volume /dev/system/home (19.48 GB) for /home with ext4
Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4
Dump Create swap logical volume /dev/system/swap (512.00 MB)
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.20.0/storage/src/testsuite/tests/empty5.out new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty5.out
--- old/yast2-storage-2.20.0/storage/src/testsuite/tests/empty5.out 2010-04-07 11:37:12.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty5.out 2010-08-03 12:47:42.000000000 +0200
@@ -1,6 +1,6 @@
Dump Proposal:
-Dump Create boot volume /dev/sda1 (70.60 MB) with ext4
-Dump Create volume /dev/sda2 (298.02 GB)
-Dump Create volume group system (298.02 GB) from /dev/sda2 [destructive]
+Dump Create boot volume /dev/sda1 (156.88 MB) with ext4
+Dump Create volume /dev/sda2 (297.94 GB)
+Dump Create volume group system (297.93 GB) from /dev/sda2 [destructive]
Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4
Dump Create swap logical volume /dev/system/swap (768.00 MB)
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.20.0/storage/src/testsuite/tests/empty6.out new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty6.out
--- old/yast2-storage-2.20.0/storage/src/testsuite/tests/empty6.out 2010-04-07 11:37:12.000000000 +0200
+++ new/yast2-storage-2.20.1/storage/src/testsuite/tests/empty6.out 2010-08-03 12:47:35.000000000 +0200
@@ -1,7 +1,7 @@
Dump Proposal:
-Dump Create boot volume /dev/sda1 (70.60 MB) with ext4
-Dump Create volume /dev/sda2 (298.02 GB)
-Dump Create volume group system (298.02 GB) from /dev/sda2 [destructive]
+Dump Create boot volume /dev/sda1 (156.88 MB) with ext4
+Dump Create volume /dev/sda2 (297.94 GB)
+Dump Create volume group system (297.93 GB) from /dev/sda2 [destructive]
Dump Create logical volume /dev/system/home (25.00 GB) for /home with ext4
Dump Create logical volume /dev/system/root (10.00 GB) for / with ext4
Dump Create swap logical volume /dev/system/swap (768.00 MB)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org