Hello community,
here is the log from the commit of package yast2-storage
checked in at Mon Aug 20 17:45:42 CEST 2007.
--------
--- yast2-storage/yast2-storage.changes 2007-08-06 18:08:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2007-08-20 17:01:32.000000000 +0200
@@ -1,0 +2,32 @@
+Mon Aug 20 17:01:27 CEST 2007 - fehr@suse.de
+
+- initialize suggested mount points not at module import (#300280)
+- version 2.15.21
+
+-------------------------------------------------------------------
+Thu Aug 16 18:29:25 CEST 2007 - fehr@suse.de
+
+- fix wrong order of commit actions (#301002)
+
+-------------------------------------------------------------------
+Wed Aug 15 14:13:26 CEST 2007 - aschnell@suse.de
+
+- added fillup template (bug #300065)
+
+-------------------------------------------------------------------
+Mon Aug 13 16:32:46 CEST 2007 - fehr@suse.de
+
+- make sure also swap activated before YaST2 gets into fstab (#299550)
+
+-------------------------------------------------------------------
+Thu Aug 9 16:03:01 CEST 2007 - fehr@suse.de
+
+- fix problems caused by using dmcrypt instead of losetup for
+ encryption (#258222)
+
+-------------------------------------------------------------------
+Tue Aug 7 12:19:26 CEST 2007 - fehr@suse.de
+
+- install packages needed for formatting of filesystems (#297645)
+
+-------------------------------------------------------------------
@@ -10 +42 @@
-- allow mount-by-uuid for swap devices
+- allow mount-by-uuid for swap devices
Old:
----
yast2-storage-2.15.20.tar.bz2
New:
----
yast2-storage-2.15.21.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-storage.spec ++++++
--- /var/tmp/diff_new_pack.Y30805/_old 2007-08-20 17:44:41.000000000 +0200
+++ /var/tmp/diff_new_pack.Y30805/_new 2007-08-20 17:44:41.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-storage (Version 2.15.20)
+# spec file for package yast2-storage (Version 2.15.21)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-storage
-Version: 2.15.20
+Version: 2.15.21
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-storage-2.15.20.tar.bz2
+Source0: yast2-storage-2.15.21.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-installation yast2-perl-bindings yast2-testsuite
# Required only in inst-sys
@@ -44,7 +44,7 @@
%prep
-%setup -n yast2-storage-2.15.20
+%setup -n yast2-storage-2.15.21
%build
%{prefix}/bin/y2tool y2autoconf
@@ -69,6 +69,9 @@
%clean
rm -rf "$RPM_BUILD_ROOT"
+%post
+%{fillup_only -n storage}
+
%files
%defattr(-,root,root)
# storage
@@ -94,6 +97,7 @@
/usr/share/YaST2/clients/lvm_config.ycp
/usr/share/YaST2/clients/lvm_config_ui.ycp
/usr/share/YaST2/modules/*
+/var/adm/fillup-templates/sysconfig.storage
%dir /usr/share/YaST2/data
/usr/share/YaST2/data/*.ycp
%doc %dir %{prefix}/share/doc/packages/yast2-storage
@@ -171,6 +175,20 @@
%doc %{prefix}/share/doc/packages/yast2-storage/config.xml.description
%changelog
+* Mon Aug 20 2007 - fehr@suse.de
+- initialize suggested mount points not at module import (#300280)
+- version 2.15.21
+* Thu Aug 16 2007 - fehr@suse.de
+- fix wrong order of commit actions (#301002)
+* Wed Aug 15 2007 - aschnell@suse.de
+- added fillup template (bug #300065)
+* Mon Aug 13 2007 - fehr@suse.de
+- make sure also swap activated before YaST2 gets into fstab (#299550)
+* Thu Aug 09 2007 - fehr@suse.de
+- fix problems caused by using dmcrypt instead of losetup for
+ encryption (#258222)
+* Tue Aug 07 2007 - fehr@suse.de
+- install packages needed for formatting of filesystems (#297645)
* Mon Aug 06 2007 - fehr@suse.de
- add locale option to ntfs-3g entries in fstab (#297607)
- version 2.15.20
++++++ yast2-storage-2.15.20.tar.bz2 -> yast2-storage-2.15.21.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/configure new/yast2-storage-2.15.21/configure
--- old/yast2-storage-2.15.20/configure 2007-07-16 19:40:23.000000000 +0200
+++ new/yast2-storage-2.15.21/configure 2007-08-15 16:16:05.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.15.18.
+# Generated by GNU Autoconf 2.61 for yast2-storage 2.15.20.
#
# 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.15.18'
-PACKAGE_STRING='yast2-storage 2.15.18'
+PACKAGE_VERSION='2.15.20'
+PACKAGE_STRING='yast2-storage 2.15.20'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1447,7 +1447,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.15.18 to adapt to many kinds of systems.
+\`configure' configures yast2-storage 2.15.20 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1518,7 +1518,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-storage 2.15.18:";;
+ short | recursive ) echo "Configuration of yast2-storage 2.15.20:";;
esac
cat <<\_ACEOF
@@ -1628,7 +1628,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-storage configure 2.15.18
+yast2-storage configure 2.15.20
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1642,7 +1642,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.15.18, which was
+It was created by yast2-storage $as_me 2.15.20, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2463,7 +2463,7 @@
# Define the identity of the package.
PACKAGE='yast2-storage'
- VERSION='2.15.18'
+ VERSION='2.15.20'
cat >>confdefs.h <<_ACEOF
@@ -2690,7 +2690,7 @@
-VERSION="2.15.18"
+VERSION="2.15.20"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
@@ -20842,7 +20842,7 @@
PERL_VENDORARCH=`perl -V:vendorarch | sed "s!.*='!!;s!'.*!!"`
-ac_config_files="$ac_config_files Makefile agents-scr/Makefile controller/doc/autodocs/Makefile controller/doc/Makefile controller/src/Makefile controller/Makefile disk/doc/autodocs/Makefile disk/doc/Makefile disk/src/Makefile disk/Makefile libstorage/doc/autodocs/Makefile libstorage/doc/Makefile libstorage/src/Makefile libstorage/bindings/ycp/Makefile libstorage/bindings/Makefile libstorage/testsuite/lib/Makefile libstorage/testsuite/config/Makefile libstorage/testsuite/libstorage.test/Makefile libstorage/testsuite/single.out/Makefile libstorage/testsuite/data/Makefile libstorage/testsuite/Makefile libstorage/testsuite-real/Makefile libstorage/examples/Makefile libstorage/Makefile lvm/doc/autodocs/Makefile lvm/doc/Makefile lvm/src/Makefile lvm/Makefile scripts/Makefile storage/data/Makefile storage/doc/autodocs/Makefile storage/doc/Makefile storage/src/include/Makefile storage/src/modules/Makefile storage/src/proposal/Makefile storage/src/Makefile storage/Makefile"
+ac_config_files="$ac_config_files Makefile agents-scr/Makefile controller/doc/autodocs/Makefile controller/doc/Makefile controller/src/Makefile controller/Makefile data/Makefile disk/doc/autodocs/Makefile disk/doc/Makefile disk/src/Makefile disk/Makefile libstorage/doc/autodocs/Makefile libstorage/doc/Makefile libstorage/src/Makefile libstorage/bindings/ycp/Makefile libstorage/bindings/Makefile libstorage/testsuite/lib/Makefile libstorage/testsuite/config/Makefile libstorage/testsuite/libstorage.test/Makefile libstorage/testsuite/single.out/Makefile libstorage/testsuite/data/Makefile libstorage/testsuite/Makefile libstorage/testsuite-real/Makefile libstorage/examples/Makefile libstorage/Makefile lvm/doc/autodocs/Makefile lvm/doc/Makefile lvm/src/Makefile lvm/Makefile scripts/Makefile storage/data/Makefile storage/doc/autodocs/Makefile storage/doc/Makefile storage/src/include/Makefile storage/src/modules/Makefile storage/src/proposal/Makefile storage/src/Makefile storage/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -21282,7 +21282,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.15.18, which was
+This file was extended by yast2-storage $as_me 2.15.20, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21335,7 +21335,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-storage config.status 2.15.18
+yast2-storage config.status 2.15.20
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -21457,6 +21457,7 @@
"controller/doc/Makefile") CONFIG_FILES="$CONFIG_FILES controller/doc/Makefile" ;;
"controller/src/Makefile") CONFIG_FILES="$CONFIG_FILES controller/src/Makefile" ;;
"controller/Makefile") CONFIG_FILES="$CONFIG_FILES controller/Makefile" ;;
+ "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
"disk/doc/autodocs/Makefile") CONFIG_FILES="$CONFIG_FILES disk/doc/autodocs/Makefile" ;;
"disk/doc/Makefile") CONFIG_FILES="$CONFIG_FILES disk/doc/Makefile" ;;
"disk/src/Makefile") CONFIG_FILES="$CONFIG_FILES disk/src/Makefile" ;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/configure.in new/yast2-storage-2.15.21/configure.in
--- old/yast2-storage-2.15.20/configure.in 2007-07-16 19:40:08.000000000 +0200
+++ new/yast2-storage-2.15.21/configure.in 2007-08-15 16:15:35.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-storage
dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.2 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-storage, 2.15.18, http://bugs.opensuse.org/, yast2-storage)
+AC_INIT(yast2-storage, 2.15.20, http://bugs.opensuse.org/, yast2-storage)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.18"
+VERSION="2.15.20"
RPMNAME="yast2-storage"
MAINTAINER="Thomas Fehr "
@@ -196,6 +196,7 @@
controller/doc/Makefile
controller/src/Makefile
controller/Makefile
+data/Makefile
disk/doc/autodocs/Makefile
disk/doc/Makefile
disk/src/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/data/Makefile.am new/yast2-storage-2.15.21/data/Makefile.am
--- old/yast2-storage-2.15.20/data/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.15.21/data/Makefile.am 2007-08-15 16:15:24.000000000 +0200
@@ -0,0 +1,10 @@
+#
+# Makefile.am for storage/data
+#
+
+fillup_DATA = \
+ sysconfig.storage
+
+EXTRA_DIST = $(fillup_DATA)
+
+include $(top_srcdir)/Makefile.am.common
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/data/Makefile.in new/yast2-storage-2.15.21/data/Makefile.in
--- old/yast2-storage-2.15.20/data/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.15.21/data/Makefile.in 2007-08-15 16:16:20.000000000 +0200
@@ -0,0 +1,475 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# Makefile.am for storage/data
+#
+
+# Makefile.am.common -*- Makefile -*-
+# Generated file, do not edit!
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/Makefile.am.common
+subdir = data
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(fillupdir)" "$(DESTDIR)$(modulebindir)"
+fillupDATA_INSTALL = $(INSTALL_DATA)
+modulebinDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(fillup_DATA) $(modulebin_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AGENT_LIBADD = @AGENT_LIBADD@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINTAINER = @MAINTAINER@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL_CFLAGS = @PERL_CFLAGS@
+PERL_LDFLAGS = @PERL_LDFLAGS@
+PERL_VENDORARCH = @PERL_VENDORARCH@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+RANLIB = @RANLIB@
+RPMNAME = @RPMNAME@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+STYLESHEET_CSS = @STYLESHEET_CSS@
+STYLESHEET_HTML = @STYLESHEET_HTML@
+STYLESHEET_PDF = @STYLESHEET_PDF@
+STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@
+STYLESHEET_YDOC = @STYLESHEET_YDOC@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
+Y2UTIL_CFLAGS = @Y2UTIL_CFLAGS@
+Y2UTIL_LIBS = @Y2UTIL_LIBS@
+YCPC = @YCPC@
+YCPDOC = @YCPDOC@
+YCPMAKEDEP = @YCPMAKEDEP@
+YDOXYGEN = @YDOXYGEN@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+agentdir = @agentdir@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+clientdir = @clientdir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+desktopdir = @desktopdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+execcompdir = @execcompdir@
+fillupdir = @fillupdir@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+imagedir = @imagedir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moduledir = @moduledir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgconfigdatadir = @pkgconfigdatadir@
+pkgconfigdir = @pkgconfigdir@
+plugindir = @plugindir@
+potdir = @potdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+schemadir = @schemadir@
+scrconfdir = @scrconfdir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+themedir = @themedir@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+yast2dir = @yast2dir@
+ybindir = @ybindir@
+ydatadir = @ydatadir@
+yncludedir = @yncludedir@
+ystartupdir = @ystartupdir@
+fillup_DATA = \
+ sysconfig.storage
+
+EXTRA_DIST = $(fillup_DATA)
+modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA))
+modulebindir = $(moduledir)
+ybcfiles = $(filter %.ybc,$(modulebin_DATA))
+
+# files to clean
+CLEANFILES = ${ybcfiles}
+DISTCLEANFILES = .dep
+
+# Needs to be outside "." because of cases
+# where ycpchook contains a symlink to "."
+# Otherwise "." keeps being newer than .dep and we loop.
+NEWDEP = ${top_builddir}/.dep.new
+CHECK_SYNTAX = true
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/Makefile.am.common $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu data/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+install-fillupDATA: $(fillup_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(fillupdir)" || $(MKDIR_P) "$(DESTDIR)$(fillupdir)"
+ @list='$(fillup_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(fillupDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(fillupdir)/$$f'"; \
+ $(fillupDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(fillupdir)/$$f"; \
+ done
+
+uninstall-fillupDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(fillup_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(fillupdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(fillupdir)/$$f"; \
+ done
+install-modulebinDATA: $(modulebin_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(modulebindir)" || $(MKDIR_P) "$(DESTDIR)$(modulebindir)"
+ @list='$(modulebin_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(modulebinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(modulebindir)/$$f'"; \
+ $(modulebinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(modulebindir)/$$f"; \
+ done
+
+uninstall-modulebinDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(modulebin_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(modulebindir)/$$f'"; \
+ rm -f "$(DESTDIR)$(modulebindir)/$$f"; \
+ done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(fillupdir)" "$(DESTDIR)$(modulebindir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-fillupDATA install-modulebinDATA
+
+install-dvi: install-dvi-am
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-info: install-info-am
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-fillupDATA uninstall-modulebinDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ dist-hook distclean distclean-generic distclean-libtool \
+ distdir dvi dvi-am html html-am info info-am install \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-fillupDATA \
+ install-html install-html-am install-info install-info-am \
+ install-man install-modulebinDATA install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-fillupDATA uninstall-modulebinDATA
+
+
+# suffix mapping: info '(make)Static Usage'
+# apply only to our modules, not external ones
+${ybcfiles}: %.ybc: %.ycp $(ycpchook)
+ Y2DIR=$(YCPC_Y2DIR) LD_LIBRARY_PATH=$(YCPC_LD_LIBRARY_PATH) ${YCPC} -c -M. -I. -q $(YCPCFLAGS) $<
+# generate dependencies
+# two steps not to lose the file if the command fails
+# hook: create the links before we look for files
+.dep: $(wildcard *.ycp) ${ycpchook}
+ ${YCPMAKEDEP} --prefix=${prefix} ${YCPCFLAGS} > ${NEWDEP}
+ cat ${NEWDEP} > .dep
+ rm ${NEWDEP}
+
+dist-hook: check-syntax
+check-syntax: $(client_DATA) $(ycpchook)
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
+
+-include .dep
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/data/sysconfig.storage new/yast2-storage-2.15.21/data/sysconfig.storage
--- old/yast2-storage-2.15.20/data/sysconfig.storage 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-storage-2.15.21/data/sysconfig.storage 2007-08-15 16:15:24.000000000 +0200
@@ -0,0 +1,9 @@
+## Path: System/Yast2/Storage
+
+## Type: integer(0:1)
+# Setting for detailed view in expert partitioner.
+EXPERT_DETAIL=""
+
+## Type: string
+# List of used filesystem types.
+USED_FS_LIST=""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/libstorage/src/Disk.cc new/yast2-storage-2.15.21/libstorage/src/Disk.cc
--- old/yast2-storage-2.15.20/libstorage/src/Disk.cc 2007-08-01 11:44:51.000000000 +0200
+++ new/yast2-storage-2.15.21/libstorage/src/Disk.cc 2007-08-13 13:46:13.000000000 +0200
@@ -2156,7 +2156,7 @@
{
if( p->id()==Partition::ID_SWAP )
{
- cmd_line << "linux-swap\\(new\\) ";
+ cmd_line << "linux-swap ";
}
else if( p->id()==Partition::ID_GPT_BOOT ||
p->id()==Partition::ID_DOS16 ||
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/libstorage/src/Storage.cc new/yast2-storage-2.15.21/libstorage/src/Storage.cc
--- old/yast2-storage-2.15.20/libstorage/src/Storage.cc 2007-08-02 16:32:12.000000000 +0200
+++ new/yast2-storage-2.15.21/libstorage/src/Storage.cc 2007-08-16 16:11:30.000000000 +0200
@@ -3876,6 +3876,7 @@
}
b << "> ";
y2milestone( "%s", b.str().c_str() );
+ b.str("");
todo.sort( cont_less<commitAction>() );
y2milestone( "stage %d", stage );
b << "sorted co <";
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/libstorage/src/StorageTypes.h new/yast2-storage-2.15.21/libstorage/src/StorageTypes.h
--- old/yast2-storage-2.15.20/libstorage/src/StorageTypes.h 2007-07-24 15:50:20.000000000 +0200
+++ new/yast2-storage-2.15.21/libstorage/src/StorageTypes.h 2007-08-16 18:13:31.000000000 +0200
@@ -26,12 +26,12 @@
inline bool operator>=( CType a, CType b )
{
- return( !a( CType a, CType b )
{
- return( a!=b && !agetStorage()->instsys()||mp!=orig_mp||mp!="swap") )
{
// displayed text before action, %1$s is replaced by device name e.g. /dev/hda1
// %2$s is replaced by mount point e.g. /home
@@ -1601,7 +1602,8 @@
bool Volume::needFstabUpdate() const
{
bool ret = !ignore_fstab && !(mp.empty() && orig_mp.empty()) &&
- (fstab_opt!=orig_fstab_opt || mount_by!=orig_mount_by ||
+ ((cont->getStorage()->instsys()&&mp=="swap"&&mp==orig_mp) ||
+ fstab_opt!=orig_fstab_opt || mount_by!=orig_mount_by ||
encryption!=orig_encryption);
return( ret );
}
@@ -1654,33 +1656,33 @@
updateFsData();
if( detected_fs!=FSUNKNOWN )
{
- c.execute( "modprobe " + fs_names[detected_fs] );
- c.execute( "mount -oro -t " + fsTypeString(detected_fs) + " " +
- use_dev + " " + mpname );
- bool ok = c.retcode()==0;
+ string cmd;
+ switch( detected_fs )
+ {
+ case EXT2:
+ case EXT3:
+ cmd = "fsck.ext2 -n -f " + use_dev;
+ break;
+ case REISERFS:
+ cmd = "reiserfsck --yes --check -q " + use_dev;
+ break;
+ default:
+ cmd = "fsck -n -t " + fsTypeString(detected_fs) +
+ " " + use_dev;
+ break;
+ }
+ bool excTime, excLines;
+ c.executeRestricted( cmd, 15, 500, excTime, excLines );
+ bool ok = c.retcode()==0 || (excTime && !excLines);
+ y2milestone( "ok:%d retcode:%d excTime:%d excLines:%d",
+ ok, c.retcode(), excTime, excLines );
if( ok )
{
+ c.execute( "modprobe " + fs_names[detected_fs] );
+ c.execute( "mount -oro -t " + fsTypeString(detected_fs) + " " +
+ use_dev + " " + mpname );
+ ok = c.retcode()==0;
c.execute( "umount " + mpname );
- string cmd;
- switch( detected_fs )
- {
- case EXT2:
- case EXT3:
- cmd = "fsck.ext2 -n -f " + use_dev;
- break;
- case REISERFS:
- cmd = "reiserfsck --yes --check -q " + use_dev;
- break;
- default:
- cmd = "fsck -n -t " + fsTypeString(detected_fs) +
- " " + use_dev;
- break;
- }
- bool excTime, excLines;
- c.executeRestricted( cmd, 15, 500, excTime, excLines );
- ok = c.retcode()==0 || (excTime && !excLines);
- y2milestone( "ok:%d retcode:%d excTime:%d excLines:%d",
- ok, c.retcode(), excTime, excLines );
}
if( !ok )
{
@@ -2051,7 +2053,6 @@
int Volume::mount( const string& m, bool ro )
{
-
SystemCmd cmd;
y2milestone( "device:%s mp:%s ro:%d", dev.c_str(), m.c_str(), ro );
string cmdline;
@@ -2211,7 +2212,8 @@
l.push_back( new commitAction( FORMAT, cont->type(),
formatText(false), this, true ));
}
- else if( mp != orig_mp )
+ else if( mp != orig_mp ||
+ (cont->getStorage()->instsys()&&mp=="swap") )
{
l.push_back( new commitAction( MOUNT, cont->type(),
mountText(false), this, false ));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/Makefile.am new/yast2-storage-2.15.21/Makefile.am
--- old/yast2-storage-2.15.20/Makefile.am 2007-07-16 19:40:08.000000000 +0200
+++ new/yast2-storage-2.15.21/Makefile.am 2007-08-15 16:15:36.000000000 +0200
@@ -214,4 +214,4 @@
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = agents-scr controller disk libstorage lvm scripts storage
+SUBDIRS = agents-scr controller data disk libstorage lvm scripts storage
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/Makefile.in new/yast2-storage-2.15.21/Makefile.in
--- old/yast2-storage-2.15.20/Makefile.in 2007-07-16 19:40:33.000000000 +0200
+++ new/yast2-storage-2.15.21/Makefile.in 2007-08-15 16:16:27.000000000 +0200
@@ -279,7 +279,7 @@
# test ! -d $(srcdir)/po \
# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
-SUBDIRS = agents-scr controller disk libstorage lvm scripts storage
+SUBDIRS = agents-scr controller data disk libstorage lvm scripts storage
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.15.21/storage/src/include/custom_part_lib.ycp
--- old/yast2-storage-2.15.20/storage/src/include/custom_part_lib.ycp 2007-08-01 16:01:14.000000000 +0200
+++ new/yast2-storage-2.15.21/storage/src/include/custom_part_lib.ycp 2007-08-07 12:20:00.000000000 +0200
@@ -13,7 +13,7 @@
*
*************************************************************
*
- $Id: custom_part_lib.ycp 39874 2007-08-01 14:01:13Z fehr $
+ $Id: custom_part_lib.ycp 40052 2007-08-07 10:19:59Z fehr $
*
*/
@@ -586,6 +586,15 @@
return( ret );
}
+map pkg_for_fs = $[
+ `ext2 : [ "e2fsprogs" ],
+ `ext3 : [ "e2fsprogs" ],
+ `reiser : [ "reiserfs" ],
+ `vfat : [ "dosfstools" ],
+ `ntfs : [ "ntfsprogs" ],
+ `jfs : [ "jfsutils" ],
+ `xfs : [ "xfsprogs" ] ];
+
define map HandleFsChanged( boolean init, map new,
symbol old_fs, map file_systems )
``{
@@ -616,6 +625,17 @@
undo_change = Popup::YesNo(message);
}
+ if( !undo_change && !Stage::initial() )
+ {
+ if( size(pkg_for_fs[used_fs]:[])>0 )
+ {
+ boolean r = Package::InstallAll( pkg_for_fs[used_fs]:[] );
+ y2milestone( "HandleFsChanged install %1 ret:%2",
+ pkg_for_fs[used_fs]:[], r );
+ if( !r )
+ undo_change = true;
+ }
+ }
if( undo_change )
{
new["used_fs"] = old_fs;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/storage/src/include/partition_defines.ycp new/yast2-storage-2.15.21/storage/src/include/partition_defines.ycp
--- old/yast2-storage-2.15.20/storage/src/include/partition_defines.ycp 2007-05-23 12:45:16.000000000 +0200
+++ new/yast2-storage-2.15.21/storage/src/include/partition_defines.ycp 2007-08-20 17:01:51.000000000 +0200
@@ -12,7 +12,7 @@
* mike
*
*
- * $Id: partition_defines.ycp 33024 2006-09-21 11:13:35Z fehr $
+ * $Id: partition_defines.ycp 40364 2007-08-20 15:01:51Z fehr $
*
*/
@@ -136,7 +136,7 @@
``{
if( all_mountpoints == [] || all_mountpoints == nil )
{
- all_mountpoints = (list<string>)FileSystems::suggest_m_points;
+ all_mountpoints = FileSystems::SuggestMPoints();
}
@@ -221,7 +221,7 @@
define string GetMountPointProposal( map targetMap,
list not_supported_mount_points )
``{
- list<string> base = FileSystems::suggest_m_points;
+ list<string> base = FileSystems::SuggestMPoints();
base = filter( string mount_point, base,
``( !contains( not_supported_mount_points, mount_point )));
list free_list = filter( string point, base,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/storage/src/modules/FileSystems.ycp new/yast2-storage-2.15.21/storage/src/modules/FileSystems.ycp
--- old/yast2-storage-2.15.20/storage/src/modules/FileSystems.ycp 2007-08-06 14:02:14.000000000 +0200
+++ new/yast2-storage-2.15.21/storage/src/modules/FileSystems.ycp 2007-08-20 17:01:51.000000000 +0200
@@ -7,7 +7,7 @@
* These module contains the supported filesystems and their settings.
*
*
- * $Id: FileSystems.ycp 39990 2007-08-06 12:02:14Z fehr $
+ * $Id: FileSystems.ycp 40364 2007-08-20 15:01:51Z fehr $
*/
{
module "FileSystems";
@@ -58,13 +58,25 @@
global list<string> system_m_points = [ "/", "/usr", "/var", "/opt",
Partitions::BootMount() ];
global list<string> crypt_m_points = [ "/", Partitions::BootMount(), "/usr" ];
- global list<string> suggest_m_points = (list<string>)union( system_m_points,
- [ "/home", "/srv", "/tmp", "/local", ""] );
+ list<string> suggest_m_points = [];
global list<string> swap_m_points = [ "swap", "" ];
global list<string> tmp_m_mpoint = [ "/tmp", "/var/tmp" ];
global string nchars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+global list<string> SuggestMPoints()
+ {
+ if( size(suggest_m_points)==0 )
+ {
+ suggest_m_points = [ "/home", "/srv", "/tmp", "/local", ""];
+ if( Stage::initial() )
+ suggest_m_points = (list<string>)union( system_m_points,
+ suggest_m_points );
+ y2milestone( "SuggestMPoints init:%1", suggest_m_points );
+ }
+ return( suggest_m_points );
+ }
+
any lib_id = nil;
define list FstabOptionStrings =
@@ -637,7 +649,7 @@
`fsid_item : "0x83 Linux ",
`fstype : "Linux native" ,
`crypt : true ,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_option : "-t ext2",
`mount_string : "ext2",
`makefstype : "ext2",
@@ -653,7 +665,7 @@
`fsid_item : "0x0C Win95 FAT32 ",
`fstype : "Fat32",
`crypt : true ,
- `mountpoints : suggest_m_points ,
+ `mountpoints : SuggestMPoints() ,
`mount_option : "-t vfat",
`mount_string : "vfat",
`makefstype : "fat32",
@@ -670,7 +682,7 @@
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native",
`crypt : true,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_option : "-t reiserfs",
`mount_string : "reiserfs",
`needed_modules : [ "reiserfs" ],
@@ -686,7 +698,7 @@
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native" ,
`crypt : true,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_option : "-t xfs",
`mount_string : "xfs",
`needed_modules : [ "xfs" ],
@@ -701,7 +713,7 @@
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native" ,
`crypt : true,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_string : "jfs",
`mount_option : "-t jfs",
`needed_modules : [ "jfs" ],
@@ -716,7 +728,7 @@
`fsid_item : "0x83 Linux " ,
`fstype : "Linux native" ,
`crypt : true,
- `mountpoints : suggest_m_points,
+ `mountpoints : SuggestMPoints(),
`mount_string : "ext3",
`mount_option : "-t ext3",
`needed_modules : [ "jbd", "ext3" ],
@@ -937,11 +949,6 @@
support[`hfsplus] = true;
}
y2milestone( "support %1", support );
- suggest_m_points = [ "/home", "/srv", "/tmp", "/local", ""];
- if( Stage::initial() )
- suggest_m_points = (list<string>)union( system_m_points,
- suggest_m_points );
- y2milestone( "suggest_m_points:%1", suggest_m_points );
}
global define void InitSlib( any sint )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/storage/src/modules/Storage.ycp new/yast2-storage-2.15.21/storage/src/modules/Storage.ycp
--- old/yast2-storage-2.15.20/storage/src/modules/Storage.ycp 2007-08-01 18:31:13.000000000 +0200
+++ new/yast2-storage-2.15.21/storage/src/modules/Storage.ycp 2007-08-09 16:05:19.000000000 +0200
@@ -19,7 +19,7 @@
* wurde versucht "intelligent" zu gestallten und ist im einzelen bei den
* entspechenden Funktionen n�her erkl�rt.
*
- * $Id: Storage.ycp 39875 2007-08-01 15:45:29Z fehr $
+ * $Id: Storage.ycp 40131 2007-08-09 14:05:19Z fehr $
*/
{
@@ -4823,10 +4823,9 @@
}
else
{
- map curr = $[];
- curr = volumeMap( vinfo, curr );
- loop["loop_dev"] = curr["loop"]:"";
- y2milestone( "PerformLosetup loop:%1", loop["loop_dev"]:"" );
+ loop["loop_dev"] = "/dev/mapper/cr_" +
+ substring( device, findlastof( device, "/" )+1 );
+ y2milestone( "PerformLosetup crdev:%1", loop["loop_dev"]:"" );
}
SCR::Execute(.target.bash, "umount " + mdir );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-storage-2.15.20/VERSION new/yast2-storage-2.15.21/VERSION
--- old/yast2-storage-2.15.20/VERSION 2007-08-06 18:08:34.000000000 +0200
+++ new/yast2-storage-2.15.21/VERSION 2007-08-20 15:27:35.000000000 +0200
@@ -1 +1 @@
-2.15.20
+2.15.21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org