Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Nov 20 16:49:29 CET 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-11-18 00:13:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2008-11-20 15:42:45.638471000 +0100
@@ -1,0 +2,6 @@
+Tue Nov 18 18:14:42 CET 2008 - aschnell@suse.de
+
+- fixed use of existing encrypted devices (bnc #435244)
+- 2.17.52
+
+-------------------------------------------------------------------
@@ -4854,0 +4861 @@
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-storage-2.17.51.tar.bz2
New:
----
yast2-storage-2.17.52.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.G30616/_old 2008-11-20 16:49:00.000000000 +0100
+++ /var/tmp/diff_new_pack.G30616/_new 2008-11-20 16:49:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.17.51)
+# spec file for package yast2-storage (Version 2.17.52)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-storage
-Version: 2.17.51
+Version: 2.17.52
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.17.51.tar.bz2
+Source0: yast2-storage-2.17.52.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel boost-devel docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer sablot sgml-skel swig update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: parted yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools kpartx cryptsetup
@@ -57,7 +57,7 @@
Arvin Schnell
%prep
-%setup -n yast2-storage-2.17.51
+%setup -n yast2-storage-2.17.52
%build
%{prefix}/bin/y2tool y2autoconf
@@ -181,8 +181,10 @@
%doc %{prefix}/share/doc/packages/yast2-storage/examples
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
-
%changelog
+* Tue Nov 18 2008 aschnell@suse.de
+- fixed use of existing encrypted devices (bnc #435244)
+- 2.17.52
* Mon Nov 17 2008 aschnell@suse.de
- always check uniqueness of volume label (bnc #441411)
- 2.17.51
++++++ yast2-storage-2.17.51.tar.bz2 -> yast2-storage-2.17.52.tar.bz2 ++++++
++++ 3758 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.17.51/agents-scr/Makefile.am new/yast2-storage-2.17.52/agents-scr/Makefile.am
--- old/yast2-storage-2.17.51/agents-scr/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/agents-scr/Makefile.am 2008-11-19 18:08:18.000000000 +0100
@@ -1,7 +1,5 @@
#
-# Makefile.am for storage/agents
-#
-# $Id: Makefile.am 46061 2008-04-03 17:47:58Z aschnell $
+# Makefile.am for storage/agents-scr
#
scrconf_DATA = etc_cryptotab.scr \
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.17.51/configure.in new/yast2-storage-2.17.52/configure.in
--- old/yast2-storage-2.17.51/configure.in 2008-11-17 18:01:25.000000000 +0100
+++ new/yast2-storage-2.17.52/configure.in 2008-11-20 15:30:49.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.17.51, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.17.52, 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.17.51"
+VERSION="2.17.52"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -203,8 +203,6 @@
AC_CONFIG_FILES(Makefile agents-scr/Makefile
data/Makefile
-disk/doc/autodocs/Makefile
-disk/doc/Makefile
disk/src/Makefile
disk/Makefile
libstorage/doc/autodocs/Makefile
@@ -221,6 +219,8 @@
libstorage/testsuite-real/Makefile
libstorage/examples/Makefile
libstorage/Makefile
+multipath-simple/src/Makefile
+multipath-simple/Makefile
scripts/Makefile
storage/data/Makefile
storage/doc/autodocs/Makefile
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.17.51/disk/doc/autodocs/Makefile.am new/yast2-storage-2.17.52/disk/doc/autodocs/Makefile.am
--- old/yast2-storage-2.17.51/disk/doc/autodocs/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/disk/doc/autodocs/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-# Makefile.am for YCP module .../doc/autodocs
-
-htmldir = @docdir@/autodocs
-
-html_DATA = index.html $(wildcard *.html)
-CLEANFILES = $(html_DATA)
-
-index.html: $(srcdir)/../../src/*.ycp
- @ybindir@/ycpdoc -d. $(srcdir)/../../src/*.ycp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.17.51/disk/doc/Makefile.am new/yast2-storage-2.17.52/disk/doc/Makefile.am
--- old/yast2-storage-2.17.51/disk/doc/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/disk/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-#
-# Makefile.am for y2c_disk/doc
-#
-
-SUBDIRS = autodocs
-
-htmldir = $(docdir)
-
-html_DATA =
-EXTRA_DIST = $(html_DATA)
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.17.51/disk/Makefile.am new/yast2-storage-2.17.52/disk/Makefile.am
--- old/yast2-storage-2.17.51/disk/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/disk/Makefile.am 2008-11-19 18:36:36.000000000 +0100
@@ -1,3 +1,5 @@
#
# Makefile.am for storage/disk
-SUBDIRS = doc src
+#
+
+SUBDIRS = src
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.17.51/disk/src/Makefile.am new/yast2-storage-2.17.52/disk/src/Makefile.am
--- old/yast2-storage-2.17.51/disk/src/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/disk/src/Makefile.am 2008-11-19 17:37:24.000000000 +0100
@@ -1,11 +1,9 @@
#
# Makefile.am for storage/disk/src
#
-# $Id: Makefile.am 36906 2007-03-13 08:58:19Z fehr $
-#
-client_DATA = \
- disk.ycp \
+client_DATA = \
+ disk.ycp \
disk_worker.ycp
desktop_DATA = disk.desktop
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.17.51/libstorage/bindings/Makefile.am new/yast2-storage-2.17.52/libstorage/bindings/Makefile.am
--- old/yast2-storage-2.17.51/libstorage/bindings/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/libstorage/bindings/Makefile.am 2008-11-19 17:55:41.000000000 +0100
@@ -3,4 +3,3 @@
#
SUBDIRS = ycp
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.17.51/libstorage/bindings/ycp/Makefile.am new/yast2-storage-2.17.52/libstorage/bindings/ycp/Makefile.am
--- old/yast2-storage-2.17.51/libstorage/bindings/ycp/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/libstorage/bindings/ycp/Makefile.am 2008-11-19 17:55:41.000000000 +0100
@@ -9,4 +9,3 @@
include $(top_srcdir)/pluglib-bindings.ami
EXTRA_DIST = LibStorage.i example.ycp
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.17.51/libstorage/doc/Makefile.am new/yast2-storage-2.17.52/libstorage/doc/Makefile.am
--- old/yast2-storage-2.17.51/libstorage/doc/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/libstorage/doc/Makefile.am 2008-11-19 17:55:41.000000000 +0100
@@ -3,4 +3,3 @@
#
SUBDIRS = autodocs
-
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.17.51/libstorage/Makefile.am new/yast2-storage-2.17.52/libstorage/Makefile.am
--- old/yast2-storage-2.17.51/libstorage/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/libstorage/Makefile.am 2008-11-19 17:55:41.000000000 +0100
@@ -3,4 +3,3 @@
#
SUBDIRS = doc src bindings testsuite testsuite-real examples
-
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.17.51/libstorage/src/Storage.cc new/yast2-storage-2.17.52/libstorage/src/Storage.cc
--- old/yast2-storage-2.17.51/libstorage/src/Storage.cc 2008-11-13 13:16:54.000000000 +0100
+++ new/yast2-storage-2.17.52/libstorage/src/Storage.cc 2008-11-18 12:08:45.000000000 +0100
@@ -5455,24 +5455,24 @@
}
if( ret && vol->getFs()==NTFS )
{
- SystemCmd c( "ntfsresize -f -i " + quote(device));
+ SystemCmd c("/usr/sbin/ntfsresize -f -i " + quote(device));
string fstr = " might resize at ";
string::size_type pos;
if( c.retcode()==0 &&
(pos=c.getString()->find( fstr ))!=string::npos )
{
- y2milestone( "pos %zd", pos );
+ y2mil("pos:" << pos);
pos = c.getString()->find_first_not_of( " \t\n", pos+fstr.size());
- y2milestone( "pos %zd", pos );
+ y2mil("pos:" << pos);
string number = c.getString()->substr( pos,
c.getString()->find_first_not_of( "0123456789", pos ));
- y2milestone( "number \"%s\"", number.c_str() );
+ y2mil("number:\"" << number << "\"");
unsigned long long t;
number >> t;
- y2milestone( "number %llu", t );
+ y2mil("number:" << t);
if( t-vol->sizeK()sizeK();
- y2milestone( "resize_free %llu", t );
+ y2mil("resize_free:" << t);
}
else
ret = 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.17.51/libstorage/testsuite/data/Makefile.am new/yast2-storage-2.17.52/libstorage/testsuite/data/Makefile.am
--- old/yast2-storage-2.17.51/libstorage/testsuite/data/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/libstorage/testsuite/data/Makefile.am 2008-11-19 17:55:41.000000000 +0100
@@ -3,4 +3,3 @@
#
EXTRA_DIST = disk_hda disk_hdb disk_sda disk_sdb volume_info
-
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.17.51/libstorage/testsuite/humanstring1.cc new/yast2-storage-2.17.52/libstorage/testsuite/humanstring1.cc
--- old/yast2-storage-2.17.51/libstorage/testsuite/humanstring1.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.17.52/libstorage/testsuite/humanstring1.cc 2008-11-20 15:00:03.000000000 +0100
@@ -0,0 +1,42 @@
+
+#include <iostream>
+#include <locale>
+
+#include
+
+using namespace std;
+using namespace storage;
+
+
+// Don't bother setting up locale for gettext since we don't have translations
+// during package build.
+
+
+StorageInterface* s = 0;
+
+
+void
+test(const char* loc, unsigned long long size, bool classic,
+ int precision, bool omit_zeroes)
+{
+ locale::global(locale(loc));
+ cout << s->byteToHumanString(size, classic, precision, omit_zeroes) << endl;
+}
+
+
+int
+main()
+{
+ s = createStorageInterface(true, true, false);
+
+ test("en_GB.UTF-8", 1024, true, 2, true);
+ test("en_GB.UTF-8", 1024, true, 2, false);
+
+ test("de_DE.UTF-8", 123456789, true, 4, false);
+ test("de_DE.UTF-8", 123456789, false, 4, false);
+
+ test("fr_FR.UTF-8", 123456789, true, 4, false);
+ test("fr_FR.UTF-8", 123456789, false, 4, false);
+
+ delete s;
+}
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.17.51/libstorage/testsuite/humanstring2.cc new/yast2-storage-2.17.52/libstorage/testsuite/humanstring2.cc
--- old/yast2-storage-2.17.51/libstorage/testsuite/humanstring2.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.17.52/libstorage/testsuite/humanstring2.cc 2008-11-20 15:29:09.000000000 +0100
@@ -0,0 +1,62 @@
+
+#include <iostream>
+#include <locale>
+
+#include
+
+using namespace std;
+using namespace storage;
+
+
+// Don't bother setting up locale for gettext since we don't have translations
+// during package build.
+
+
+StorageInterface* s = 0;
+
+
+void
+test(const char* loc, const char* str, bool classic)
+{
+ locale::global(locale(loc));
+
+ unsigned long long size = 0;
+
+ if (s->humanStringToByte(str, classic, size))
+ cout << "parse ok " << size << endl;
+ else
+ cout << "parse error" << endl;
+}
+
+
+int
+main()
+{
+ s = createStorageInterface(true, true, false);
+
+ test("en_GB.UTF-8", "42", true);
+ test("en_GB.UTF-8", "42B", true);
+ test("en_GB.UTF-8", "42 B", true);
+
+ test("en_GB.UTF-8", "42", false);
+ test("en_GB.UTF-8", "42B", false);
+ test("en_GB.UTF-8", "42 B", false);
+
+ test("en_GB.UTF-8", "12.4GB", true);
+ test("en_GB.UTF-8", "12.4 GB", true);
+
+ test("en_GB.UTF-8", "12.4GB", false);
+ test("en_GB.UTF-8", "12.4 gb", false);
+ test("en_GB.UTF-8", "12.4g", false);
+ test("en_GB.UTF-8", "12.4 G", false);
+
+ test("en_GB.UTF-8", "123,456.789kB", false);
+ test("de_DE.UTF-8", "123.456,789kB", false);
+ test("fr_FR.UTF-8", "123 456,789kB", false);
+
+ test("en_GB.UTF-8", "123,456.789 kB", false);
+ test("de_DE.UTF-8", "123.456,789 kB", false);
+ test("fr_FR.UTF-8", "123 456,789 kB", false);
+
+ delete s;
+}
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.17.51/libstorage/testsuite/Makefile.am new/yast2-storage-2.17.52/libstorage/testsuite/Makefile.am
--- old/yast2-storage-2.17.51/libstorage/testsuite/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/libstorage/testsuite/Makefile.am 2008-11-20 12:09:38.000000000 +0100
@@ -11,7 +11,9 @@
AM_CPPFLAGS =
AM_CXXFLAGS =
-noinst_PROGRAMS = partition1.single format1.single uuid1.single fstab1.single lvm_create.single lvm_extend.single md_create.single
+noinst_PROGRAMS = partition1.single format1.single uuid1.single fstab1.single \
+ lvm_create.single lvm_extend.single md_create.single \
+ humanstring1.single humanstring2.single
partition1_single_SOURCES = partition1.cc
partition1_single_LDADD = ../src/liby2storage.la
@@ -34,6 +36,11 @@
md_create_single_SOURCES = md_create.cc
md_create_single_LDADD = ../src/liby2storage.la
+humanstring1_single_SOURCES = humanstring1.cc
+humanstring1_single_LDADD = ../src/liby2storage.la
+
+humanstring2_single_SOURCES = humanstring2.cc
+humanstring2_single_LDADD = ../src/liby2storage.la
+
clean-local:
rm -f tmp.err.* tmp.out.* site.exp site.bak
-
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.17.51/libstorage/testsuite/single.out/humanstring1.out new/yast2-storage-2.17.52/libstorage/testsuite/single.out/humanstring1.out
--- old/yast2-storage-2.17.51/libstorage/testsuite/single.out/humanstring1.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.17.52/libstorage/testsuite/single.out/humanstring1.out 2008-11-20 15:15:47.000000000 +0100
@@ -0,0 +1,6 @@
+1 kB
+1.00 kB
+117.7376 MB
+117,7376 MB
+117.7376 MB
+117,7376 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.17.51/libstorage/testsuite/single.out/humanstring2.out new/yast2-storage-2.17.52/libstorage/testsuite/single.out/humanstring2.out
--- old/yast2-storage-2.17.51/libstorage/testsuite/single.out/humanstring2.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.17.52/libstorage/testsuite/single.out/humanstring2.out 2008-11-20 15:29:49.000000000 +0100
@@ -0,0 +1,18 @@
+parse error
+parse ok 42
+parse ok 42
+parse ok 42
+parse ok 42
+parse ok 42
+parse ok 13314398617
+parse ok 13314398617
+parse ok 13314398617
+parse ok 13314398617
+parse ok 13314398617
+parse ok 13314398617
+parse ok 126419751
+parse ok 126419751
+parse ok 126419751
+parse ok 126419751
+parse ok 126419751
+parse ok 126419751
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.17.51/libstorage/testsuite-real/Makefile.am new/yast2-storage-2.17.52/libstorage/testsuite-real/Makefile.am
--- old/yast2-storage-2.17.51/libstorage/testsuite-real/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/libstorage/testsuite-real/Makefile.am 2008-11-19 17:55:41.000000000 +0100
@@ -20,4 +20,3 @@
lvmextend2_SOURCES = lvmextend2.cc
lvmextend2_LDADD = ../src/liby2storage.la
-
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.17.51/Makefile.am new/yast2-storage-2.17.52/Makefile.am
--- old/yast2-storage-2.17.51/Makefile.am 2008-11-17 18:01:25.000000000 +0100
+++ new/yast2-storage-2.17.52/Makefile.am 2008-11-20 15:30:50.000000000 +0100
@@ -214,4 +214,4 @@
test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = agents-scr data disk libstorage scripts storage
+SUBDIRS = agents-scr data disk libstorage multipath-simple scripts storage
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.17.51/multipath-simple/Makefile.am new/yast2-storage-2.17.52/multipath-simple/Makefile.am
--- old/yast2-storage-2.17.51/multipath-simple/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.17.52/multipath-simple/Makefile.am 2008-11-19 17:37:58.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# Makefile.am for storage/multipath-simple
+#
+
+SUBDIRS = src
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.17.51/multipath-simple/src/Makefile.am new/yast2-storage-2.17.52/multipath-simple/src/Makefile.am
--- old/yast2-storage-2.17.51/multipath-simple/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.17.52/multipath-simple/src/Makefile.am 2008-11-19 17:39:15.000000000 +0100
@@ -0,0 +1,8 @@
+#
+# Makefile.am for storage/multipath-simple/src
+#
+
+client_DATA = \
+ multipath-simple.ycp
+
+EXTRA_DIST = $(client_DATA)
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.17.51/multipath-simple/src/multipath-simple.ycp new/yast2-storage-2.17.52/multipath-simple/src/multipath-simple.ycp
--- old/yast2-storage-2.17.51/multipath-simple/src/multipath-simple.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.17.52/multipath-simple/src/multipath-simple.ycp 2008-11-19 17:48:43.000000000 +0100
@@ -0,0 +1,12 @@
+{
+ textdomain "storage";
+
+ import "Popup";
+ import "Storage";
+
+ boolean activate = Popup::YesNo(_("Activate multipath?"));
+
+ Storage::ActivateMultipath(activate);
+
+ return 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.17.51/storage/data/Makefile.am new/yast2-storage-2.17.52/storage/data/Makefile.am
--- old/yast2-storage-2.17.51/storage/data/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/storage/data/Makefile.am 2008-11-19 18:16:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# Makefile.am for y2m_inst/ycp/partitioning/data
+# Makefile.am for storage/storage/data
#
ydata_DATA = \
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.17.51/storage/doc/autodocs/Makefile.am new/yast2-storage-2.17.52/storage/doc/autodocs/Makefile.am
--- old/yast2-storage-2.17.51/storage/doc/autodocs/Makefile.am 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.52/storage/doc/autodocs/Makefile.am 2008-11-19 18:16:28.000000000 +0100
@@ -1,4 +1,6 @@
-# Makefile.am for YCP module y2c_storage/doc/autodocs
+#
+# Makefile.am for storage/storage/doc/autodocs
+#
htmldir = @docdir@/autodocs
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.17.51/storage/doc/Makefile.am new/yast2-storage-2.17.52/storage/doc/Makefile.am
--- old/yast2-storage-2.17.51/storage/doc/Makefile.am 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.52/storage/doc/Makefile.am 2008-11-19 18:16:28.000000000 +0100
@@ -1,7 +1,5 @@
#
-# Makefile.am for y2c_XXpkgXX/doc
-#
-# $Id: Makefile.am 32957 2006-09-18 17:49:54Z fehr $
+# Makefile.am for storage/storage/doc
#
SUBDIRS = autodocs
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.17.51/storage/Makefile.am new/yast2-storage-2.17.52/storage/Makefile.am
--- old/yast2-storage-2.17.51/storage/Makefile.am 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.52/storage/Makefile.am 2008-11-19 17:55:41.000000000 +0100
@@ -1,3 +1,5 @@
#
# Makefile.am for storage/storage
+#
+
SUBDIRS = data doc src
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.17.51/storage/src/include/custom_part_check_generated.ycp new/yast2-storage-2.17.52/storage/src/include/custom_part_check_generated.ycp
--- old/yast2-storage-2.17.51/storage/src/include/custom_part_check_generated.ycp 2008-11-17 17:22:14.000000000 +0100
+++ new/yast2-storage-2.17.52/storage/src/include/custom_part_check_generated.ycp 2008-11-18 17:18:31.000000000 +0100
@@ -43,7 +43,6 @@
* - detect the fs on this partition
* - checks if / mountpoint is set
* - check if the boot partition ends in a bootable cylinder (/or/boot)
- * - check that all reiser Filesystems are bigger than 60MB
*/
boolean check_created_partition_table(const map targetMap, boolean installation)
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.17.51/storage/src/include/ep-dialogs.ycp new/yast2-storage-2.17.52/storage/src/include/ep-dialogs.ycp
--- old/yast2-storage-2.17.51/storage/src/include/ep-dialogs.ycp 2008-11-14 17:14:48.000000000 +0100
+++ new/yast2-storage-2.17.52/storage/src/include/ep-dialogs.ycp 2008-11-19 11:38:44.000000000 +0100
@@ -58,6 +58,34 @@
string mount = data["mount"]:"";
boolean do_mount = mount != "";
+
+ // returns true also when password can be omitted (e.g. encrypted swap)
+ boolean NeedPassword()
+ {
+ if (!crypt_fs)
+ return false;
+
+ if (data["create"]:false && !do_format)
+ return false;
+
+ return true;
+ }
+
+
+ boolean AskPassword()
+ {
+ if (!NeedPassword())
+ return false;
+
+ // TODO: this is ugly
+ string key = (data["type"]:`unknown != `loop) ? (data["device"]:"error") : (data["fpath"]:"error");
+ if (Storage::HasClassified(key))
+ return false;
+
+ return true;
+ }
+
+
/* MiniWorkflowStepPartitionSize data:
$["create":true,
"cyl_size":8225280,
@@ -146,7 +174,7 @@
MiniWorkflow::SetContents(Greasemonkey::Transform(contents), MiniWorkflowStepFormatMountHelptext());
- MiniWorkflow::SetLastStep(!crypt_fs);
+ MiniWorkflow::SetLastStep(!AskPassword());
UI::ChangeWidget(`id(`format), `Value, do_format ? `do_format : `do_not_format);
UI::ChangeWidget(`id(`do_format_attachment), `Enabled, do_format);
@@ -201,7 +229,8 @@
}
case `crypt_fs:
- MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true);
+ crypt_fs = (boolean) UI::QueryWidget(`id(`crypt_fs), `Value);
+ MiniWorkflow::SetLastStep(!AskPassword());
break;
/* already done in HandlePartWidgetChanges
@@ -226,18 +255,19 @@
*/
case `do_format:
- // TODO
+ do_format = (boolean) UI::QueryWidget(`id(`do_format), `Value);
data["used_fs"] = (symbol) UI::QueryWidget(`id(`fs), `Value);
UI::ChangeWidget(`id(`do_format_attachment), `Enabled, true);
UI::ChangeWidget(`id(`do_not_format_attachment), `Enabled, false);
- MiniWorkflow::SetLastStep(UI::QueryWidget(`id(`crypt_fs), `Value) != true);
+ MiniWorkflow::SetLastStep(!AskPassword());
break;
case `do_not_format:
+ do_format = (boolean) UI::QueryWidget(`id(`do_format), `Value);
UI::ChangeWidget(`id(`do_format_attachment), `Enabled, false);
UI::ChangeWidget(`id(`do_not_format_attachment), `Enabled, true);
- MiniWorkflow::SetLastStep(true);
+ MiniWorkflow::SetLastStep(!AskPassword());
break;
case `fsid_point:
@@ -323,7 +353,7 @@
if (widget == `next)
{
- if (crypt_fs)
+ if (NeedPassword())
data["enc_type"] = data["format"]:false ? `luks : `twofish;
else
data["enc_type"] = `none;
@@ -338,7 +368,7 @@
if (data["fsid"]:0 != orig_data["fsid"]:0)
data["change_fsid"] = true;
- if (!do_format || !crypt_fs)
+ if (!AskPassword())
widget = `finish;
orig_data = data;
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.17.51/storage/src/include/Makefile.am new/yast2-storage-2.17.52/storage/src/include/Makefile.am
--- old/yast2-storage-2.17.51/storage/src/include/Makefile.am 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.52/storage/src/include/Makefile.am 2008-11-19 18:16:28.000000000 +0100
@@ -1,5 +1,5 @@
#
-# Makefile.am for y2m_inst/ycp/partitioning/include
+# Makefile.am for storage/storage/src/include
#
yncludedir = @yncludedir@/partitioning
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.17.51/storage/src/Makefile.am new/yast2-storage-2.17.52/storage/src/Makefile.am
--- old/yast2-storage-2.17.51/storage/src/Makefile.am 2008-10-27 14:20:21.000000000 +0100
+++ new/yast2-storage-2.17.52/storage/src/Makefile.am 2008-11-19 17:38:26.000000000 +0100
@@ -1,5 +1,5 @@
#
-# Makefile.am for storage/src
+# Makefile.am for storage/storage/src
#
SUBDIRS = include modules proposal
@@ -13,8 +13,7 @@
inst_resize_ui.ycp \
inst_target_part.ycp \
inst_target_selection.ycp \
- storage_finish.ycp \
- multipath-simple.ycp
+ storage_finish.ycp
EXTRA_DIST = $(client_DATA)
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.17.51/storage/src/modules/Makefile.am new/yast2-storage-2.17.52/storage/src/modules/Makefile.am
--- old/yast2-storage-2.17.51/storage/src/modules/Makefile.am 2008-11-14 11:31:57.000000000 +0100
+++ new/yast2-storage-2.17.52/storage/src/modules/Makefile.am 2008-11-19 18:16:28.000000000 +0100
@@ -1,5 +1,5 @@
#
-# Makefile.am for storage/src/modules
+# Makefile.am for storage/storage/src/modules
#
YCPCFLAGS = -M ../../../libstorage/bindings/ycp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-storage-2.17.51/storage/src/modules/Storage.ycp new/yast2-storage-2.17.52/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.17.51/storage/src/modules/Storage.ycp 2008-11-14 17:34:07.000000000 +0100
+++ new/yast2-storage-2.17.52/storage/src/modules/Storage.ycp 2008-11-18 18:16:32.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 53337 2008-11-14 16:34:07Z aschnell $
+ * $Id: Storage.ycp 53392 2008-11-18 17:16:31Z aschnell $
*/
{
module "Storage";
@@ -164,7 +164,7 @@
map DiskMapVersion = $[];
map DiskMap = $[];
-map ClassifiedSettings = $[];
+map ClassifiedSettings = $[];
map type_order = $[ `CT_DISK : 0, `CT_MD : 1, `CT_DMRAID : 2, `CT_DMMULTIPATH : 3,
`CT_LOOP : 4, `CT_DM : 5, `CT_LVM : 6, `CT_NFS : 7 ];
list<string> hw_packages = [];
@@ -893,7 +893,7 @@
if( used_fs == `ntfs && !r && verbose )
{
- string cmd = sformat("ntfsresize -f -i %1", device );
+ string cmd = sformat("/usr/sbin/ntfsresize -f -i '%1'", device);
y2milestone( "GetFreeSpace Executing cmd:%1", cmd );
map bcall = (map) SCR::Execute( .target.bash_output, cmd,
$[ "LC_MESSAGES" :"POSIX"] );
@@ -3008,6 +3008,13 @@
//y2milestone( "ClassifiedSettings %1", ClassifiedSettings );
}
+
+global boolean HasClassified(string key)
+{
+ return haskey(ClassifiedSettings, key);
+}
+
+
define void HandleModulesOnBoot( map targetMap );
global boolean UpdateLoop( string dev, string file, boolean create,
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.17.51/storage/src/multipath-simple.ycp new/yast2-storage-2.17.52/storage/src/multipath-simple.ycp
--- old/yast2-storage-2.17.51/storage/src/multipath-simple.ycp 2008-10-27 14:29:28.000000000 +0100
+++ new/yast2-storage-2.17.52/storage/src/multipath-simple.ycp 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-{
- textdomain "storage";
-
- import "Popup";
- import "Storage";
-
- boolean activate = Popup::YesNo(_("Activate multipath?"));
-
- Storage::ActivateMultipath(activate);
-
- return 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.17.51/storage/src/proposal/Makefile.am new/yast2-storage-2.17.52/storage/src/proposal/Makefile.am
--- old/yast2-storage-2.17.51/storage/src/proposal/Makefile.am 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.52/storage/src/proposal/Makefile.am 2008-11-19 18:16:28.000000000 +0100
@@ -1,4 +1,6 @@
-# Makefile.am for storage/src/proposal
+#
+# Makefile.am for storage/storage/src/proposal
+#
client_DATA = partitions_proposal.ycp
EXTRA_DIST = $(client_DATA)
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.17.51/VERSION new/yast2-storage-2.17.52/VERSION
--- old/yast2-storage-2.17.51/VERSION 2008-11-12 16:55:17.000000000 +0100
+++ new/yast2-storage-2.17.52/VERSION 2008-11-19 11:53:10.000000000 +0100
@@ -1 +1 @@
-2.17.51
+2.17.52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org