Hello community,
here is the log from the commit of package yast2-nfs-client
checked in at Thu Aug 7 01:40:18 CEST 2008.
--------
--- yast2-nfs-client/yast2-nfs-client.changes 2008-05-16 21:55:01.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-nfs-client/yast2-nfs-client.changes 2008-08-06 21:23:08.506434000 +0200
@@ -1,0 +2,8 @@
+Wed Aug 6 15:25:16 CEST 2008 - kmachalkova@suse.cz
+
+- Create correct fstab entries when importing data from AY profile
+ (regression from FaTE #302031 - now we need to store also fstype
+ info - nfs vs. nfsv4) (bnc#395850)
+- 2.17.0
+
+-------------------------------------------------------------------
Old:
----
yast2-nfs-client-2.16.1.tar.bz2
New:
----
yast2-nfs-client-2.17.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nfs-client.spec ++++++
--- /var/tmp/diff_new_pack.N29292/_old 2008-08-07 01:40:12.000000000 +0200
+++ /var/tmp/diff_new_pack.N29292/_new 2008-08-07 01:40:12.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-nfs-client (Version 2.16.1)
+# spec file for package yast2-nfs-client (Version 2.17.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-nfs-client
-Version: 2.16.1
-Release: 19
+Version: 2.17.0
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nfs-client-2.16.1.tar.bz2
+Source0: yast2-nfs-client-2.17.0.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
#Hostname::CurrentDomain
@@ -44,7 +51,7 @@
Martin Vidner
%prep
-%setup -n yast2-nfs-client-2.16.1
+%setup -n yast2-nfs-client-2.17.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -87,6 +94,11 @@
%doc %{prefix}/share/doc/packages/yast2-nfs-client
/usr/share/YaST2/schema/autoyast/rnc/nfs.rnc
%changelog
+* Wed Aug 06 2008 kmachalkova@suse.cz
+- Create correct fstab entries when importing data from AY profile
+ (regression from FaTE #302031 - now we need to store also fstype
+ info - nfs vs. nfsv4) (bnc#395850)
+- 2.17.0
* Fri May 16 2008 jsrain@suse.cz
- added categories Settings and System into desktop file
(bnc #382778)
++++++ yast2-nfs-client-2.16.1.tar.bz2 -> yast2-nfs-client-2.17.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/configure new/yast2-nfs-client-2.17.0/configure
--- old/yast2-nfs-client-2.16.1/configure 2008-05-16 22:26:53.000000000 +0200
+++ new/yast2-nfs-client-2.17.0/configure 2008-04-14 19:16:20.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-nfs-client 2.16.1.
+# Generated by GNU Autoconf 2.61 for yast2-nfs-client 2.16.0.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-nfs-client'
PACKAGE_TARNAME='yast2-nfs-client'
-PACKAGE_VERSION='2.16.1'
-PACKAGE_STRING='yast2-nfs-client 2.16.1'
+PACKAGE_VERSION='2.16.0'
+PACKAGE_STRING='yast2-nfs-client 2.16.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1199,7 +1199,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-nfs-client 2.16.1 to adapt to many kinds of systems.
+\`configure' configures yast2-nfs-client 2.16.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1270,7 +1270,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-nfs-client 2.16.1:";;
+ short | recursive ) echo "Configuration of yast2-nfs-client 2.16.0:";;
esac
cat <<\_ACEOF
@@ -1348,7 +1348,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-nfs-client configure 2.16.1
+yast2-nfs-client configure 2.16.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1362,7 +1362,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-nfs-client $as_me 2.16.1, which was
+It was created by yast2-nfs-client $as_me 2.16.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2183,7 +2183,7 @@
# Define the identity of the package.
PACKAGE='yast2-nfs-client'
- VERSION='2.16.1'
+ VERSION='2.16.0'
cat >>confdefs.h <<_ACEOF
@@ -2411,7 +2411,7 @@
-VERSION="2.16.1"
+VERSION="2.16.0"
RPMNAME="yast2-nfs-client"
MAINTAINER="Katarina Machalkova "
@@ -3399,7 +3399,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-nfs-client $as_me 2.16.1, which was
+This file was extended by yast2-nfs-client $as_me 2.16.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3442,7 +3442,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-nfs-client config.status 2.16.1
+yast2-nfs-client config.status 2.16.0
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-nfs-client-2.16.1/configure.in new/yast2-nfs-client-2.17.0/configure.in
--- old/yast2-nfs-client-2.16.1/configure.in 2008-05-16 22:26:50.000000000 +0200
+++ new/yast2-nfs-client-2.17.0/configure.in 2008-04-14 19:16:15.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-nfs-client, 2.16.1, http://bugs.opensuse.org/, yast2-nfs-client)
+AC_INIT(yast2-nfs-client, 2.16.0, http://bugs.opensuse.org/, yast2-nfs-client)
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.1"
+VERSION="2.16.0"
RPMNAME="yast2-nfs-client"
MAINTAINER="Katarina Machalkova "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/src/nfs.rnc new/yast2-nfs-client-2.17.0/src/nfs.rnc
--- old/yast2-nfs-client-2.16.1/src/nfs.rnc 2005-09-23 16:09:30.000000000 +0200
+++ new/yast2-nfs-client-2.17.0/src/nfs.rnc 2008-08-06 15:17:38.000000000 +0200
@@ -4,6 +4,7 @@
element nfs_entry {
element server_path { text }
& element mount_point { text }
+ & element vfstype {text}?
& element nfs_options { text }
}*
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/src/Nfs.ycp new/yast2-nfs-client-2.17.0/src/Nfs.ycp
--- old/yast2-nfs-client-2.16.1/src/Nfs.ycp 2008-04-15 10:45:19.000000000 +0200
+++ new/yast2-nfs-client-2.17.0/src/Nfs.ycp 2008-08-06 15:36:16.000000000 +0200
@@ -13,7 +13,7 @@
* Dan Vesely
* Martin Vidner
*
- * $Id: Nfs.ycp 46643 2008-04-15 08:45:19Z kmachalkova $
+ * $Id: Nfs.ycp 49768 2008-08-06 13:06:54Z kmachalkova $
*/
{
@@ -82,6 +82,7 @@
return($[
"spec":entry["server_path"]:"",
"file":entry["mount_point"]:"",
+ "vfstype":entry["vfstype"]:"",
"mntops":entry["nfs_options"]:""
]);
});
@@ -106,12 +107,23 @@
missing = true;
}
});
+
+ //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts
+ //thus we need to keep info on nfs version (v3 vs. v4)
+ //But older AY profiles might not contain this element
+ //so let's assume nfsv3 in that case (#395850)
+ if ( !haskey(s, "vfstype") )
+ {
+ s["vfstype"] = "nfs";
+ }
+
});
if (missing)
{
return false;
}
+
Set(settings);
return true;
}
@@ -125,6 +137,7 @@
return($[
"server_path":entry["spec"]:"",
"mount_point":entry["file"]:"",
+ "vfstype" :entry["vfstype"]:"",
"nfs_options":entry["mntops"]:""
]);
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/src/ui.ycp new/yast2-nfs-client-2.17.0/src/ui.ycp
--- old/yast2-nfs-client-2.16.1/src/ui.ycp 2008-04-15 10:45:19.000000000 +0200
+++ new/yast2-nfs-client-2.17.0/src/ui.ycp 2008-08-06 15:50:15.000000000 +0200
@@ -13,7 +13,7 @@
* Dan Vesely
* Martin Vidner
*
- * $Id: ui.ycp 46643 2008-04-15 08:45:19Z kmachalkova $
+ * $Id: ui.ycp 49770 2008-08-06 13:20:53Z kmachalkova $
*
* Network NFS client dialogs
*
@@ -218,7 +218,8 @@
`HSpacing(1),
`VBox(
`VSpacing(0.2),
- TextAndButton (
+ `HBox(
+ TextAndButton (
`ComboBox(
`id(`serverent),`opt(`editable),
// text entry label
@@ -228,7 +229,7 @@
// appears in help text too
`PushButton (`id (`choose), _("Choo&se"))
),
- `HBox(
+ `HSpacing(0.5),
TextAndButton (
`TextEntry(`id(`pathent),
// textentry label
@@ -238,8 +239,9 @@
// make it short
// appears in help text too
`PushButton (`id (`pathent_list), _("&Select"))
- ),
- `HSpacing(0.5),
+ )
+ ),
+ `Left(
TextAndButton (
`TextEntry(`id(`mountent),
// textentry label
@@ -252,7 +254,7 @@
),
// textentry label
`VSpacing(0.2),
- `CheckBox(`id(`nfs4), "NFS&v4 Share", nfs4),
+ `Left( `CheckBox(`id(`nfs4), "NFS&v4 Share", nfs4)),
`TextEntry(`id(`optionsent), _("O&ptions"), options),
`VSpacing(0.2),
`HBox(
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-nfs-client-2.16.1/VERSION new/yast2-nfs-client-2.17.0/VERSION
--- old/yast2-nfs-client-2.16.1/VERSION 2008-04-15 10:57:36.000000000 +0200
+++ new/yast2-nfs-client-2.17.0/VERSION 2008-08-06 21:50:40.000000000 +0200
@@ -1 +1 @@
-2.16.1
+2.17.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org