Hello community,
here is the log from the commit of package yast2-storage
checked in at Wed Apr 9 01:02:00 CEST 2008.
--------
--- yast2-storage/yast2-storage.changes 2008-03-26 17:37:23.000000000 +0100
+++ yast2-storage/yast2-storage.changes 2008-04-08 17:29:28.226249000 +0200
@@ -1,0 +2,31 @@
+Tue Apr 08 17:13:38 CEST 2008 - aschnell@suse.de
+
+- added filesystem label in one of the proposal screens
+- version 2.16.16
+
+-------------------------------------------------------------------
+Fri Apr 04 11:21:09 CEST 2008 - aschnell@suse.de
+
+- extended libstorage to handle tune2fs options
+
+-------------------------------------------------------------------
+Thu Apr 03 19:47:06 CEST 2008 - aschnell@suse.de
+
+- removed obsolete .run.swapon_s SCR agent
+
+-------------------------------------------------------------------
+Mon Mar 31 11:38:39 CEST 2008 - aschnell@suse.de
+
+- fixed parsing of /proc/mdstat (bnc #374365)
+
+-------------------------------------------------------------------
+Sat Mar 29 22:18:51 CET 2008 - aschnell@suse.de
+
+- use new naming scheme for scr files
+
+-------------------------------------------------------------------
+Thu Mar 27 16:39:14 CET 2008 - aschnell@suse.de
+
+- Unified Button Labels (fate #120373)
+
+-------------------------------------------------------------------
Old:
----
yast2-storage-2.16.15.tar.bz2
New:
----
yast2-storage-2.16.16.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.oM4025/_old 2008-04-09 01:01:35.000000000 +0200
+++ /var/tmp/diff_new_pack.oM4025/_new 2008-04-09 01:01:35.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.16.15)
+# spec file for package yast2-storage (Version 2.16.16)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-storage
-Version: 2.16.15
+Version: 2.16.16
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.16.15.tar.bz2
+Source0: yast2-storage-2.16.16.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen evms evms-devel 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 yast2-perl-bindings mdadm lvm2 dmraid kpartx cryptsetup
@@ -51,7 +51,7 @@
Arvin Schnell
%prep
-%setup -n yast2-storage-2.16.15
+%setup -n yast2-storage-2.16.16
%build
%{prefix}/bin/y2tool y2autoconf
@@ -123,6 +123,7 @@
%{perl_vendorarch}/LibStorage.so
%package evms
+License: GPL v2 or later
Requires: yast2-storage = %version
Summary: YaST2 - Storage Configuration EVMS
Group: System/YaST
@@ -144,6 +145,7 @@
/usr/share/YaST2/clients/inst_evms.ycp
%package lib
+License: GPL v2 or later
Requires: blocxx
Summary: YaST2 - Storage Configuration Library
Group: System/YaST
@@ -167,6 +169,7 @@
/sbin/ldconfig
%package devel
+License: GPL v2 or later
Requires: blocxx-devel libstdc++-devel yast2-storage = %version
Summary: YaST2 - Storage Library Headers and Documentation
Group: Development/Libraries/YaST
@@ -192,6 +195,19 @@
%doc %{prefix}/share/doc/packages/yast2-storage/libstorage
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Tue Apr 08 2008 aschnell@suse.de
+- added filesystem label in one of the proposal screens
+- version 2.16.16
+* Fri Apr 04 2008 aschnell@suse.de
+- extended libstorage to handle tune2fs options
+* Thu Apr 03 2008 aschnell@suse.de
+- removed obsolete .run.swapon_s SCR agent
+* Mon Mar 31 2008 aschnell@suse.de
+- fixed parsing of /proc/mdstat (bnc #374365)
+* Sun Mar 30 2008 aschnell@suse.de
+- use new naming scheme for scr files
+* Thu Mar 27 2008 aschnell@suse.de
+- Unified Button Labels (fate #120373)
* Wed Mar 26 2008 aschnell@suse.de
- fixed DeviceMatchFstab for non kernel name devices (bnc #361250)
- version 2.16.15
++++++ yast2-storage-2.16.15.tar.bz2 -> yast2-storage-2.16.16.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/agents-scr/cfg_storage.scr new/yast2-storage-2.16.16/agents-scr/cfg_storage.scr
--- old/yast2-storage-2.16.15/agents-scr/cfg_storage.scr 2007-10-05 17:05:36.000000000 +0200
+++ new/yast2-storage-2.16.16/agents-scr/cfg_storage.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-/**
- * File:
- * cfg_storage.scr
- * Summary:
- * SCR Agent for reading/writing /etc/sysconfig/storage
- * using the rc-agent
- * Access:
- * read/write
- * Authors:
- * Thomas Fehr
- *
- * $Id: cfg_sound.scr 13018 2003-12-11 12:52:53Z jhumpol $
- *
- * Read/Sets the values defined in <tt>/etc/sysconfig/storage</tt>
- * in an easy manner.
- */
-.sysconfig.storage
-
-`ag_ini(
- `SysConfigFile("/etc/sysconfig/storage")
-)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/agents-scr/dasddev.scr new/yast2-storage-2.16.16/agents-scr/dasddev.scr
--- old/yast2-storage-2.16.15/agents-scr/dasddev.scr 2007-10-05 17:05:36.000000000 +0200
+++ new/yast2-storage-2.16.16/agents-scr/dasddev.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-/**
- * $Id: dasddev.scr 13018 2003-12-11 12:52:53Z jhumpol $
- *
- * File:
- * dasddev.scr
- * Summary:
- * SCR Agent for reading dasd device information
- * Access:
- * read-only
- * Authors:
- * Thomas Fehr
- * See:
- * anyagent
- * libscr
- * cat /proc/dasd/devices on S390
- * Example:
- * Read(.proc.dasddev)
- * ([$["address":"0150",
- * "major": 94,
- * "minor": 0,
- * "name": "dasda",
- * "state": "active",
- * "blocksize": 4096,
- * "blocks": 600660],
- * ...
- * ])
- **
- *
- */
-.proc.dasddev
-
-`ag_anyagent(
- `Description (
- (`File("/proc/dasd/devices")), // real file name
- "#\n", // Comment
- true, // read-only
- (`List (
- `Tuple (
- `Optional(`Whitespace()),
- `address (`String("^( ")),
- `String("^\t "),
- `Whitespace(),
- "at (",
- `Optional(`Whitespace()),
- `major( `Number() ),
- `Optional(`Whitespace()),
- ":",
- `Optional(`Whitespace()),
- `minor( `Number() ),
- `Optional(`Whitespace()),
- ")",
- `Optional(`Whitespace()),
- "is",
- `Optional(`Whitespace()),
- `name(`String("^:( ")),
- `Optional(`Whitespace()),
- `Optional("("),
- `Optional(`option(`String("^): "))),
- `Optional(")"),
- `Optional(`Whitespace()),
- ":",
- `Optional(`Whitespace()),
- `state(`String("^ \n")),
- `Optional(`Whitespace()),
- `Optional("at"),
- `Optional(`Whitespace()),
- `Optional("blocksize:"),
- `Optional(`Whitespace()),
- `Optional(`blocksize( `Number() )),
- `Optional(`Whitespace()),
- `Optional(","),
- `Optional(`Whitespace()),
- `Optional(`blocks( `Number() )),
- `Optional(`String("^\n"))
- ),
- "\n"
- ))
- )
-)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/agents-scr/etc_mtab.scr new/yast2-storage-2.16.16/agents-scr/etc_mtab.scr
--- old/yast2-storage-2.16.15/agents-scr/etc_mtab.scr 2007-10-05 17:05:36.000000000 +0200
+++ new/yast2-storage-2.16.16/agents-scr/etc_mtab.scr 2008-03-30 12:07:17.000000000 +0200
@@ -1,6 +1,6 @@
/**
* File:
- * proc_cmdline.scr
+ * etc_mtab.scr
* Summary:
* SCR Agent for reading /etc/mtab
* Access:
@@ -28,7 +28,7 @@
* ...
* ])
*
- * $Id: etc_mtab.scr 13018 2003-12-11 12:52:53Z jhumpol $
+ * $Id: etc_mtab.scr 45868 2008-03-29 21:31:26Z aschnell $
*
* Returns a <b>list of maps</b>. Each map (list-entry) corresponds to i
* one mount.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/agents-scr/Makefile.am new/yast2-storage-2.16.16/agents-scr/Makefile.am
--- old/yast2-storage-2.16.15/agents-scr/Makefile.am 2007-10-05 17:05:36.000000000 +0200
+++ new/yast2-storage-2.16.16/agents-scr/Makefile.am 2008-04-03 19:47:58.000000000 +0200
@@ -1,15 +1,14 @@
#
# Makefile.am for storage/agents
#
-# $Id: Makefile.am 41105 2007-09-26 10:46:29Z fehr $
+# $Id: Makefile.am 46061 2008-04-03 17:47:58Z aschnell $
#
-scrconf_DATA = etc_cryptotab.scr \
- proc_swaps.scr \
- proc_partitions.scr \
- dasddev.scr \
- etc_mtab.scr \
- cfg_storage.scr \
- run_swapon_s.scr
+scrconf_DATA = etc_cryptotab.scr \
+ etc_mtab.scr \
+ proc_dasddev.scr \
+ proc_partitions.scr \
+ proc_swaps.scr \
+ sysconfig_storage.scr
EXTRA_DIST = $(scrconf_DATA)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/agents-scr/Makefile.in new/yast2-storage-2.16.16/agents-scr/Makefile.in
--- old/yast2-storage-2.16.15/agents-scr/Makefile.in 2008-03-25 18:04:10.000000000 +0100
+++ new/yast2-storage-2.16.16/agents-scr/Makefile.in 2008-04-08 17:18:03.000000000 +0200
@@ -17,7 +17,7 @@
#
# Makefile.am for storage/agents
#
-# $Id: Makefile.am 41105 2007-09-26 10:46:29Z fehr $
+# $Id: Makefile.am 46061 2008-04-03 17:47:58Z aschnell $
#
VPATH = @srcdir@
@@ -208,13 +208,12 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
-scrconf_DATA = etc_cryptotab.scr \
- proc_swaps.scr \
- proc_partitions.scr \
- dasddev.scr \
- etc_mtab.scr \
- cfg_storage.scr \
- run_swapon_s.scr
+scrconf_DATA = etc_cryptotab.scr \
+ etc_mtab.scr \
+ proc_dasddev.scr \
+ proc_partitions.scr \
+ proc_swaps.scr \
+ sysconfig_storage.scr
EXTRA_DIST = $(scrconf_DATA)
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/agents-scr/proc_dasddev.scr new/yast2-storage-2.16.16/agents-scr/proc_dasddev.scr
--- old/yast2-storage-2.16.15/agents-scr/proc_dasddev.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.16.16/agents-scr/proc_dasddev.scr 2008-03-30 12:07:17.000000000 +0200
@@ -0,0 +1,79 @@
+/**
+ * $Id: proc_dasddev.scr 45868 2008-03-29 21:31:26Z aschnell $
+ *
+ * File:
+ * proc_dasddev.scr
+ * Summary:
+ * SCR Agent for reading dasd device information
+ * Access:
+ * read-only
+ * Authors:
+ * Thomas Fehr
+ * See:
+ * anyagent
+ * libscr
+ * cat /proc/dasd/devices on S390
+ * Example:
+ * Read(.proc.dasddev)
+ * ([$["address":"0150",
+ * "major": 94,
+ * "minor": 0,
+ * "name": "dasda",
+ * "state": "active",
+ * "blocksize": 4096,
+ * "blocks": 600660],
+ * ...
+ * ])
+ **
+ *
+ */
+.proc.dasddev
+
+`ag_anyagent(
+ `Description (
+ (`File("/proc/dasd/devices")), // real file name
+ "#\n", // Comment
+ true, // read-only
+ (`List (
+ `Tuple (
+ `Optional(`Whitespace()),
+ `address (`String("^( ")),
+ `String("^\t "),
+ `Whitespace(),
+ "at (",
+ `Optional(`Whitespace()),
+ `major( `Number() ),
+ `Optional(`Whitespace()),
+ ":",
+ `Optional(`Whitespace()),
+ `minor( `Number() ),
+ `Optional(`Whitespace()),
+ ")",
+ `Optional(`Whitespace()),
+ "is",
+ `Optional(`Whitespace()),
+ `name(`String("^:( ")),
+ `Optional(`Whitespace()),
+ `Optional("("),
+ `Optional(`option(`String("^): "))),
+ `Optional(")"),
+ `Optional(`Whitespace()),
+ ":",
+ `Optional(`Whitespace()),
+ `state(`String("^ \n")),
+ `Optional(`Whitespace()),
+ `Optional("at"),
+ `Optional(`Whitespace()),
+ `Optional("blocksize:"),
+ `Optional(`Whitespace()),
+ `Optional(`blocksize( `Number() )),
+ `Optional(`Whitespace()),
+ `Optional(","),
+ `Optional(`Whitespace()),
+ `Optional(`blocks( `Number() )),
+ `Optional(`String("^\n"))
+ ),
+ "\n"
+ ))
+ )
+)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/agents-scr/proc_partitions.scr new/yast2-storage-2.16.16/agents-scr/proc_partitions.scr
--- old/yast2-storage-2.16.15/agents-scr/proc_partitions.scr 2007-10-05 17:05:36.000000000 +0200
+++ new/yast2-storage-2.16.16/agents-scr/proc_partitions.scr 2008-03-30 12:07:17.000000000 +0200
@@ -1,6 +1,6 @@
/**
* File:
- * proc_swaps.scr
+ * proc_partitions.scr
* Summary:
* SCR Agent for reading /proc/swaps
* Access:
@@ -21,7 +21,7 @@
* ...
* ])
*
- * $Id: proc_partitions.scr 13018 2003-12-11 12:52:53Z jhumpol $
+ * $Id: proc_partitions.scr 45868 2008-03-29 21:31:26Z aschnell $
*
*/
.proc.partitions
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/agents-scr/run_swapon_s.scr new/yast2-storage-2.16.16/agents-scr/run_swapon_s.scr
--- old/yast2-storage-2.16.15/agents-scr/run_swapon_s.scr 2007-10-05 17:05:36.000000000 +0200
+++ new/yast2-storage-2.16.16/agents-scr/run_swapon_s.scr 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-/**
- * File:
- * run_swapon_s.scr
- * Summary:
- * SCR Agent for reading the result from "/sbin/swapon -s"
- * Access:
- * read-only
- * Authors:
- * Unknown
- * See:
- * anyagent
- * libscr
- * man swapon(8)
- * man swapoff(8)
- * man mkswap(8)
- * Example:
- * Read(.run.swapon_s)
- * ($["/sda2":" partition\t265064\t2632\t-1"])
- *
- * $Id: run_swapon_s.scr 13018 2003-12-11 12:52:53Z jhumpol $
- *
- * Returns a <b>map</b> of swap partitions. The key is the device file
- * (minus /dev), the value is the remaining information as string.
- */
-.run.swapon_s
-
-`ag_anyagent(
- `Description (
- (`Run("/sbin/swapon -s")),
- "\n", // Comment
- true, // read-only
- (`Tuple (
- `Choice (
- [ "/dev", `Sequence (`Name(`String("^ \t")), `Value(`String("^\n"))) ],
- [ "", `String("^\n") ]
- ),
- `Continue ("\n")
- ))
- )
-)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/agents-scr/sysconfig_storage.scr new/yast2-storage-2.16.16/agents-scr/sysconfig_storage.scr
--- old/yast2-storage-2.16.15/agents-scr/sysconfig_storage.scr 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.16.16/agents-scr/sysconfig_storage.scr 2008-03-30 12:07:49.000000000 +0200
@@ -0,0 +1,20 @@
+/**
+ * File:
+ * sysconfig_storage.scr
+ * Summary:
+ * SCR Agent for reading/writing /etc/sysconfig/storage
+ * Access:
+ * read/write
+ * Authors:
+ * Thomas Fehr
+ *
+ * $Id$
+ *
+ * Read/Sets the values defined in <tt>/etc/sysconfig/storage</tt>
+ * in an easy manner.
+ */
+.sysconfig.storage
+
+`ag_ini(
+ `SysConfigFile("/etc/sysconfig/storage")
+)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/configure new/yast2-storage-2.16.16/configure
--- old/yast2-storage-2.16.15/configure 2008-03-25 18:04:07.000000000 +0100
+++ new/yast2-storage-2.16.16/configure 2008-04-08 17:18:00.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.16.13.
+# Generated by GNU Autoconf 2.61 for yast2-storage 2.16.16.
#
# 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.16.13'
-PACKAGE_STRING='yast2-storage 2.16.13'
+PACKAGE_VERSION='2.16.16'
+PACKAGE_STRING='yast2-storage 2.16.16'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1441,7 +1441,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.16.13 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.16.16 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1512,7 +1512,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.16.13:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.16.16:";;
esac
cat <<\_ACEOF
@@ -1618,7 +1618,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.16.13
+yast2-storage configure 2.16.16
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1632,7 +1632,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.16.13, which was
+It was created by yast2-storage $as_me 2.16.16, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2453,7 +2453,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.16.13'
+ VERSION='2.16.16'
cat >>confdefs.h <<_ACEOF
@@ -2681,7 +2681,7 @@
-VERSION="2.16.13"
+VERSION="2.16.16"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
@@ -21039,7 +21039,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.16.13, which was
+This file was extended by yast2-storage $as_me 2.16.16, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21092,7 +21092,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-storage config.status 2.16.13
+yast2-storage config.status 2.16.16
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.16.15/configure.in new/yast2-storage-2.16.16/configure.in
--- old/yast2-storage-2.16.15/configure.in 2008-03-25 18:03:57.000000000 +0100
+++ new/yast2-storage-2.16.16/configure.in 2008-04-08 17:17:50.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.16.13, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.16.16, 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.16.13"
+VERSION="2.16.16"
RPMNAME="yast2-storage"
MAINTAINER="Arvin Schnell "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/libstorage/src/EvmsCo.cc new/yast2-storage-2.16.16/libstorage/src/EvmsCo.cc
--- old/yast2-storage-2.16.15/libstorage/src/EvmsCo.cc 2008-02-27 16:39:20.000000000 +0100
+++ new/yast2-storage-2.16.16/libstorage/src/EvmsCo.cc 2008-04-04 21:05:20.000000000 +0200
@@ -1247,6 +1247,7 @@
bool ret = access( EXEC_PATH, X_OK )==0 &&
getenv( "YAST2_STORAGE_NO_EVMS" )==NULL &&
!Storage::getNoEv();
+ ret = false; // hard disable EVMS
y2mil( "ret:" << ret );
return( ret );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/libstorage/src/Md.cc new/yast2-storage-2.16.16/libstorage/src/Md.cc
--- old/yast2-storage-2.16.15/libstorage/src/Md.cc 2008-02-08 10:13:59.000000000 +0100
+++ new/yast2-storage-2.16.16/libstorage/src/Md.cc 2008-03-31 11:14:46.000000000 +0200
@@ -71,7 +71,7 @@
if( (pos=line.find_first_of( app_ws ))!=string::npos )
{
tmp = line.substr( 0, pos );
- if( tmp=="(read-only)" || tmp=="inactive" )
+ if( tmp=="(read-only)" || tmp=="(auto-read-only)" || tmp=="inactive" )
{
setReadonly();
y2warning( "readonly or inactive md device %d", nr() );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/libstorage/src/Storage.cc new/yast2-storage-2.16.16/libstorage/src/Storage.cc
--- old/yast2-storage-2.16.15/libstorage/src/Storage.cc 2008-03-25 17:56:52.000000000 +0100
+++ new/yast2-storage-2.16.16/libstorage/src/Storage.cc 2008-04-04 22:57:20.000000000 +0200
@@ -1920,6 +1920,34 @@
}
int
+Storage::changeTunefsOptVolume( const string& device, const string& opts )
+ {
+ int ret = 0;
+ assertInit();
+ y2milestone( "device:%s opts:%s", device.c_str(), opts.c_str() );
+ VolIterator vol;
+ ContIterator cont;
+ if( readonly )
+ {
+ ret = STORAGE_CHANGE_READONLY;
+ }
+ else if( findVolume( device, cont, vol ) )
+ {
+ ret = vol->setTunefsOption( opts );
+ }
+ else
+ {
+ ret = STORAGE_VOLUME_NOT_FOUND;
+ }
+ if( ret==0 )
+ {
+ ret = checkCache();
+ }
+ y2milestone( "ret:%d", ret );
+ return( ret );
+ }
+
+int
Storage::changeDescText( const string& device, const string& txt )
{
int ret = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/libstorage/src/Storage.h new/yast2-storage-2.16.16/libstorage/src/Storage.h
--- old/yast2-storage-2.16.15/libstorage/src/Storage.h 2008-01-21 15:43:39.000000000 +0100
+++ new/yast2-storage-2.16.16/libstorage/src/Storage.h 2008-04-04 22:57:20.000000000 +0200
@@ -325,6 +325,7 @@
int changeLabelVolume( const string& device, const string& label );
int eraseLabelVolume( const string& device );
int changeMkfsOptVolume( const string& device, const string& opts );
+ int changeTunefsOptVolume( const string& device, const string& opts );
int changeDescText( const string& device, const string& txt );
int changeMountPoint( const string& device, const string& mount );
int getMountPoint( const string& device, string& mount );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/libstorage/src/StorageInterface.h new/yast2-storage-2.16.16/libstorage/src/StorageInterface.h
--- old/yast2-storage-2.16.15/libstorage/src/StorageInterface.h 2008-02-08 10:13:59.000000000 +0100
+++ new/yast2-storage-2.16.16/libstorage/src/StorageInterface.h 2008-04-04 19:34:43.000000000 +0200
@@ -250,6 +250,7 @@
string uuid;
string label;
string mkfs_options;
+ string tunefs_options;
string loop;
string dtxt;
EncryptType encryption;
@@ -1116,6 +1117,15 @@
virtual int changeMkfsOptVolume( const string& device, const string& opts ) = 0;
/**
+ * Sets the value of tunefs options.
+ *
+ * @param device name of volume, e.g. /dev/hda1
+ * @param opts options for tunefs command
+ * @return zero if all is ok, a negative number to indicate an error
+ */
+ virtual int changeTunefsOptVolume( const string& device, const string& opts ) = 0;
+
+ /**
* Changes the mount point of a volume
*
* @param device name of volume, e.g. /dev/hda1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/libstorage/src/Volume.cc new/yast2-storage-2.16.16/libstorage/src/Volume.cc
--- old/yast2-storage-2.16.15/libstorage/src/Volume.cc 2008-03-03 16:29:52.000000000 +0100
+++ new/yast2-storage-2.16.16/libstorage/src/Volume.cc 2008-04-04 16:54:35.000000000 +0200
@@ -481,6 +481,7 @@
{
fs = detected_fs;
mkfs_opt = "";
+ tunefs_opt = "";
}
else
{
@@ -799,21 +800,24 @@
}
if( ret==0 && fs==EXT3 )
{
- string cmd = "/sbin/tune2fs -c 500 -i 2m " + mountDevice();
- SystemCmd c( cmd );
- if( c.retcode()!=0 )
- ret = VOLUME_TUNE2FS_FAILED;
+ if (!tunefs_opt.empty())
+ {
+ string cmd = "/sbin/tune2fs " + tunefs_opt + " " + mountDevice();
+ SystemCmd c( cmd );
+ if( c.retcode()!=0 )
+ ret = VOLUME_TUNE2FS_FAILED;
+ }
if( ret==0 && mp=="/" &&
(fstab_opt.find( "data=writeback" )!=string::npos ||
fstab_opt.find( "data=journal" )!=string::npos) )
{
- cmd = "/sbin/tune2fs -o ";
+ string cmd = "/sbin/tune2fs -o ";
if( fstab_opt.find( "data=writeback" )!=string::npos )
cmd += "journal_data_writeback ";
else
cmd += "journal_data ";
cmd += mountDevice();
- c.execute( cmd );
+ SystemCmd c( cmd );
if( c.retcode()!=0 )
ret = VOLUME_TUNE2FS_FAILED;
}
@@ -2678,6 +2682,7 @@
info.format = format;
info.create = create;
info.mkfs_options = mkfs_opt;
+ info.tunefs_options = tunefs_opt;
info.dtxt = dtxt;
info.loop = loop_dev;
info.is_mounted = is_mounted;
@@ -2835,6 +2840,10 @@
if( v.mkfs_opt.length()>0 )
{
s << " mkfsopt:" << v.mkfs_opt;
+ }
+ if( v.tunefs_opt.length()>0 )
+ {
+ s << " tunefsopt:" << v.tunefs_opt;
}
if( v.dtxt.length()>0 )
{
@@ -2960,6 +2969,8 @@
ret += " orig_fstopt:" + orig_fstab_opt + "-->" + rhs.orig_fstab_opt;
if( mkfs_opt!=rhs.mkfs_opt )
ret += " mkfsopt:" + mkfs_opt + "-->" + rhs.mkfs_opt;
+ if( tunefs_opt!=rhs.tunefs_opt )
+ ret += " tunefsopt:" + tunefs_opt + "-->" + rhs.tunefs_opt;
if( dtxt!=rhs.dtxt )
ret += " dtxt:" + dtxt + "-->" + rhs.dtxt;
if( is_loop!=rhs.is_loop )
@@ -3005,7 +3016,7 @@
fs==rhs.fs && mount_by==rhs.mount_by &&
uuid==rhs.uuid && label==rhs.label && mp==rhs.mp &&
fstab_opt==rhs.fstab_opt && mkfs_opt==rhs.mkfs_opt &&
- dtxt==rhs.dtxt &&
+ tunefs_opt==rhs.tunefs_opt && dtxt==rhs.dtxt &&
is_loop==rhs.is_loop && loop_active==rhs.loop_active &&
is_mounted==rhs.is_mounted && encryption==rhs.encryption &&
loop_dev==rhs.loop_dev && fstab_loop_dev==rhs.fstab_loop_dev &&
@@ -3041,6 +3052,7 @@
fstab_opt = rhs.fstab_opt;
orig_fstab_opt = rhs.orig_fstab_opt;
mkfs_opt = rhs.mkfs_opt;
+ tunefs_opt = rhs.tunefs_opt;
dtxt = rhs.dtxt;
is_loop = rhs.is_loop;
loop_active = rhs.loop_active;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/libstorage/src/Volume.h new/yast2-storage-2.16.16/libstorage/src/Volume.h
--- old/yast2-storage-2.16.15/libstorage/src/Volume.h 2007-12-19 17:18:16.000000000 +0100
+++ new/yast2-storage-2.16.16/libstorage/src/Volume.h 2008-04-04 10:21:33.000000000 +0200
@@ -99,6 +99,8 @@
bool needFstabUpdate() const;
const string& getMkfsOption() const { return mkfs_opt; }
int setMkfsOption( const string& val ) { mkfs_opt=val; return 0; }
+ const string& getTunefsOption() const { return tunefs_opt; }
+ int setTunefsOption( const string& val ) { tunefs_opt=val; return 0; }
const string& getDescText() const { return dtxt; }
int setDescText( const string& val ) { dtxt=val; return 0; }
const std::list<string>& altNames() const { return( alt_names ); }
@@ -252,6 +254,7 @@
string fstab_opt;
string orig_fstab_opt;
string mkfs_opt;
+ string tunefs_opt;
bool is_loop;
bool is_mounted;
bool ignore_fstab;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/storage/src/include/auto_part_ui.ycp new/yast2-storage-2.16.16/storage/src/include/auto_part_ui.ycp
--- old/yast2-storage-2.16.15/storage/src/include/auto_part_ui.ycp 2008-01-21 15:43:40.000000000 +0100
+++ new/yast2-storage-2.16.16/storage/src/include/auto_part_ui.ycp 2008-04-08 17:15:51.000000000 +0200
@@ -9,7 +9,7 @@
*
*
*
- * $Id: auto_part_ui.ycp 43636 2008-01-15 17:25:46Z fehr $
+ * $Id: auto_part_ui.ycp 46246 2008-04-08 15:15:51Z aschnell $
*
* used globals:
*
@@ -65,8 +65,12 @@
return sformat( _("&%1: %2, unassigned"), nr, size_str );
else
// list of partition checkboxes: show partition as assigned
- return sformat( "&%1: %2, %3 (%4)", nr, size_str,
- pentry["fstype"]:"", pentry["device"]:"" );
+ if (pentry["label"]:"" == "")
+ return sformat( "&%1: %2, %3 (%4)", nr, size_str,
+ pentry["fstype"]:"", pentry["device"]:"" );
+ else
+ return sformat( "&%1: %2, %3 (%4, LABEL=%5)", nr, size_str,
+ pentry["fstype"]:"", pentry["device"]:"", pentry["label"]:"" );
};
define boolean ask_free_space () ``{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/storage/src/inst_custom_part.ycp new/yast2-storage-2.16.16/storage/src/inst_custom_part.ycp
--- old/yast2-storage-2.16.15/storage/src/inst_custom_part.ycp 2008-02-13 11:15:05.000000000 +0100
+++ new/yast2-storage-2.16.16/storage/src/inst_custom_part.ycp 2008-03-27 16:39:59.000000000 +0100
@@ -26,7 +26,7 @@
*
*************************************************************
- $Id: inst_custom_part.ycp 43636 2008-01-15 17:25:46Z fehr $
+ $Id: inst_custom_part.ycp 45804 2008-03-27 15:39:59Z aschnell $
*/
{
@@ -2650,13 +2650,12 @@
if( Stage::initial () )
{
back_label = Label::BackButton();
- next_label = Label::AcceptButton();
+ next_label = Label::NextButton();
}
else
{
- back_label = Label::QuitButton();
- // button text
- next_label = _("&Apply");
+ back_label = Label::CancelButton();
+ next_label = Label::OKButton();
Wizard::HideAbortButton();
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.16.15/VERSION new/yast2-storage-2.16.16/VERSION
--- old/yast2-storage-2.16.15/VERSION 2008-03-26 17:18:42.000000000 +0100
+++ new/yast2-storage-2.16.16/VERSION 2008-04-08 17:13:29.000000000 +0200
@@ -1 +1 @@
-2.16.15
+2.16.16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org