Mailinglist Archive: opensuse-commit (1826 mails)
| < Previous | Next > |
commit yast2-nfs-client
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 25 Sep 2008 01:05:31 +0200
- Message-id: <20080924230531.60042678159@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-nfs-client
checked in at Thu Sep 25 01:05:31 CEST 2008.
--------
--- yast2-nfs-client/yast2-nfs-client.changes 2008-09-08 14:28:05.000000000
+0200
+++ /mounts/work_src_done/STABLE/yast2-nfs-client/yast2-nfs-client.changes
2008-09-23 13:46:57.405003000 +0200
@@ -1,0 +2,9 @@
+Tue Sep 23 12:44:52 CEST 2008 - kmachalkova@xxxxxxx
+
+- Use rpcbind instead of portmap (preferably, if not there, fall
+ back to portmap) (bnc#423026)
+- Prompt user for confirmation of aborting the module if changes were
+ made (Get/SetModified)
+- 2.17.4
+
+-------------------------------------------------------------------
Old:
----
yast2-nfs-client-2.17.3.tar.bz2
New:
----
yast2-nfs-client-2.17.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nfs-client.spec ++++++
--- /var/tmp/diff_new_pack.UP2762/_old 2008-09-25 01:05:17.000000000 +0200
+++ /var/tmp/diff_new_pack.UP2762/_new 2008-09-25 01:05:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-nfs-client (Version 2.17.3)
+# spec file for package yast2-nfs-client (Version 2.17.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,16 +19,16 @@
Name: yast2-nfs-client
-Version: 2.17.3
+Version: 2.17.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nfs-client-2.17.3.tar.bz2
+Source0: yast2-nfs-client-2.17.4.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
yast2-testsuite
-#Hostname::CurrentDomain
-Requires: yast2 >= 2.16.48
+#Service::Find
+Requires: yast2 >= 2.17.27
#idmapd_conf agent
Requires: yast2-nfs-common
# showmount, #150382, #286300
@@ -53,7 +53,7 @@
Martin Vidner <mvidner@xxxxxxx>
%prep
-%setup -n yast2-nfs-client-2.17.3
+%setup -n yast2-nfs-client-2.17.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -97,6 +97,12 @@
%doc %{prefix}/share/doc/packages/yast2-nfs-client
/usr/share/YaST2/schema/autoyast/rnc/nfs.rnc
%changelog
+* Tue Sep 23 2008 kmachalkova@xxxxxxx
+- Use rpcbind instead of portmap (preferably, if not there, fall
+ back to portmap) (bnc#423026)
+- Prompt user for confirmation of aborting the module if changes were
+ made (Get/SetModified)
+- 2.17.4
* Mon Sep 08 2008 kmachalkova@xxxxxxx
- Necessary changes for having NFS read-write from partitioner
(FaTE#303326)
++++++ yast2-nfs-client-2.17.3.tar.bz2 -> yast2-nfs-client-2.17.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nfs-client-2.17.3/src/Nfs.ycp
new/yast2-nfs-client-2.17.4/src/Nfs.ycp
--- old/yast2-nfs-client-2.17.3/src/Nfs.ycp 2008-09-08 13:25:46.000000000
+0200
+++ new/yast2-nfs-client-2.17.4/src/Nfs.ycp 2008-09-23 13:04:07.000000000
+0200
@@ -13,7 +13,7 @@
* Dan Vesely <dan@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: Nfs.ycp 50786 2008-09-08 10:57:40Z kmachalkova $
+ * $Id: Nfs.ycp 51341 2008-09-19 16:44:21Z kmachalkova $
*/
{
@@ -21,6 +21,7 @@
textdomain "nfs";
+ import "Mode";;
import "Report";
import "Service";
import "Summary";
@@ -55,7 +56,7 @@
/**
* Required packages
*/
- global list <string> required_packages = ["portmap", "nfs-client"];
+ global list <string> required_packages = [ "nfs-client" ];
/**
* eg.: [ $["spec": "moon:/cheese", file: "/mooncheese", "mntopts":
"defaults"], ...]
@@ -69,7 +70,9 @@
global boolean nfs4_enabled = false;
- global string idmapd_domain = "";;
+ global string idmapd_domain = "";
+
+ string portmapper = "";
// list of created directories
list<string> created_dirs = [];
@@ -227,6 +230,14 @@
));
}
+ global string FindPortmapper() {
+ //testsuite is dumb - it can't distinguish between the existence
+ //of two services - either both exists or both do not
+ if (Mode::testsuite())
+ return "portmap";
+ return Service::Find( ["rpcbind", "portmap" ] );
+ }
+
/* ------------------------------------------------------------ */
/**
@@ -251,6 +262,14 @@
SuSEFirewall::Read ();
+ portmapper = FindPortmapper();
+ //There is neither rpcbind nor portmap
+ if ( portmapper == "" )
+ {
+ //so let's install rpcbind (default since #423026)
+ required_packages = add( required_packages, "rpcbind" );
+ portmapper = "rpcbind";
+ }
if (nfs4_enabled)
required_packages = add( required_packages, "nfsidmap");
@@ -310,7 +329,7 @@
if (size (nfs_entries) != 0)
{
- Service::Enable("portmap");
+ Service::Enable( portmapper );
Service::Enable("nfs");
// #36737: it just runs sm_notify at boot time
// replaces rpc.statd
@@ -367,10 +386,10 @@
Progress::NextStage ();
if (size (nfs_entries) > 0)
{
- if (Service::Status ("portmap") != 0)
+ if (Service::Status ( portmapper ) != 0)
{
// portmap must not be started if it is running already
(see bug # 9999)
- Service::Start("portmap");
+ Service::Start( portmapper );
}
Service::Start("nfs");
@@ -463,19 +482,21 @@
return nil;
}
+ string portmapper = FindPortmapper();
// check whether portmapper is installed
- if (IsPortmapInstalled() == false)
+ if (IsPortmapperInstalled( portmapper ) == false)
{
- y2warning("portmap is not installed");
+ y2warning("Neither rpcbind nor portmap is installed");
return nil;
}
+
// start portmapper if it isn't running
- if (Service::Status("portmap") != 0)
+ if (Service::Status( portmapper ) != 0)
{
- if (Service::Start("portmap") == false)
+ if (Service::Start( portmapper ) == false)
{
- y2warning("portmap cannot be started");
+ y2warning( sformat("%1 cannot be started", portmapper) );
return nil;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nfs-client-2.17.3/src/routines.ycp
new/yast2-nfs-client-2.17.4/src/routines.ycp
--- old/yast2-nfs-client-2.17.3/src/routines.ycp 2008-08-07
17:00:54.000000000 +0200
+++ new/yast2-nfs-client-2.17.4/src/routines.ycp 2008-09-19
19:10:25.000000000 +0200
@@ -12,7 +12,7 @@
* Jan Holesovsky <kendy@xxxxxxx>
* Dan Vesely <dan@xxxxxxx>
*
- * $Id: routines.ycp 49830 2008-08-07 14:28:34Z kmachalkova $
+ * $Id: routines.ycp 51341 2008-09-19 16:44:21Z kmachalkova $
*
* Network NFS routines
*
@@ -202,7 +202,7 @@
* Check whether pormap is installed, ask user to install it if it is
missing
* @return boolean true if portmap is installed
*/
- define boolean IsPortmapInstalled() ``{
- return Package::Install ("portmap");
+ define boolean IsPortmapperInstalled( string portmapper ) ``{
+ return Package::Install( portmapper );
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nfs-client-2.17.3/src/ui.ycp
new/yast2-nfs-client-2.17.4/src/ui.ycp
--- old/yast2-nfs-client-2.17.3/src/ui.ycp 2008-09-08 14:52:42.000000000
+0200
+++ new/yast2-nfs-client-2.17.4/src/ui.ycp 2008-09-23 13:08:17.000000000
+0200
@@ -13,7 +13,7 @@
* Dan Vesely <dan@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: ui.ycp 50800 2008-09-08 11:56:58Z kmachalkova $
+ * $Id: ui.ycp 51397 2008-09-23 10:42:25Z kmachalkova $
*
* Network NFS client dialogs
*
@@ -37,9 +37,7 @@
*/
symbol ReadDialog() {
boolean ret = nil;
- // move portmap check somewhere else?
- // this may be too early
- ret = IsPortmapInstalled () && Nfs::Read ();
+ ret = Nfs::Read ();
return ret ? `next : `abort;
}
@@ -550,6 +548,7 @@
{
nfs_entries = add (nfs_entries, entry);
modify_line = entry;
+ Nfs::SetModified();
}
UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
@@ -571,6 +570,7 @@
modify_line = entry;
UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
+ Nfs::SetModified();
}
}
else if (widget == `delbut && size (nfs_entries) > 0)
@@ -580,14 +580,15 @@
{
modify_line = share;
nfs_entries = remove (nfs_entries, entryno);
-
UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
+ Nfs::SetModified();
}
}
else if (widget == `enable_nfs4)
{
boolean enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),
`Value);
UI::ChangeWidget( `id(`nfs4_domain), `Enabled, enabled);
+ Nfs::SetModified();
}
else if ( widget == `settings )
{
@@ -612,8 +613,6 @@
define symbol FstabDialog () ``{
Wizard::SetScreenShotName ("nfs-client-1-fstab");
- boolean changed = false;
-
nfs_entries = Nfs::nfs_entries;
// dialog heading
@@ -622,13 +621,6 @@
Label::BackButton (),
Label::FinishButton ());
- // initialize the widget (set the current value)
- //CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
-
- //UI::ChangeWidget (`id(`editbut), `Enabled, false);
- //UI::ChangeWidget (`id(`delbut), `Enabled, false);
- //UI::ChangeWidget (`id(`enable_nfs4), `Value, Nfs::nfs4_enabled);
- //UI::ChangeWidget (`id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled);
InitFstabEntries();
map event = nil;
@@ -637,88 +629,13 @@
do
{
-
- /*if ( UI::WidgetExists(`id(`fstable)) )
- {
- entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);
- UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil);
- UI::ChangeWidget (`id(`delbut), `Enabled, entryno != nil);
-
- // Kludge, because a `Table still does not have a shortcut.
- // Simple to solve here: there's only the table and buttons,
- // so it is OK to always set focus to the table
- UI::SetFocus (`id (`fstable));
-
- }*/
-
event = UI::WaitForEvent ();
ret = event["ID"]:nil;
if (ret == `cancel)
{
ret = `abort;
}
-
- // handle the events, enable/disable the button, show the popup if
button clicked
- /*if ( UI::WidgetExists(`id("_cwm_firewall_details")) &&
UI::WidgetExists(`id("_cwm_open_firewall")) )
- CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "",
event);
- changed =
- true || // TODO: fw changed, #44106
- true; // TODO: nfs changed
- if ( UI::WidgetExists(`id(`fstable)) )
- entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);
-
- if (ret == `newbut)
- {
- map<string,any> entry = GetFstabEntry (nil, (list<map>) union
(Nfs::non_nfs_entries, nfs_entries));
-
- if (entry != nil)
- nfs_entries = add (nfs_entries, entry);
-
- UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
- }
- else if (ret == `editbut)
- {
- integer count = 0;
- map<string,any> entry = GetFstabEntry
(nfs_entries[entryno]:$[], // Default values
- (list<map>) union
(Nfs::non_nfs_entries, remove (nfs_entries, entryno)));
- if (entry != nil)
- {
- integer count = 0;
- nfs_entries = maplist(map<string,any> ent, nfs_entries,
``{
- count = count+1;
- if (count-1 != entryno)
- return ent;
- return entry;
- });
-
- UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
- }
- }
- else if (ret == `delbut && size (nfs_entries) > 0)
- {
- integer count = 0;
- nfs_entries = remove (nfs_entries, entryno);
-
- UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
- }
- else if (ret == `enable_nfs4)
- {
- boolean enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),
`Value);
- UI::ChangeWidget( `id(`nfs4_domain), `Enabled, enabled);
- }
- else if ( ret == `settings )
- {
- SaveFstabEntries( event );
- UI::ReplaceWidget(`id(`rp), SettingsTab() );
- InitSettings();
- }
- else if ( ret == `overview )
- {
- SaveSettings( event );
- UI::ReplaceWidget(`id(`rp), FstabTab() );
- InitFstabEntries();
- }*/
- else if (ret == `abort && changed && !Popup::ReallyAbort (true))
+ else if (ret == `abort && Nfs::GetModified() && !Popup::ReallyAbort
(true))
{
ret = `again;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nfs-client-2.17.3/VERSION
new/yast2-nfs-client-2.17.4/VERSION
--- old/yast2-nfs-client-2.17.3/VERSION 2008-09-08 14:52:42.000000000 +0200
+++ new/yast2-nfs-client-2.17.4/VERSION 2008-09-23 14:07:33.000000000 +0200
@@ -1 +1 @@
-2.17.3
+2.17.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |