Hello community,
here is the log from the commit of package yast2-storage
checked in at Thu Aug 7 12:00:29 CEST 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-08-05 21:13:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2008-08-07 11:27:56.982864000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 06 17:02:27 CEST 2008 - aschnell@suse.de
+
+- do not try to show /var/log/messages during installation
+- version 2.17.12
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.17.11.tar.bz2
New:
----
yast2-storage-2.17.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.Q26558/_old 2008-08-07 12:00:19.000000000 +0200
+++ /var/tmp/diff_new_pack.Q26558/_new 2008-08-07 12:00:19.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.17.11)
+# spec file for package yast2-storage (Version 2.17.12)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-storage
-Version: 2.17.11
+Version: 2.17.12
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.17.11.tar.bz2
+Source0: yast2-storage-2.17.12.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 kpartx cryptsetup
@@ -57,7 +57,7 @@
Arvin Schnell
%prep
-%setup -n yast2-storage-2.17.11
+%setup -n yast2-storage-2.17.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -179,6 +179,9 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Wed Aug 06 2008 aschnell@suse.de
+- do not try to show /var/log/messages during installation
+- version 2.17.12
* Tue Aug 05 2008 aschnell@suse.de
- removed EVMS functions from StorageInterface.h
- version 2.17.11
++++++ yast2-storage-2.17.11.tar.bz2 -> yast2-storage-2.17.12.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/configure new/yast2-storage-2.17.12/configure
--- old/yast2-storage-2.17.11/configure 2008-08-05 18:39:42.000000000 +0200
+++ new/yast2-storage-2.17.12/configure 2008-08-07 11:26:24.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.11.
+# Generated by GNU Autoconf 2.61 for yast2-storage 2.17.12.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-storage'
PACKAGE_TARNAME='yast2-storage'
-PACKAGE_VERSION='2.17.11'
-PACKAGE_STRING='yast2-storage 2.17.11'
+PACKAGE_VERSION='2.17.12'
+PACKAGE_STRING='yast2-storage 2.17.12'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1449,7 +1449,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-storage 2.17.11 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.17.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1520,7 +1520,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.17.11:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.17.12:";;
esac
cat <<\_ACEOF
@@ -1630,7 +1630,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.17.11
+yast2-storage configure 2.17.12
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1644,7 +1644,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-storage $as_me 2.17.11, which was
+It was created by yast2-storage $as_me 2.17.12, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2465,7 +2465,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.17.11'
+ VERSION='2.17.12'
cat >>confdefs.h <<_ACEOF
@@ -2693,7 +2693,7 @@
-VERSION="2.17.11"
+VERSION="2.17.12"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -21746,7 +21746,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-storage $as_me 2.17.11, which was
+This file was extended by yast2-storage $as_me 2.17.12, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21799,7 +21799,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-storage config.status 2.17.11
+yast2-storage config.status 2.17.12
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/configure.in new/yast2-storage-2.17.12/configure.in
--- old/yast2-storage-2.17.11/configure.in 2008-08-05 18:39:27.000000000 +0200
+++ new/yast2-storage-2.17.12/configure.in 2008-08-07 11:26:09.000000000 +0200
@@ -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.11, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.17.12, 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.11"
+VERSION="2.17.12"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/libstorage/src/AppUtil.cc new/yast2-storage-2.17.12/libstorage/src/AppUtil.cc
--- old/yast2-storage-2.17.11/libstorage/src/AppUtil.cc 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.12/libstorage/src/AppUtil.cc 2008-08-06 12:18:45.000000000 +0200
@@ -631,7 +631,7 @@
return false;
}
-bool system_cmd_testmode = false;
+
const string app_ws = " \t\n";
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/libstorage/src/DmraidCo.cc new/yast2-storage-2.17.12/libstorage/src/DmraidCo.cc
--- old/yast2-storage-2.17.11/libstorage/src/DmraidCo.cc 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.12/libstorage/src/DmraidCo.cc 2008-08-05 22:06:46.000000000 +0200
@@ -10,6 +10,7 @@
#include "y2storage/SystemCmd.h"
#include "y2storage/AppUtil.h"
#include "y2storage/Storage.h"
+#include "y2storage/StorageDefines.h"
using namespace std;
using namespace storage;
@@ -30,7 +31,7 @@
void DmraidCo::getRaidData( const string& name )
{
y2milestone( "name:%s", name.c_str() );
- SystemCmd c( "dmraid -s -c -c -c " + quote(name));
+ SystemCmd c(DMRAIDBIN " -s -c -c -c " + quote(name));
list<string>::const_iterator ci;
list<string> sl;
if( c.numLines()>0 )
@@ -110,11 +111,11 @@
if( val )
{
Dm::activate(true);
- c.execute( "dmraid -ay -p " );
+ c.execute(DMRAIDBIN " -ay -p");
}
else
{
- c.execute( "dmraid -an " );
+ c.execute(DMRAIDBIN " -an");
}
active = val;
}
@@ -123,7 +124,7 @@
void DmraidCo::getRaids( list<string>& l )
{
l.clear();
- SystemCmd c( "dmraid -s -c -c -c" );
+ SystemCmd c(DMRAIDBIN " -s -c -c -c");
for( unsigned i=0; ishowInfoCb( removeText(true) );
}
- string cmd = "cd /var/log/YaST2 && echo y | dmraid -E -r";
+ string cmd = "cd /var/log/YaST2 && echo y | " DMRAIDBIN " -E -r";
SystemCmd c;
for( list<Pv>::const_iterator i=pv.begin(); i!=pv.end(); ++i )
{
- c.execute( cmd + " " + i->device );
+ c.execute(cmd + " " + quote(i->device));
}
if( c.retcode()!=0 )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/libstorage/src/Lock.cc new/yast2-storage-2.17.12/libstorage/src/Lock.cc
--- old/yast2-storage-2.17.11/libstorage/src/Lock.cc 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.12/libstorage/src/Lock.cc 2008-08-07 11:08:41.000000000 +0200
@@ -29,8 +29,8 @@
}
- Lock::Lock(bool readonly)
- : fd(-1), disabled(getenv("YAST2_STORAGE_NO_LOCKING") != NULL)
+ Lock::Lock(bool readonly, bool disable)
+ : fd(-1), disabled(disable || getenv("YAST2_STORAGE_NO_LOCKING") != NULL)
{
if (disabled)
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/libstorage/src/Lock.h new/yast2-storage-2.17.12/libstorage/src/Lock.h
--- old/yast2-storage-2.17.11/libstorage/src/Lock.h 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.12/libstorage/src/Lock.h 2008-08-07 11:09:28.000000000 +0200
@@ -38,7 +38,7 @@
public:
- Lock(bool readonly);
+ Lock(bool readonly, bool disable = false);
~Lock() throw();
private:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/libstorage/src/LvmVg.cc new/yast2-storage-2.17.12/libstorage/src/LvmVg.cc
--- old/yast2-storage-2.17.11/libstorage/src/LvmVg.cc 2008-08-05 21:07:34.000000000 +0200
+++ new/yast2-storage-2.17.12/libstorage/src/LvmVg.cc 2008-08-05 22:32:25.000000000 +0200
@@ -997,7 +997,7 @@
{
if( !devices.empty() )
devices += " ";
- devices += p->device;
+ devices += quote(p->device);
ret = doCreatePv( p->device );
++p;
}
@@ -1010,7 +1010,7 @@
rmdir( ddir.c_str() );
}
string cmd = VGCREATEBIN " " + instSysString() + metaString() +
- "-s " + decString(pe_size) + "k " + quote(name()) + " " + quote(devices);
+ "-s " + decString(pe_size) + "k " + quote(name()) + " " + devices;
SystemCmd c( cmd );
if( c.retcode()!=0 )
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/libstorage/src/Storage.cc new/yast2-storage-2.17.12/libstorage/src/Storage.cc
--- old/yast2-storage-2.17.11/libstorage/src/Storage.cc 2008-08-05 18:10:29.000000000 +0200
+++ new/yast2-storage-2.17.12/libstorage/src/Storage.cc 2008-08-07 11:07:18.000000000 +0200
@@ -75,7 +75,7 @@
Storage::Storage( bool ronly, bool tmode, bool autodetec )
- : lock(ronly), readonly(ronly), testmode(tmode), initialized(false),
+ : lock(ronly, tmode), readonly(ronly), testmode(tmode), initialized(false),
autodetect(autodetec)
{
y2milestone( "constructed Storage ronly:%d testmode:%d autodetect:%d",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/libstorage/src/StorageDefines.h new/yast2-storage-2.17.12/libstorage/src/StorageDefines.h
--- old/yast2-storage-2.17.11/libstorage/src/StorageDefines.h 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.12/libstorage/src/StorageDefines.h 2008-08-06 12:34:18.000000000 +0200
@@ -25,6 +25,12 @@
#define MULTIPATHBIN "/sbin/multipath"
#define DMSETUPBIN "/sbin/dmsetup"
#define KPARTXBIN "/sbin/kpartx"
+#define DMRAIDBIN "/sbin/dmraid"
+
+#define MOUNTBIN "/bin/mount"
+#define UMOUNTBIN "/bin/umount"
+#define SWAPONBIN "/sbin/swapon"
+#define SWAPOFFBIN "/sbin/swapoff"
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/libstorage/src/Volume.cc new/yast2-storage-2.17.12/libstorage/src/Volume.cc
--- old/yast2-storage-2.17.11/libstorage/src/Volume.cc 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.12/libstorage/src/Volume.cc 2008-08-06 10:32:10.000000000 +0200
@@ -787,7 +787,7 @@
{
cmd += params + " ";
}
- cmd += mountDevice();
+ cmd += quote(mountDevice());
SystemCmd c;
c.setOutputProcessor( p );
c.execute( cmd );
@@ -817,7 +817,7 @@
cmd += "journal_data_writeback ";
else
cmd += "journal_data ";
- cmd += mountDevice();
+ cmd += quote(mountDevice());
SystemCmd c( cmd );
if( c.retcode()!=0 )
ret = VOLUME_TUNE2FS_FAILED;
@@ -931,21 +931,21 @@
d = dmcrypt_dev;
else if( loop_active )
d = loop_dev;
- string cmdline = ((detected_fs != SWAP)?"umount ":"swapoff ") + d;
+ string cmdline = ((detected_fs != SWAP)?UMOUNTBIN " ":SWAPOFFBIN " ") + quote(d);
int ret = cmd.execute( cmdline );
if( ret != 0 && mountDevice()!=dev )
{
- cmdline = ((detected_fs != SWAP)?"umount ":"swapoff ") + dev;
+ cmdline = ((detected_fs != SWAP)?UMOUNTBIN " ":SWAPOFFBIN " ") + quote(dev);
ret = cmd.execute( cmdline );
}
if( ret!=0 && !mp.empty() && mp!="swap" )
{
- cmdline = "umount " + mp;
+ cmdline = UMOUNTBIN " " + quote(mp);
ret = cmd.execute( cmdline );
}
if( ret!=0 && !orig_mp.empty() && orig_mp!="swap" )
{
- cmdline = "umount " + orig_mp;
+ cmdline = UMOUNTBIN " " + quote(orig_mp);
ret = cmd.execute( cmdline );
}
if( ret != 0 )
@@ -1201,7 +1201,7 @@
switch( fs )
{
case SWAP:
- cmd = "mkswap " + mountDevice();
+ cmd = "mkswap " + quote(mountDevice());
c.execute( cmd );
if( c.retcode()!=0 )
ret = VOLUME_RESIZE_FAILED;
@@ -1213,7 +1213,7 @@
cmd = "echo y | " + cmd;
cmd += "-s " + decString(size_k) + "K ";
}
- cmd += mountDevice();
+ cmd += quote(mountDevice());
c.execute( cmd );
if( c.retcode()!=0 )
{
@@ -1225,7 +1225,7 @@
cmd = "echo y | ntfsresize -f ";
if( needShrink() )
cmd += "-s " + decString(size_k) + "k ";
- cmd += mountDevice();
+ cmd += quote(mountDevice());
c.setCombine();
c.execute( cmd );
if( c.retcode()!=0 )
@@ -1237,7 +1237,7 @@
break;
case EXT2:
case EXT3:
- cmd = "resize2fs -f " + mountDevice();
+ cmd = "resize2fs -f " + quote(mountDevice());
if( needShrink() )
cmd += " " + decString(size_k) + "K";
c.execute( cmd );
@@ -1701,10 +1701,10 @@
if( ok )
{
c.execute( "modprobe " + fs_names[detected_fs] );
- c.execute( "mount -oro -t " + fsTypeString(detected_fs) + " " +
- use_dev + " " + mpname );
+ c.execute(MOUNTBIN " -oro -t " + fsTypeString(detected_fs) + " " +
+ quote(use_dev) + " " + quote(mpname));
ok = c.retcode()==0;
- c.execute( "umount " + mpname );
+ c.execute(UMOUNTBIN " " + quote(mpname));
}
if( !ok )
{
@@ -2018,24 +2018,24 @@
{
case EXT2:
case EXT3:
- cmd = "/sbin/tune2fs -L \"" + label + "\" " + mountDevice();
+ cmd = "/sbin/tune2fs -L " + quote(label) + " " + quote(mountDevice());
break;
case REISERFS:
- cmd = "/sbin/reiserfstune -l \"" + label + "\" " + mountDevice();
+ cmd = "/sbin/reiserfstune -l " + quote(label) + " " + quote(mountDevice());
break;
case JFS:
- cmd = "/sbin/jfs_tune -L \"" + label + "\" " + mountDevice();
+ cmd = "/sbin/jfs_tune -L " + quote(label) + " " + quote(mountDevice());
break;
case XFS:
{
string tlabel = label;
if( label.empty() )
tlabel = "--";
- cmd = "/usr/sbin/xfs_admin -L " + tlabel + " " + mountDevice();
+ cmd = "/usr/sbin/xfs_admin -L " + tlabel + " " + quote(mountDevice());
}
break;
case SWAP:
- cmd = "/sbin/mkswap -L \"" + label + "\" " + mountDevice();
+ cmd = "/sbin/mkswap -L " + quote(label) + "\" " + quote(mountDevice());
break;
default:
ret = VOLUME_MKLABEL_FS_UNABLE;
@@ -2120,7 +2120,7 @@
cmdline = "modprobe nls_iso8859-1";
cmd.execute( cmdline );
}
- cmdline = "mount ";
+ cmdline = MOUNTBIN " ";
if( ro )
cmdline += "-r ";
const char * ign_opt[] = { "defaults", "" };
@@ -2145,11 +2145,11 @@
opts += mergeString( l, "," );
opts += " ";
}
- cmdline += "-t " + fsn + opts + mountDevice() + " " + lmount;
+ cmdline += "-t " + fsn + opts + quote(mountDevice()) + " " + quote(lmount);
}
else
{
- cmdline = "swapon " + mountDevice();
+ cmdline = SWAPONBIN " " + quote(mountDevice());
if( cont->getStorage()->instsys() )
{
ProcMounts mountData( cont->getStorage() );
@@ -2527,7 +2527,7 @@
}
else
{
- c.execute( (string)"mount -oremount " + mp );
+ c.execute(MOUNTBIN " -oremount " + quote(mp));
y2mil( "remount remount:" << c.retcode() );
if( c.retcode()!=0 )
ret = VOLUME_REMOUNT_FAILED;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/libstorage/testsuite/lib/limal_init.exp new/yast2-storage-2.17.12/libstorage/testsuite/lib/limal_init.exp
--- old/yast2-storage-2.17.11/libstorage/testsuite/lib/limal_init.exp 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.12/libstorage/testsuite/lib/limal_init.exp 2008-08-07 11:15:41.000000000 +0200
@@ -40,8 +40,6 @@
# run the test
- setenv YAST2_STORAGE_NO_LOCKING
-
set result ""
set oops [catch { set result [exec $src >$outfile 2>$errfile] } catched]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/storage/src/include/ep-hd.ycp new/yast2-storage-2.17.12/storage/src/include/ep-hd.ycp
--- old/yast2-storage-2.17.11/storage/src/include/ep-hd.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.12/storage/src/include/ep-hd.ycp 2008-08-07 10:48:48.000000000 +0200
@@ -12,6 +12,7 @@
import "PackageCallbacks";
import "PackageSystem";
import "FileUtils";
+ import "Mode";
import "Stage";
include "partitioning/ep-hd-dialogs.ycp";
@@ -55,7 +56,7 @@
if (Mode::installation()) {
// push button text
- buttons = add(buttons, `PushButton(`id(`fstab), _("Import Mount Points...")));
+ buttons = add(buttons, `PushButton(`id(`import), _("Import Mount Points...")));
}
buttons = add(buttons, `HStretch());
@@ -150,6 +151,13 @@
Really rescan disks?"), nil, nil);
break;
+ case `import:
+ ImportMountPoints();
+ Storage::CreateTargetBackup("expert-partitioner");
+ UpdateNavigationTree(nil);
+ TreePanel::Create();
+ break;
+
case `iscsi:
// popup text
CallConfig(_("Calling iSCSI configuration cancels all current changes.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/storage/src/include/ep-lib.ycp new/yast2-storage-2.17.12/storage/src/include/ep-lib.ycp
--- old/yast2-storage-2.17.11/storage/src/include/ep-lib.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.12/storage/src/include/ep-lib.ycp 2008-08-07 10:43:54.000000000 +0200
@@ -161,4 +161,37 @@
return false;
}
+
+
+ void ImportMountPoints()
+ {
+ map od = (map)Storage::GetOndiskTarget();
+ list<list> fstab = scanAndReadExistingFstab( od );
+ y2milestone( "adapt_mp fstab %1", fstab );
+ list ti = maplist( list e, fstab, ``(AddFstabToData( od, (list<map>)e)[1]:$[]));
+ y2milestone( "adapt_mp ti %1", ti );
+
+ integer idx = FstabAddDialog( ti );
+ if( idx>=0 )
+ {
+ od = (map)Storage::GetOndiskTarget();
+ y2milestone( "adapt_mp use fstab idx %1", idx );
+ ti = AddFstabToData( od, (list<map>)fstab[idx]:[] );
+ Storage::ResetOndiskTarget();
+ foreach( string d, map disk, ti[0]:$[],
+ ``{
+ foreach( map p, disk["partitions"]:[],
+ ``{
+ if( size(p["mount"]:"")>0 && p["enc_type"]:`none!=`none &&
+ !p["tmpcrypt"]:false )
+ {
+ string pwd = DlgCreateCryptFs( p["device"]:"", 1, false, false );
+ if( pwd != nil && size(pwd)>0 )
+ Storage::SetCryptPwd( p["device"]:"", pwd );
+ }
+ });
+ });
+ Storage::SetTargetMap(ti[0]:$[]);
+ }
+ }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/storage/src/include/ep-main.ycp new/yast2-storage-2.17.12/storage/src/include/ep-main.ycp
--- old/yast2-storage-2.17.11/storage/src/include/ep-main.ycp 2008-08-05 17:57:09.000000000 +0200
+++ new/yast2-storage-2.17.12/storage/src/include/ep-main.ycp 2008-08-06 18:09:13.000000000 +0200
@@ -169,8 +169,10 @@
`item(`id(`nfs), `icon(nfs_icon), _("NFS"), open(`nfs), subtree[`nfs]:[]),
`item(`id(`unused), `icon(unused_icon), _("Unused Devices"), open(`unused))
]),
- `item(`id(`settings), `icon(settings_icon), _("Settings"), open(`settings)),
- `item(`id(`log), `icon(log_icon), _("Log"), open(`log)) ];
+ `item(`id(`settings), `icon(settings_icon), _("Settings"), open(`settings)) ];
+
+ if (Mode::normal())
+ tree = add(tree, `item(`id(`log), `icon(log_icon), _("Log"), open(`log)));
}
@@ -213,7 +215,7 @@
}
- any test_new_ep()
+ any ExpertPartitioner()
{
SCR::Write(.target.ycp, Storage::SaveDumpPath("targetmap-ep-start"), Storage::GetTargetMap());
@@ -304,6 +306,6 @@
Storage::DisposeTargetBackup("expert-partitioner");
}
- return `abort;
+ return widget;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/storage/src/inst_custom_part.ycp new/yast2-storage-2.17.12/storage/src/inst_custom_part.ycp
--- old/yast2-storage-2.17.11/storage/src/inst_custom_part.ycp 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.12/storage/src/inst_custom_part.ycp 2008-08-07 11:18:52.000000000 +0200
@@ -26,7 +26,7 @@
*
*************************************************************
- $Id: inst_custom_part.ycp 49674 2008-08-05 08:41:27Z aschnell $
+ $Id: inst_custom_part.ycp 49806 2008-08-07 09:18:52Z aschnell $
*/
{
@@ -76,8 +76,6 @@
boolean button_expert = true; // Should the "EXPERT"-Button be shown in main window
boolean button_delete_parttable = true; // Should the "Delete partition table and disk label"
// -Button be shown in Expert menu
- boolean button_adapt_mp = false; // Should the "Adapt mount points from
- // existing /etc/fstab" -Button be shown in Expert menu
boolean test_mode = Mode::test ();
string boot_mode = "fritz";
@@ -117,17 +115,6 @@
bsd_label = true;
}
- if( Stage::initial () )
- {
- button_adapt_mp = true;
- }
- if( Mode::repair () )
- {
- button_adapt_mp = false;
- }
-
-
- y2debug( "ARCHIT %1", Arch::architecture () );
////////////////////////////////////////////////////////////////////////
@@ -2118,7 +2105,7 @@
// MAIN:
/////////////////////////////////////////////////////////////////
- return test_new_ep();
+ return ExpertPartitioner();
@@ -2175,12 +2162,6 @@
add( expert_item_list ,
// menu entry text
`item( `id (`reread), _("&Reread Partition Table")));
- if( button_adapt_mp )
- expert_item_list =
- add( expert_item_list,
- `item( `id (`adapt_mp),
- // menu entry text
- _("&Import Mount Points from Existing /etc/fstab")));
if ( button_delete_parttable )
expert_item_list =
add( expert_item_list,
@@ -2885,43 +2866,6 @@
}
}
- /////////////////////////////////////////////////////////////
- // Adapt mount points from existing /etc/fstab
- /////////////////////////////////////////////////////////////
-
- if (ret == `adapt_mp && Stage::initial() )
- {
- map od = (map)Storage::GetOndiskTarget();
- list<list> fstab = scanAndReadExistingFstab( od );
- y2milestone( "adapt_mp fstab %1", fstab );
- list ti = maplist( list e, fstab,
- ``(AddFstabToData( od, (list<map>)e)[1]:$[]));
- y2milestone( "adapt_mp ti %1", ti );
-
- integer idx = FstabAddDialog( ti );
- if( idx>=0 )
- {
- od = (map)Storage::GetOndiskTarget();
- y2milestone( "adapt_mp use fstab idx %1", idx );
- ti = AddFstabToData( od, (list<map>)fstab[idx]:[] );
- Storage::ResetOndiskTarget();
- foreach( string d, map disk, ti[0]:$[],
- ``{
- foreach( map p, disk["partitions"]:[],
- ``{
- if( size(p["mount"]:"")>0 && p["enc_type"]:`none!=`none &&
- !p["tmpcrypt"]:false )
- {
- string pwd = DlgCreateCryptFs( p["device"]:"", 1, false, false );
- if( pwd != nil && size(pwd)>0 )
- Storage::SetCryptPwd( p["device"]:"", pwd );
- }
- });
- });
- Storage::SetTargetMap( ti[0]:$[] );
- }
- }
-
/////////////////////////////////////////////////////////////
// End of Actions, Now check the returncode
/////////////////////////////////////////////////////////////
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.17.11/VERSION new/yast2-storage-2.17.12/VERSION
--- old/yast2-storage-2.17.11/VERSION 2008-08-05 17:57:10.000000000 +0200
+++ new/yast2-storage-2.17.12/VERSION 2008-08-06 17:09:00.000000000 +0200
@@ -1 +1 @@
-2.17.11
+2.17.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org