Hello community,
here is the log from the commit of package yast2-storage for openSUSE:Factory
checked in at Wed Dec 2 12:33:04 CET 2009.
--------
--- yast2-storage/yast2-storage.changes 2009-10-09 10:23:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2009-11-27 17:23:57.000000000 +0100
@@ -1,0 +2,52 @@
+Fri Nov 27 17:08:15 CET 2009 - aschnell@suse.de
+
+- enable boot.crypt-early along with boot.crypto (bnc #558888)
+
+-------------------------------------------------------------------
+Thu Nov 26 17:07:16 CET 2009 - fehr@suse.de
+
+- disable impossible mountby methods (#444328)
+
+-------------------------------------------------------------------
+Tue Nov 24 17:13:39 CET 2009 - fehr@suse.de
+
+- do not format hfs boot partition on mac systems (#447782)
+
+-------------------------------------------------------------------
+Tue Nov 24 14:59:54 CET 2009 - fehr@suse.de
+
+- enabled to set "noauto" option for LUKS-encrypted volumes
+
+-------------------------------------------------------------------
+Fri Nov 20 18:01:15 CET 2009 - aschnell@suse.de
+
+- added mount graph (requires libstorage 2.19.1)
+
+-------------------------------------------------------------------
+Thu Nov 19 10:32:36 CET 2009 - aschnell@suse.de
+
+- keep name entry in target-map as provided by libstorage
+
+-------------------------------------------------------------------
+Tue Nov 17 12:03:12 CET 2009 - aschnell@suse.de
+
+- improved focus handling during creation of logical volumes
+
+-------------------------------------------------------------------
+Mon Nov 16 14:11:34 CET 2009 - aschnell@suse.de
+
+- enabled storage proposal for S390 (bnc #462254)
+
+-------------------------------------------------------------------
+Mon Nov 2 11:25:05 CET 2009 - jsrain@suse.cz
+
+- warn in installation proposal if not formatting /home partition
+ and using remote authentication (fate#306325)
+
+-------------------------------------------------------------------
+Thu Oct 29 11:59:20 CET 2009 - aschnell@suse.de
+
+- provide usedby information as list in target-map (bnc #472812)
+- 2.19.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.18.19.tar.bz2
New:
----
yast2-storage-2.19.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.py4Vw8/_old 2009-12-02 12:32:22.000000000 +0100
+++ /var/tmp/diff_new_pack.py4Vw8/_new 2009-12-02 12:32:22.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.18.19)
+# spec file for package yast2-storage (Version 2.19.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,16 +19,16 @@
Name: yast2-storage
-Version: 2.18.19
+Version: 2.19.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.18.19.tar.bz2
+Source0: yast2-storage-2.19.0.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPL v2 or later
+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.18.21 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools
+BuildRequires: libstorage-devel >= 2.19.1 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools
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
@@ -52,7 +52,7 @@
devices during installation and on an installed system.
%prep
-%setup -n yast2-storage-2.18.19
+%setup -n yast2-storage-2.19.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -121,7 +121,7 @@
%{perl_vendorarch}/LibStorage.so
%package devel
-License: GPL v2 or later
+License: GPLv2+
Requires: libstorage-devel = %(echo `rpm -q --queryformat '%{VERSION}' libstorage-devel`)
Requires: blocxx-devel libstdc++-devel yast2-storage = %version
Summary: YaST2 - Storage Library Headers and Documentation
++++++ yast2-storage-2.18.19.tar.bz2 -> yast2-storage-2.19.0.tar.bz2 ++++++
++++ 11191 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.19/configure.in new/yast2-storage-2.19.0/configure.in
--- old/yast2-storage-2.18.19/configure.in 2009-10-09 10:21:57.000000000 +0200
+++ new/yast2-storage-2.19.0/configure.in 2009-11-06 11:09:37.000000000 +0100
@@ -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.18.19, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.19.0, 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.19"
+VERSION="2.19.0"
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.19/missing new/yast2-storage-2.19.0/missing
--- old/yast2-storage-2.18.19/missing 2009-10-09 10:22:07.000000000 +0200
+++ new/yast2-storage-2.19.0/missing 2009-11-06 11:09:48.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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.19/storage/doc/README.part.info new/yast2-storage-2.19.0/storage/doc/README.part.info
--- old/yast2-storage-2.18.19/storage/doc/README.part.info 2009-07-21 16:37:05.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/doc/README.part.info 2009-11-24 15:57:46.000000000 +0100
@@ -44,7 +44,7 @@
if PREFER_REMOVE is set to 1.
-KEEP_PARTITION_FSYS
+KEEP_PARTITION_ID
Possible values: comma separated list of possible partition ids
Default value: Empty list
@@ -117,7 +117,7 @@
Example: id=0x8E
Description:
This keyword makes it possible to create partitions with partition
- ide other than 0x83 (for normal filesystem partitions) or 0x82 (for
+ ids other than 0x83 (for normal filesystem partitions) or 0x82 (for
swap partitions). This make it possible to create LVM or MD partitions
on a disk.
@@ -179,7 +179,7 @@
If in the above example the machine has three disks then each of the
partition groups gets on a separate disk. So one disk will hold
- /var, another disk will hold /home and another disk will hole
+ /var, another disk will hold /home and another disk will hold
/, /usr and /opt.
If in the above example the machine has only two disks then /home
will still be on a separate disk (since it has lower priority than
@@ -217,6 +217,6 @@
If there are multiple partition groups the the partition group with
the lowest number (means highest priority) get assigned its disk first.
- Afterward the partition group with the next priority gets assigned a
+ Afterward the partition group with the next priority gets assigned
the optimal disk from the so far unassigned disks.
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.19/storage/src/include/custom_part_check_generated.ycp new/yast2-storage-2.19.0/storage/src/include/custom_part_check_generated.ycp
--- old/yast2-storage-2.18.19/storage/src/include/custom_part_check_generated.ycp 2009-10-05 17:50:40.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/custom_part_check_generated.ycp 2009-11-17 17:30:03.000000000 +0100
@@ -192,8 +192,9 @@
});
y2milestone("diskless:%1", diskless);
- y2milestone("root_found:%1 boot_found %2", root_found, boot_found);
- y2milestone("root_dmraid:%1 root_raid %2 boot_raid %3 raid_type:%4",
+ y2milestone("root_found:%1 root_fs:%2", root_found, root_fs);
+ y2milestone("boot_found:%1 boot_fs:%2", boot_found, boot_fs);
+ y2milestone("root_dmraid:%1 root_raid:%2 boot_raid:%3 raid_type:%4",
root_dmraid, root_raid, boot_raid, raid_type);
boolean ok = 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.18.19/storage/src/include/custom_part_dialogs.ycp new/yast2-storage-2.19.0/storage/src/include/custom_part_dialogs.ycp
--- old/yast2-storage-2.18.19/storage/src/include/custom_part_dialogs.ycp 2009-08-04 11:06:42.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/custom_part_dialogs.ycp 2009-11-26 18:34:16.000000000 +0100
@@ -16,7 +16,7 @@
*
*************************************************************
- $Id: custom_part_dialogs.ycp 58178 2009-07-27 15:42:43Z aschnell $
+ $Id: custom_part_dialogs.ycp 59799 2009-11-26 16:04:49Z fehr $
*/
{
@@ -684,21 +684,27 @@
{
list no_mountby_type = [ `loop ];
list mountby_id_path_type = [ `primary, `logical ];
+ map enab = $[];
+ boolean tmp = !contains( no_mountby_type, new["type"]:`primary );
+ enab[`label] = tmp && FileSystems::MountLabel( new["used_fs"]:`unknown ) &&
+ new["enc_type"]:`none==`none;
+ enab[`uuid] = tmp && (new["format"]:false || size(new["uuid"]:"")>0) &&
+ FileSystems::MountUuid( new["used_fs"]:`unknown );
+ tmp = contains(mountby_id_path_type, new["type"]:`none);
+ enab[`id] = tmp && size(new["udev_id"]:[])>0;
+ enab[`path] = tmp && size(new["udev_path"]:"")>0;
+ y2milestone( "FstabOptions enab %1", enab );
+ UI::ChangeWidget( `id(`label), `Enabled, enab[`label]:false );
+ UI::ChangeWidget( `id(`uuid), `Enabled, enab[`uuid]:false );
+ UI::ChangeWidget( `id(`id), `Enabled, enab[`id]:false );
+ UI::ChangeWidget( `id(`path), `Enabled, enab[`path]:false );
symbol defmb = !Mode::config() ? Storage::GetMountBy( new["device"]:"" )
: `device;
y2milestone( "FstabOptions defmb %1", defmb );
+ if( haskey( enab, defmb ) && !enab[defmb]:false )
+ defmb = `device;
UI::ChangeWidget( `id(`mt_group), `CurrentButton,
new["mountby"]:defmb );
- UI::ChangeWidget( `id(`label), `Enabled,
- FileSystems::MountLabel( new["used_fs"]:`unknown ) &&
- new["enc_type"]:`none==`none &&
- !contains( no_mountby_type, new["type"]:`primary ) );
- UI::ChangeWidget( `id(`uuid), `Enabled,
- (new["format"]:false || size(new["uuid"]:"")>0) &&
- FileSystems::MountUuid( new["used_fs"]:`unknown ) &&
- !contains( no_mountby_type, new["type"]:`primary ) );
- UI::ChangeWidget( `id(`id), `Enabled, contains(mountby_id_path_type, new["type"]:`none) );
- UI::ChangeWidget( `id(`path), `Enabled, contains(mountby_id_path_type, new["type"]:`none) );
}
if( UI::WidgetExists( `id(`vol_label) ))
@@ -717,12 +723,7 @@
if( UI::WidgetExists( `id("opt_user") ))
{
UI::ChangeWidget( `id("opt_user"), `Enabled,
- new["enc_type"]:`none==`none || new["noauto"]:false );
- }
- if( UI::WidgetExists( `id("opt_noauto") ))
- {
- UI::ChangeWidget( `id("opt_noauto"), `Enabled,
- new["enc_type"]:`none==`none || new["noauto"]:false );
+ new["enc_type"]:`none==`none );
}
if( UI::WidgetExists( `id("opt_quota") ))
{
@@ -739,15 +740,6 @@
{
ret = UI::UserInput();
y2milestone( "FstabOptions ret %1", ret );
- if( ret == "opt_noauto" )
- {
- if( UI::WidgetExists( `id("opt_user") ))
- {
- boolean val = (boolean)UI::QueryWidget( `id("opt_noauto" ), `Value );
- UI::ChangeWidget( `id("opt_user"), `Enabled,
- new["enc_type"]:`none==`none || val );
- }
- }
if( ret == `ok )
{
if( UI::WidgetExists( `id(`mt_group) ))
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.19/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.19.0/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.18.19/storage/src/include/custom_part_lib.ycp 2009-08-24 16:27:39.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/custom_part_lib.ycp 2009-11-17 10:29:54.000000000 +0100
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 58336 2009-08-13 12:05:21Z aschnell $
+ $Id: custom_part_lib.ycp 59576 2009-11-17 09:30:47Z aschnell $
*
*/
@@ -193,19 +193,18 @@
* @param mount mount point
* @return boolean
*/
-define boolean check_lvm_mount_points( string mount )
- ``{
- list not_allowed_lvm_mount_points = [ Partitions::BootMount() ];
- y2milestone( " check lvm mount");
- if( contains( not_allowed_lvm_mount_points, mount ))
+ boolean check_lvm_mount_points(string mount)
+ {
+ list<string> not_allowed_lvm_mount_points = [ Partitions::BootMount() ];
+ y2milestone("check lvm mount");
+ if (contains(not_allowed_lvm_mount_points, mount))
{
- // error popup text
- Popup::Error(sformat(_("You cannot use the mount point \"%1\" for LVM.\n"), Partitions::BootMount()));
-
+ // error popup text
+ Popup::Error(sformat(_("You cannot use the mount point \"%1\" for LVM.\n"), Partitions::BootMount()));
return false;
}
- return true;
- };
+ return true;
+ }
/**
@@ -213,25 +212,22 @@
* @param mount mount point
* @return boolean
**/
-define boolean check_raid_mount_points( string mount )
- ``{
- list not_allowed_raid_mount_points = [ ];
- if( Arch::ppc () || Arch::s390 () || Arch::sparc () )
- {
- not_allowed_raid_mount_points =
- add( not_allowed_raid_mount_points, Partitions::BootMount() );
- }
- y2milestone( " check raid mount");
- if( contains( not_allowed_raid_mount_points, mount ))
+ boolean check_raid_mount_points(string mount)
+ {
+ list<string> not_allowed_raid_mount_points = [];
+ if (Arch::ppc() || Arch::s390())
+ {
+ not_allowed_raid_mount_points = add(not_allowed_raid_mount_points, Partitions::BootMount());
+ }
+ y2milestone("check raid mount");
+ if (contains( not_allowed_raid_mount_points, mount))
{
- // error popup text
+ // error popup text
Popup::Error(sformat(_("You cannot use the mount point %1 for RAID."), Partitions::BootMount()));
-
return false;
}
return true;
- };
-
+ }
/**
@@ -335,19 +331,19 @@
* @param mount mount point
* @return boolean
**/
-define boolean check_mount_point( map targetMap, string dev,
- map part )
-{
+ boolean check_mount_point(map targetMap, string dev, map part)
+ {
string mount = part["mount"]:"";
symbol used_fs = part["used_fs"]:`unknown;
y2milestone( "check_mount_point part:%1", part );
boolean allowed = true;
- list not_allowed_system_mount_points =
- [ "/proc", "/dev", "/mnt", "/var/adm/mnt", "/lost+found", "/lib",
- "/bin", "/etc", "/sbin" ];
- if (mount == "")
+ list<string> not_allowed_system_mount_points = [ "/proc", "/sys",
+ "/dev", "/mnt", "/var/adm/mnt", "/lost+found", "/lib", "/lib64",
+ "/bin", "/etc", "/sbin" ];
+
+ if (isempty(mount))
{
Popup::Error(_("Mount point must not be empty."));
allowed = false;
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.19/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.19.0/storage/src/include/ep-dialogs.ycp
--- old/yast2-storage-2.18.19/storage/src/include/ep-dialogs.ycp 2009-09-29 13:43:59.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/ep-dialogs.ycp 2009-11-18 23:06:52.000000000 +0100
@@ -722,6 +722,7 @@
case `custom_size:
{
UI::ChangeWidget(`id(`custom_size_attachment), `Enabled, true);
+ UI::SetFocus(`id(`custom_size_input));
break;
}
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.19/storage/src/include/ep-dm-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-dm-lib.ycp
--- old/yast2-storage-2.18.19/storage/src/include/ep-dm-lib.ycp 2009-07-21 16:37:06.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/ep-dm-lib.ycp 2009-10-29 11:54:51.000000000 +0100
@@ -22,7 +22,7 @@
map target_map = Storage::GetTargetMap();
map data = Storage::GetPartition(target_map, device);
- if (!isempty(data["used_by_device"]:""))
+ if (!isempty(data["used_by"]:[]))
{
// error popup
Popup::Error(sformat(_("The DM %1 is in use. It cannot be
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.19/storage/src/include/ep-graph.ycp new/yast2-storage-2.19.0/storage/src/include/ep-graph.ycp
--- old/yast2-storage-2.18.19/storage/src/include/ep-graph.ycp 2009-07-21 16:37:06.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/ep-graph.ycp 2009-11-20 17:59:52.000000000 +0100
@@ -10,7 +10,7 @@
textdomain "storage";
- void EpContextMenuGraph()
+ void EpContextMenuDeviceGraph()
{
symbol widget = ContextMenu::Simple([ `item(`id(`add_raid), `icon(StorageIcons::raid_icon), _("Add RAID")),
`item(`id(`add_lvmvg), `icon(StorageIcons::lvm_icon), _("Add Volume Group")) ]);
@@ -28,21 +28,21 @@
}
- void CreateGraphPanel(any user_data)
+ void CreateDeviceGraphPanel(any user_data)
{
- string filename = Directory::tmpdir + "/storage.gv";
- Storage::SaveGraph(filename);
+ string filename = Directory::tmpdir + "/device.gv";
+ Storage::SaveDeviceGraph(filename);
UI::ReplaceWidget(`tree_panel,
Greasemonkey::Transform(
`VBox(
// dialog heading, graph is the mathematic term for
// a set of notes connected with edges
- `IconAndHeading(_("Graph"), StorageIcons::graph_icon),
+ `IconAndHeading(_("Device Graph"), StorageIcons::graph_icon),
`Graph(`id(`graph), `opt(`notify, `notifyContextMenu), filename, "dot"),
`HBox(
// button text
- `PushButton(`id(`export), _("Export Graph...")),
+ `PushButton(`id(`export), _("Export Device Graph...")),
`HStretch()
)
))
@@ -51,22 +51,22 @@
SCR::Execute(.target.remove, filename);
// helptext
- string helptext = _("<p>This view shows a graph.</p>");
+ string helptext = _("<p>This view shows a graph of devices.</p>");
Wizard::RestoreHelp(helptext);
}
- void RefreshGraphPanel(any user_data)
+ void RefreshDeviceGraphPanel(any user_data)
{
- string filename = Directory::tmpdir + "/storage.gv";
- Storage::SaveGraph(filename);
+ string filename = Directory::tmpdir + "/device.gv";
+ Storage::SaveDeviceGraph(filename);
UI::ChangeWidget(`id(`graph), `Filename, filename);
}
- void HandleGraphPanel(any user_data, map event)
+ void HandleDeviceGraphPanel(any user_data, map event)
{
void GotoDevice(string device)
{
@@ -81,7 +81,7 @@
string node = (string) UI::QueryWidget(`id(`graph), `Item);
if (isempty(node))
- EpContextMenuGraph();
+ EpContextMenuDeviceGraph();
else if (String::StartsWith(node, "device:"))
EpContextMenuDevice(substring(node, 7));
@@ -108,7 +108,7 @@
string filename = UI::AskForSaveFileName("/tmp", "*.gv", "Save as...");
if (filename != nil)
{
- if (!Storage::SaveGraph(filename))
+ if (!Storage::SaveDeviceGraph(filename))
{
// error popup
Popup::Error(_("Saving graph file failed."));
@@ -118,4 +118,79 @@
break;
}
}
+
+
+ void CreateMountGraphPanel(any user_data)
+ {
+ string filename = Directory::tmpdir + "/mount.gv";
+ Storage::SaveMountGraph(filename);
+
+ UI::ReplaceWidget(`tree_panel,
+ Greasemonkey::Transform(
+ `VBox(
+ // dialog heading, graph is the mathematic term for
+ // a set of notes connected with edges
+ `IconAndHeading(_("Mount Graph"), StorageIcons::graph_icon),
+ `Graph(`id(`graph), `opt(`notify, `notifyContextMenu), filename, "dot"),
+ `HBox(
+ // button text
+ `PushButton(`id(`export), _("Export Mount Graph...")),
+ `HStretch()
+ )
+ ))
+ );
+
+ SCR::Execute(.target.remove, filename);
+
+ // helptext
+ string helptext = _("<p>This view shows a graph of mount points.</p>");
+
+ Wizard::RestoreHelp(helptext);
+ }
+
+
+ void RefreshMountGraphPanel(any user_data)
+ {
+ string filename = Directory::tmpdir + "/mount.gv";
+ Storage::SaveMountGraph(filename);
+
+ UI::ChangeWidget(`id(`graph), `Filename, filename);
+ }
+
+
+ void HandleMountGraphPanel(any user_data, map event)
+ {
+ void GotoDevice(string device)
+ {
+ TreePanel::SwitchToNew(device);
+ UI::SetFocus(UI::WidgetExists(`id(`table)) ? `id(`table) : `id(`text));
+ }
+
+ switch (Event::IsWidgetActivated(event))
+ {
+ case `graph:
+ {
+ string node = (string) UI::QueryWidget(`id(`graph), `Item);
+
+ if (String::StartsWith(node, "mountpoint:"))
+ GotoDevice(substring(node, 11));
+ }
+ break;
+
+ case `export:
+ {
+ string filename = UI::AskForSaveFileName("/tmp", "*.gv", "Save as...");
+ if (filename != nil)
+ {
+ if (!Storage::SaveMountGraph(filename))
+ {
+ // error popup
+ Popup::Error(_("Saving graph file failed."));
+ }
+ }
+ }
+ break;
+ }
+ }
+
}
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.19/storage/src/include/ep-hd-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-hd-lib.ycp
--- old/yast2-storage-2.18.19/storage/src/include/ep-hd-lib.ycp 2009-07-31 12:49:04.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/ep-hd-lib.ycp 2009-10-29 11:43:46.000000000 +0100
@@ -22,7 +22,7 @@
map target_map = Storage::GetTargetMap();
map disk = target_map[disk_device]:$[];
- if (!isempty(disk["used_by_device"]:""))
+ if (!isempty(disk["used_by"]:[]))
{
// error popup
Popup::Error(_("The disk is in use and cannot be modified."));
@@ -184,7 +184,7 @@
map target_map = Storage::GetTargetMap();
map disk = target_map[disk_device]:$[];
- if (!isempty(disk["used_by_device"]:""))
+ if (!isempty(disk["used_by"]:[]))
{
// error popup
Popup::Error(_("The disk is in use and cannot be modified."));
@@ -243,7 +243,7 @@
if (!Storage::CanEdit(part, true))
return;
- if (!isempty(part["used_by_device"]:""))
+ if (!isempty(part["used_by"]:[]))
{
// 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
@@ -289,7 +289,7 @@
return;
}
- if (!isempty(part["used_by_device"]:""))
+ if (!isempty(part["used_by"]:[]))
{
// 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
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.19/storage/src/include/ep-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-lib.ycp
--- old/yast2-storage-2.18.19/storage/src/include/ep-lib.ycp 2009-09-29 17:07:44.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/ep-lib.ycp 2009-10-29 11:56:07.000000000 +0100
@@ -318,7 +318,7 @@
map target_map = Storage::GetTargetMap();
map disk = Storage::GetDisk(target_map, device);
- if (disk["used_by_type"]:`UB_NONE != `UB_NONE)
+ if (!isempty(disk["used_by"]:[]))
return `Empty();
list <integer> bits = [];
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.19/storage/src/include/ep-loop-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-loop-lib.ycp
--- old/yast2-storage-2.18.19/storage/src/include/ep-loop-lib.ycp 2009-07-21 16:37:06.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/ep-loop-lib.ycp 2009-10-29 11:55:09.000000000 +0100
@@ -45,7 +45,7 @@
map target_map = Storage::GetTargetMap();
map data = Storage::GetPartition(target_map, device);
- if (!isempty(data["used_by_device"]:""))
+ if (!isempty(data["used_by"]:[]))
{
// error popup, %1 is replaced by device name
Popup::Error(sformat(_("The Crypt File %1 is in use. It cannot be
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.19/storage/src/include/ep-lvm-dialogs.ycp new/yast2-storage-2.19.0/storage/src/include/ep-lvm-dialogs.ycp
--- old/yast2-storage-2.18.19/storage/src/include/ep-lvm-dialogs.ycp 2009-08-19 14:26:55.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/ep-lvm-dialogs.ycp 2009-11-17 12:21:20.000000000 +0100
@@ -75,6 +75,7 @@
return ret;
}
+
boolean ConfirmVgDelete( string vgname, list <string> log_volumes )
{
return ConfirmRecursiveDelete( vgname, log_volumes,
@@ -90,6 +91,7 @@
}
+
boolean CheckPeSize(integer pe_size)
{
if (!Integer::IsPowerOfTwo(pe_size) || pe_size < 1024)
@@ -225,6 +227,7 @@
MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepVgHelptext());
MiniWorkflow::SetLastStep(true);
+ UI::SetFocus(`id(`vgname));
symbol widget = nil;
@@ -449,6 +452,7 @@
case `manual_size:
UI::ChangeWidget(`id(`manual_size_attachment), `Enabled, true);
+ UI::SetFocus(`id(`size_input));
break;
case `stripes:
@@ -551,6 +555,7 @@
MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepLvNameHelptext());
MiniWorkflow::SetLastStep(false);
+ UI::SetFocus(`id(`lvname));
symbol widget = nil;
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.19/storage/src/include/ep-main.ycp new/yast2-storage-2.19.0/storage/src/include/ep-main.ycp
--- old/yast2-storage-2.18.19/storage/src/include/ep-main.ycp 2009-09-29 17:07:53.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/ep-main.ycp 2009-11-19 17:54:01.000000000 +0100
@@ -101,7 +101,8 @@
`dm : $[ `create : CreateDmMainPanel, `handle : HandleDmMainPanel ],
`nfs : $[ `create : CreateNfsMainPanel, `handle : HandleNfsMainPanel ],
`unused : $[ `create : CreateUnusedPanel, `handle : HandleUnusedPanel ],
- `graph : $[ `create : CreateGraphPanel, `refresh : RefreshGraphPanel, `handle : HandleGraphPanel ],
+ `devicegraph : $[ `create : CreateDeviceGraphPanel, `refresh : RefreshDeviceGraphPanel, `handle : HandleDeviceGraphPanel ],
+ `mountgraph : $[ `create : CreateMountGraphPanel, `refresh : RefreshDeviceGraphPanel, `handle : HandleMountGraphPanel ],
`summary : $[ `create : CreateSummaryPanel ],
`settings : $[ `create : CreateSettingsPanel, `handle : HandleSettingsPanel, `destroy : DestroySettingsPanel ],
`log : $[ `create : CreateLogPanel, `handle : HandleLogPanel, `destroy : DestroyLogPanel ] ];
@@ -203,8 +204,13 @@
];
if (UI::HasSpecialWidget(`Graph))
+ {
+ // tree node label
+ tree = add(tree, `item(`id(`devicegraph), `icon(StorageIcons::graph_icon), _("Device Graph"), open(`devicegraph)));
// tree node label
- tree = add(tree, `item(`id(`graph), `icon(StorageIcons::graph_icon), _("Graph"), open(`graph)));
+ tree = add(tree, `item(`id(`mountgraph), `icon(StorageIcons::graph_icon), _("Mount Graph"), open(`mountgraph)));
+ }
+
// tree node label
tree = add(tree, `item(`id(`summary), `icon(StorageIcons::summary_icon), _("Installation Summary"), open(`summary)));
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.19/storage/src/include/ep-raid-lib.ycp new/yast2-storage-2.19.0/storage/src/include/ep-raid-lib.ycp
--- old/yast2-storage-2.18.19/storage/src/include/ep-raid-lib.ycp 2009-07-21 16:37:06.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/include/ep-raid-lib.ycp 2009-10-29 11:44:23.000000000 +0100
@@ -99,7 +99,7 @@
map target_map = Storage::GetTargetMap();
map data = Storage::GetPartition(target_map, device);
- if (!isempty(data["used_by_device"]:""))
+ if (!isempty(data["used_by"]:[]))
{
// error popup, %1 is replaced by device name e.g. /dev/md1
Popup::Error(sformat(_("The RAID %1 is in use. It cannot be
@@ -139,7 +139,7 @@
return;
}
- if (!isempty(data["used_by_device"]:""))
+ if (!isempty(data["used_by"]:[]))
{
// error popup, %1 is replaced by device name e.g. /dev/md1
Popup::Error(sformat(_("The RAID %1 is in use. It cannot be
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.19/storage/src/inst_disk_proposal.ycp new/yast2-storage-2.19.0/storage/src/inst_disk_proposal.ycp
--- old/yast2-storage-2.18.19/storage/src/inst_disk_proposal.ycp 2009-07-27 17:40:50.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/inst_disk_proposal.ycp 2009-11-16 14:13:33.000000000 +0100
@@ -68,7 +68,7 @@
];
map seq = $[];
seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next: `next ];
- if( Arch::s390() || Mode::autoinst() )
+ if (Mode::autoinst())
{
Storage::SetPartMode("PROP_MODIFY");
seq["ws_start"] = "disk";
@@ -114,11 +114,6 @@
}
-if( Arch::s390() )
- {
- return Storage::GetExitKey();
- }
-
// Title for dialogue
string title = _("Suggested Partitioning");
// Radiobutton for partition dialog
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.19/storage/src/inst_target_selection.ycp new/yast2-storage-2.19.0/storage/src/inst_target_selection.ycp
--- old/yast2-storage-2.18.19/storage/src/inst_target_selection.ycp 2009-07-21 16:37:07.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/inst_target_selection.ycp 2009-11-19 10:35:47.000000000 +0100
@@ -12,7 +12,7 @@
* "target_is":<devicename> (key to "targets" map)
* if custom, set "target_is":"CUSTOM"
*
- * $Id: inst_target_selection.ycp 54125 2008-12-15 13:23:57Z aschnell $
+ * $Id: inst_target_selection.ycp 59611 2009-11-19 09:36:39Z aschnell $
*/
{
textdomain "storage";
@@ -88,6 +88,8 @@
integer i = 1;
foreach(string tname, map tdata, usable_target_map, {
string tlinename = tdata["name"]:"?";
+ if (haskey(tdata, "name"))
+ tlinename = tdata["proposal_name"]:"?";
if( tdata["type"]:`CT_UNKNOWN==`CT_DMRAID )
tlinename = "BIOS RAID " + tdata["name"]:"?";
string tline = "&" + i + ": " + tlinename;
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.19/storage/src/modules/StorageFields.ycp new/yast2-storage-2.19.0/storage/src/modules/StorageFields.ycp
--- old/yast2-storage-2.18.19/storage/src/modules/StorageFields.ycp 2009-08-14 12:46:48.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/modules/StorageFields.ycp 2009-10-29 14:30:07.000000000 +0100
@@ -29,12 +29,12 @@
global void IterateTargetMap(map target_map, void(map, map) callback)
{
const map disk_order = $[ `CT_DMRAID : 0, `CT_DMMULTIPATH : 1, `CT_DISK : 2,
- `CT_MD : 3, `CT_LOOP : 4, `CT_LVM : 5, `CT_DM : 6, `CT_NFS : 8 ];
+ `CT_MD : 3, `CT_LOOP : 4, `CT_LVM : 5, `CT_DM : 6, `CT_NFS : 7 ];
list<string> keys = maplist(string dev, map disk, target_map, { return dev; });
keys = sort(string a, string b, keys, {
- integer oa = disk_order[target_map[a,"type"]:`CT_UNKNOWN]:8;
- integer ob = disk_order[target_map[b,"type"]:`CT_UNKNOWN]:8;
+ integer oa = disk_order[target_map[a, "type"]:`CT_UNKNOWN]:8;
+ integer ob = disk_order[target_map[b, "type"]:`CT_UNKNOWN]:8;
return (oa==ob) ? (a used_by)
{
- switch (used_by_type)
+ symbol type = used_by["type"]:`UB_NONE;
+ string device = used_by["device"]:"";
+
+ switch (type)
{
case `UB_LVM:
- return "LVM " + used_by_device;
+ return "LVM " + device;
case `UB_DM:
- return "DM " + used_by_device;
+ return "DM " + device;
case `UB_DMRAID:
- return "DM RAID " + used_by_device;
+ return "DM RAID " + device;
case `UB_DMMULTIPATH:
- return "DM Multipath " + used_by_device;
+ return "DM Multipath " + device;
case `UB_MD:
- return "RAID " + used_by_device;
+ return "RAID " + device;
default:
- return used_by_device;
+ return device;
}
}
@@ -622,12 +625,16 @@
case `used_by:
{
- string value = UsedByString(data["used_by_type"]:`UB_NONE, data["used_by_device"]:"");
if (style == `table)
- return value;
+ return UsedByString(data["used_by", 0]:$[]);
else
- // row label, %1 is replace by used by device name e.g. /dev/system
- return sformat(_("Used By: %1"), String::EscapeTags(value));
+ {
+ integer n = size(data["used_by"]:[]);
+ return mergestring(maplist(integer i, Integer::Range(n == 0 ? 1 : n), {
+ // row label, %1 is replaced by number, %2 is replace by device name e.g. /dev/system
+ return sformat(_("Used By %1: %2"), i+1, String::EscapeTags(UsedByString(data["used_by", i]:$[])));
+ }), HTML::Newline());
+ }
}
case `uuid:
@@ -1048,14 +1055,14 @@
{
if (partition == nil)
{
- if (contains(devices, disk["used_by_device"]:""))
+ if (find(map used_by, disk["used_by"]:[], { return contains(devices, used_by["device"]:""); }) != nil)
return `showandfollow;
else
return `follow;
}
else
{
- if (contains(devices, partition["used_by_device"]:""))
+ if (find(map used_by, partition["used_by"]:[], { return contains(devices, used_by["device"]:""); }) != nil)
return `show;
else
return `ignore;
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.19/storage/src/modules/StorageProposal.ycp new/yast2-storage-2.19.0/storage/src/modules/StorageProposal.ycp
--- old/yast2-storage-2.18.19/storage/src/modules/StorageProposal.ycp 2009-10-06 12:26:16.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/modules/StorageProposal.ycp 2009-11-16 14:13:22.000000000 +0100
@@ -287,8 +287,7 @@
boolean ignore_disk(string dev, map entry, boolean soft)
{
- boolean ret = !Storage::IsPartitionable( entry ) ||
- entry["readonly"]:false || Arch::s390();
+ boolean ret = !Storage::IsPartitionable(entry) || entry["readonly"]:false;
// GPT is not required for uEFI on x86_64
if( !ret && Arch::ia64() && entry["label"]:"gpt"!="gpt" )
{
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.19/storage/src/modules/StorageSettings.ycp new/yast2-storage-2.19.0/storage/src/modules/StorageSettings.ycp
--- old/yast2-storage-2.18.19/storage/src/modules/StorageSettings.ycp 2009-07-29 15:22:42.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/modules/StorageSettings.ycp 2009-11-27 17:09:22.000000000 +0100
@@ -34,6 +34,7 @@
modified = true;
}
+
global void SetDisplayName(symbol new_display_name)
{
display_name = new_display_name;
@@ -68,12 +69,8 @@
break;
}
- if (ret == "")
- ret = data["device"]:"";
-
- integer pos = findlastof(ret, "/");
- if (pos != nil)
- ret = substring(ret, pos + 1);
+ if (isempty(ret))
+ ret = data["name"]:"";
return ret;
}
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.19/storage/src/modules/StorageUpdate.ycp new/yast2-storage-2.19.0/storage/src/modules/StorageUpdate.ycp
--- old/yast2-storage-2.18.19/storage/src/modules/StorageUpdate.ycp 2009-08-19 12:47:15.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/modules/StorageUpdate.ycp 2009-11-27 15:25:57.000000000 +0100
@@ -383,6 +383,10 @@
string cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto";
map bo = (map)SCR::Execute (.target.bash_output, cmd );
y2milestone( "Update bo %1", bo );
+
+ cmd = "cd / && /sbin/insserv /etc/init.d/boot.crypto-early";
+ 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;
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.19/storage/src/modules/Storage.ycp new/yast2-storage-2.19.0/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.18.19/storage/src/modules/Storage.ycp 2009-10-06 12:27:23.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/modules/Storage.ycp 2009-11-27 17:09:54.000000000 +0100
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 58951 2009-10-06 10:27:39Z aschnell $
+ * $Id: Storage.ycp 59833 2009-11-27 16:10:46Z aschnell $
*/
{
module "Storage";
@@ -1202,6 +1202,8 @@
{
p["used_by_type"] = toSymbol( conv_usedby, t );
p["used_by_device"] = LibStorage::VolumeInfo::swig_usedByDevice_get(vinfo);
+ p["used_by"] = [ $[ "type" : p["used_by_type"]:`UB_NONE,
+ "device" : p["used_by_device"]:"" ] ];
}
tmp = LibStorage::VolumeInfo::swig_fstab_options_get(vinfo);
if( size(tmp)>0 )
@@ -1530,9 +1532,9 @@
map toDiskMap( map disk, map cinfo )
{
- list<string> l = [ "size_k", "cyl_size", "cyl_count", "label",
+ list<string> l = [ "size_k", "cyl_size", "cyl_count", "label", "name", "device",
"max_logical", "max_primary", "type", "readonly",
- "used_by_type", "used_by_device", "partitions", "dasdfmt",
+ "used_by", "used_by_type", "used_by_device", "partitions", "dasdfmt",
"udev_id", "udev_path" ];
foreach( string s, l,
``{
@@ -1561,6 +1563,8 @@
{
c["used_by_type"] = toSymbol( conv_usedby, t );
c["used_by_device"] = LibStorage::ContainerInfo::swig_usedByDevice_get(info);
+ c["used_by"] = [ $[ "type" : c["used_by_type"]:`UB_NONE,
+ "device" : c["used_by_device"]:"" ] ];
}
boolean b = LibStorage::ContainerInfo::swig_readonly_get(info);
if( b )
@@ -3123,12 +3127,13 @@
``{
disk = getDiskInfo( dev, disk );
integer s = disk["size_k"]:0 * 1024;
- disk["name"] = disk["dname"]:"" +
+ string proposal_name = disk["dname"]:"" +
Storage::ByteToHumanString( s ) + ", " +
disk["device"]:"" + ", ";
if( size( disk["vendor"]:"")>0 )
- disk["name"] = disk["name"]:"" + disk["vendor"]:"" + "-";
- disk["name"] = disk["name"]:"" + disk["model"]:"";
+ proposal_name = proposal_name + disk["vendor"]:"" + "-";
+ proposal_name = proposal_name + disk["model"]:"";
+ disk["proposal_name"] = proposal_name;
if( haskey( disk, "dname" ))
disk = remove( disk, "dname" );
tmp[dev] = disk;
@@ -3516,7 +3521,9 @@
ret["used_fs"] = Partitions::DefaultFs();
}
if( ret["used_fs"]:`unknown == `unknown ||
- ret["used_fs"]:`unknown == `none )
+ ret["used_fs"]:`unknown == `none ||
+ ret["used_fs"]:`unknown == `hfs ||
+ ret["used_fs"]:`unknown == `hfsplus )
ret["format"] = false;
else
ret["format"] = true;
@@ -4802,7 +4809,11 @@
need_crypt, need_md, need_lvm, need_dmraid, need_dmmultipath );
if( need_crypt )
+ {
CallInsserv( true, "boot.crypto" );
+ CallInsserv( true, "boot.crypto-early" );
+ }
+
CallInsserv( need_md, "boot.md" );
CallInsserv( need_lvm, "boot.lvm" );
CallInsserv( need_dmraid, "boot.dmraid" );
@@ -5260,10 +5271,18 @@
}
-global boolean SaveGraph(string filename)
+global boolean SaveDeviceGraph(string filename)
+{
+ boolean ret = LibStorage::saveDeviceGraph(sint, filename);
+ y2milestone("SaveDeviceGraph filename:%1 ret:%2", filename, ret);
+ return ret;
+}
+
+
+global boolean SaveMountGraph(string filename)
{
- boolean ret = LibStorage::saveGraph(sint, filename);
- y2milestone("SaveGraph filename:%1 ret:%2", filename, ret);
+ boolean ret = LibStorage::saveMountGraph(sint, filename);
+ y2milestone("SaveMountGraph filename:%1 ret:%2", filename, ret);
return ret;
}
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.19/storage/src/proposal/partitions_proposal.ycp new/yast2-storage-2.19.0/storage/src/proposal/partitions_proposal.ycp
--- old/yast2-storage-2.18.19/storage/src/proposal/partitions_proposal.ycp 2009-07-21 16:37:05.000000000 +0200
+++ new/yast2-storage-2.19.0/storage/src/proposal/partitions_proposal.ycp 2009-11-03 16:52:17.000000000 +0100
@@ -1,7 +1,7 @@
/**
* Module: proposal_partitions.ycp
*
- * $Id: partitions_proposal.ycp 55587 2009-02-18 14:15:43Z aschnell $
+ * $Id: partitions_proposal.ycp 59267 2009-11-02 10:58:59Z jsrain $
*
* Author: Klaus Kaempf
*
@@ -25,6 +25,25 @@
y2milestone( "func:%1 param:%2", func, param );
+ // check if /home partition keeps unformatted in order to warn for
+ // possible incorrectly set file ownership (fate#306325)
+ boolean home_not_formatted() {
+ map tm = Storage::GetTargetMap();
+ boolean ret = false;
+ foreach (string disk, map info, tm, {
+ list<map> partitions = info["partitions"]:[];
+ foreach (map p, partitions, {
+ if (p["mount"]:"" == "/home" && ! p["format"]:false)
+ {
+ y2milestone ("The /home partition will not be formatted.");
+ ret = true;
+ break;
+ }
+ });
+ });
+ return ret;
+ }
+
if( func == "MakeProposal" && Mode::autoinst() )
{
ret["preformatted_proposal"] = Storage::ChangeText();
@@ -65,6 +84,17 @@
!Storage::GetPartProposalActive() )
{
ret["preformatted_proposal"] = Storage::ChangeText();
+ // detect non-formated /home together with remote authentication - Fate#306325
+ if (home_not_formatted())
+ {
+ import "UsersSimple";
+ if (UsersSimple::AfterAuth() != "users")
+ {
+ ret["warning"] = _("The /home partition will not be formatted. After installation,
+ensure that the permissions to home directories are set properly.");
+ ret["warning_level"] = `warning;
+ }
+ }
}
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.19/VERSION new/yast2-storage-2.19.0/VERSION
--- old/yast2-storage-2.18.19/VERSION 2009-10-05 17:50:51.000000000 +0200
+++ new/yast2-storage-2.19.0/VERSION 2009-10-29 11:59:13.000000000 +0100
@@ -1 +1 @@
-2.18.19
+2.19.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org