Mailinglist Archive: opensuse-commit (1192 mails)
| < Previous | Next > |
commit yast2-nfs-client
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Sat, 16 Aug 2008 03:57:29 +0200
- Message-id: <20080816015730.9A45467804A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-nfs-client
checked in at Sat Aug 16 03:57:29 CEST 2008.
--------
--- yast2-nfs-client/yast2-nfs-client.changes 2008-08-08 10:37:09.000000000
+0200
+++ yast2-nfs-client/yast2-nfs-client.changes 2008-08-14 17:56:23.899374000
+0200
@@ -1,0 +2,7 @@
+Thu Aug 14 17:46:51 CEST 2008 - kmachalkova@xxxxxxx
+
+- First steps to integrate nfs-client into partitioner (added a client
+ making esp. UI accesible from other modules) (FaTE#303326)
+- 2.17.2
+
+-------------------------------------------------------------------
Old:
----
yast2-nfs-client-2.17.1.tar.bz2
New:
----
yast2-nfs-client-2.17.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nfs-client.spec ++++++
--- /var/tmp/diff_new_pack.hn8196/_old 2008-08-16 03:57:08.000000000 +0200
+++ /var/tmp/diff_new_pack.hn8196/_new 2008-08-16 03:57:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-nfs-client (Version 2.17.1)
+# spec file for package yast2-nfs-client (Version 2.17.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-nfs-client
-Version: 2.17.1
+Version: 2.17.2
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-nfs-client-2.17.1.tar.bz2
+Source0: yast2-nfs-client-2.17.2.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools
yast2-testsuite
#Hostname::CurrentDomain
@@ -51,7 +51,7 @@
Martin Vidner <mvidner@xxxxxxx>
%prep
-%setup -n yast2-nfs-client-2.17.1
+%setup -n yast2-nfs-client-2.17.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -94,6 +94,10 @@
%doc %{prefix}/share/doc/packages/yast2-nfs-client
/usr/share/YaST2/schema/autoyast/rnc/nfs.rnc
%changelog
+* Thu Aug 14 2008 kmachalkova@xxxxxxx
+- First steps to integrate nfs-client into partitioner (added a client
+ making esp. UI accesible from other modules) (FaTE#303326)
+- 2.17.2
* Fri Aug 08 2008 kmachalkova@xxxxxxx
- Configuration dialog split into two tabs: fstab entries and settings
- Extended list of supported nfs(4) mount options
++++++ yast2-nfs-client-2.17.1.tar.bz2 -> yast2-nfs-client-2.17.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nfs-client-2.17.1/src/Makefile.am
new/yast2-nfs-client-2.17.2/src/Makefile.am
--- old/yast2-nfs-client-2.17.1/src/Makefile.am 2007-05-18 10:56:42.000000000
+0200
+++ new/yast2-nfs-client-2.17.2/src/Makefile.am 2008-08-14 17:46:32.000000000
+0200
@@ -5,6 +5,7 @@
client_DATA = \
nfs_auto.ycp \
nfs-client.ycp \
+ nfs-client4part.ycp \
nfs.ycp
myinclude_DATA = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nfs-client-2.17.1/src/Makefile.in
new/yast2-nfs-client-2.17.2/src/Makefile.in
--- old/yast2-nfs-client-2.17.1/src/Makefile.in 2008-04-10 17:31:03.000000000
+0200
+++ new/yast2-nfs-client-2.17.2/src/Makefile.in 2008-08-14 17:46:43.000000000
+0200
@@ -188,6 +188,7 @@
client_DATA = \
nfs_auto.ycp \
nfs-client.ycp \
+ nfs-client4part.ycp \
nfs.ycp
myinclude_DATA = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nfs-client-2.17.1/src/nfs-client4part.ycp
new/yast2-nfs-client-2.17.2/src/nfs-client4part.ycp
--- old/yast2-nfs-client-2.17.1/src/nfs-client4part.ycp 1970-01-01
01:00:00.000000000 +0100
+++ new/yast2-nfs-client-2.17.2/src/nfs-client4part.ycp 2008-08-14
17:46:32.000000000 +0200
@@ -0,0 +1,58 @@
+/**
+ * File: clients/
+ * Summary: nfs-client stuff made accesible from
+ * Author: Bubli <kmachalkova@xxxxxxx>
+ *
+ */
+
+{
+ textdomain "nfs";
+
+ import "Nfs";
+ include "nfs/ui.ycp";
+
+ /*y2milestone("----------------------------------------");
+ y2milestone("Nfs client proposal started");
+ y2milestone("Arguments: %1", WFM::Args());*/
+
+ any ret = nil;
+ string func = "";
+ map param = $[];
+
+ if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
+ func = (string)WFM::Args(0);
+ if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+ param = (map)WFM::Args(1);
+ }
+ if (func == "CreateUI")
+ {
+ return MainDialogLayout();
+ }
+
+ else if ( func == "FromStorage" )
+ {
+ list <map <string, any> > shares = ( list < map <string, any> >)
param["shares"]:[];
+
+ Nfs::nfs_entries = maplist( map <string, any> entry, shares, {
+
+ return ( $[
+ "spec" : entry["device"]:"",
+ "file" : entry["mount"]:"",
+ //FIXME:: nfsv4
+ "vfstype" : "nfs",
+ "mntops": entry["fstopt"]:""
+ ]);
+ });
+ y2milestone("jezibaba %1", Nfs::nfs_entries);
+ nfs_entries = Nfs::nfs_entries;
+ InitFstabEntries();
+
+ }
+ else if (func == "HandleEvent")
+ {
+ any widget_id = param["widget_id"]:nil;
+ y2milestone("jezibaba %1", nfs_entries);
+
+ HandleEvent( widget_id);
+ }
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nfs-client-2.17.1/src/ui.ycp
new/yast2-nfs-client-2.17.2/src/ui.ycp
--- old/yast2-nfs-client-2.17.1/src/ui.ycp 2008-08-07 16:08:39.000000000
+0200
+++ new/yast2-nfs-client-2.17.2/src/ui.ycp 2008-08-14 17:46:32.000000000
+0200
@@ -13,7 +13,7 @@
* Dan Vesely <dan@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: ui.ycp 49826 2008-08-07 13:56:39Z kmachalkova $
+ * $Id: ui.ycp 50063 2008-08-14 11:10:50Z kmachalkova $
*
* Network NFS client dialogs
*
@@ -402,68 +402,18 @@
return nil;
}
-
-
- /**
- * NFS client dialog itselfs
- * @return `back, `abort or `next
- */
- define symbol FstabDialog () ``{
- Wizard::SetScreenShotName ("nfs-client-1-fstab");
-
- boolean changed = false;
-
- // firewall widget using CWM
- map<string, any> fw_settings = $[
- "services": [ "nfs-client" ],
- "display_details": true,
- ];
- map<string,any> fw_cwm_widget =
CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings);
-
- // Help, part 1 of 3
- string help_text = _("<P>The table contains all the NFS entries
-for /etc/fstab.
-To change the configuration, use <B>Add</B>, <B>Edit</B>, and
-<B>Delete</B>.</P>
-");
-
- // Help, part 2 of 3; Label::BackButton, Label::FinishButton
- help_text = help_text + _("<P>To confirm the changes, press
<B>Finish</B>. To cancel them,
-use <B>Back</B>.</P>\n");
-
- // Help, part 3 of 3
- help_text = help_text + _("<P>For further information about fstab,
-refer to <tt>man fstab</tt>.</P>
-");
-
- help_text = help_text + fw_cwm_widget["help"]:"";
-
-
- list<map<string,any> > nfs_entries = Nfs::nfs_entries;
-
- void InitFstabEntries( )
- {
- UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
- }
-
- void InitSettings( )
- {
- CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
- UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled);
- }
-
- void SaveFstabEntries( map event )
- {
- Nfs::nfs_entries = nfs_entries;
- }
-
- void SaveSettings( map event )
- {
- CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event);
- Nfs::nfs4_enabled = (boolean)
UI::QueryWidget(`id(`enable_nfs4),`Value);
- }
-
- term fstab_contents =
+ // firewall widget using CWM
+ map<string, any> fw_settings = $[
+ "services": [ "service:nfs-client" ],
+ "display_details": true,
+ ];
+ map<string,any> fw_cwm_widget =
CWMFirewallInterfaces::CreateOpenFirewallWidget (fw_settings);
+
+ list<map<string,any> > nfs_entries = Nfs::nfs_entries;
+
+ term FstabTab()
+ {
+ term fstab_content =
`VBox(
`Table(`id(`fstable), `opt(`notify, `immediate),
`header(
@@ -486,11 +436,18 @@
// #211570
`HStretch ())
);
+
+ return fstab_content;
+
+ }
+
+ term SettingsTab()
+ {
term settings_content =
`VBox(
//`VSpacing (1),
`HBox(
- `Left(`CheckBox(`id(`enable_nfs4), `opt(`notify), _("Enable
NFSv4"))),
+ `Left(`CheckBox(`id(`enable_nfs4), `opt(`notify), _("Enable
NFSv4"))),
`Left(`InputField(`id(`nfs4_domain), _("NFSv4 Domain
Name"))),
`HStretch()
),
@@ -499,28 +456,163 @@
`VStretch()
);
- term contents =
+ return settings_content;
+ }
+
+ term MainDialogLayout()
+ {
+ term contents =
`VBox(
- `DumbTab(
+ `DumbTab(
[ `item(`id(`overview),_("&NFS Shares")),
`item(`id(`settings), _("NFS &Settings")) ],
- `ReplacePoint(`id(`rp), fstab_contents)
+ `ReplacePoint(`id(`rp), FstabTab())
)
);
+ return contents;
+ }
+
+ void InitFstabEntries( )
+ {
+ UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
+
+ integer 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));
+
+ }
+
+ void InitSettings( )
+ {
+ CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, "");
+ UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled);
+ }
+
+ void SaveFstabEntries( )
+ {
+ Nfs::nfs_entries = nfs_entries;
+ }
+
+ void SaveSettings( map event )
+ {
+ CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event);
+ Nfs::nfs4_enabled = (boolean)
UI::QueryWidget(`id(`enable_nfs4),`Value);
+ }
+
+ void HandleEvent( any widget )
+ {
+ integer entryno = -1;
+ // 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, "", $[
"ID" : widget ]);
+ /*changed =
+ true || // TODO: fw changed, #44106
+ true; // TODO: nfs changed*/
+ if ( UI::WidgetExists(`id(`fstable)) )
+ entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);
+
+ if (widget == `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 (widget == `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 (widget == `delbut && size (nfs_entries) > 0)
+ {
+ integer count = 0;
+ nfs_entries = remove (nfs_entries, entryno);
+
+ UI::ChangeWidget (`id(`fstable), `Items, FstabTableItems
(nfs_entries));
+ }
+ else if (widget == `enable_nfs4)
+ {
+ boolean enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),
`Value);
+ UI::ChangeWidget( `id(`nfs4_domain), `Enabled, enabled);
+ }
+ else if ( widget == `settings )
+ {
+ SaveFstabEntries( );
+ UI::ReplaceWidget(`id(`rp), SettingsTab() );
+ InitSettings();
+ }
+ else if ( widget == `overview )
+ {
+ SaveSettings( $[ "ID" : widget ] );
+ UI::ReplaceWidget(`id(`rp), FstabTab() );
+ InitFstabEntries();
+ }
+ }
+
+ /**
+ * NFS client dialog itselfs
+ * @return `back, `abort or `next
+ */
+ define symbol FstabDialog () ``{
+ Wizard::SetScreenShotName ("nfs-client-1-fstab");
+
+ boolean changed = false;
+
+ // Help, part 1 of 3
+ string help_text = _("<P>The table contains all the NFS entries
+for /etc/fstab.
+To change the configuration, use <B>Add</B>, <B>Edit</B>, and
+<B>Delete</B>.</P>
+");
+
+ // Help, part 2 of 3; Label::BackButton, Label::FinishButton
+ help_text = help_text + _("<P>To confirm the changes, press
<B>Finish</B>. To cancel them,
+use <B>Back</B>.</P>\n");
+
+ // Help, part 3 of 3
+ help_text = help_text + _("<P>For further information about fstab,
+refer to <tt>man fstab</tt>.</P>
+");
+
+ help_text = help_text + fw_cwm_widget["help"]:"";
+
+ nfs_entries = Nfs::nfs_entries;
+
// dialog heading
Wizard::SetContentsButtons(_("NFS Client Configuration"),
- contents, help_text,
+ MainDialogLayout(), help_text,
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);
+ //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;
any ret = nil;
@@ -529,7 +621,7 @@
do
{
- if ( UI::WidgetExists(`id(`fstable)) )
+ /*if ( UI::WidgetExists(`id(`fstable)) )
{
entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);
UI::ChangeWidget (`id(`editbut), `Enabled, entryno != nil);
@@ -540,7 +632,7 @@
// so it is OK to always set focus to the table
UI::SetFocus (`id (`fstable));
- }
+ }*/
event = UI::WaitForEvent ();
ret = event["ID"]:nil;
@@ -550,11 +642,11 @@
}
// 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")) )
+ /*if ( UI::WidgetExists(`id("_cwm_firewall_details")) &&
UI::WidgetExists(`id("_cwm_open_firewall")) )
CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "",
event);
- /*changed =
+ changed =
true || // TODO: fw changed, #44106
- true; // TODO: nfs changed*/
+ true; // TODO: nfs changed
if ( UI::WidgetExists(`id(`fstable)) )
entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem);
@@ -600,19 +692,21 @@
else if ( ret == `settings )
{
SaveFstabEntries( event );
- UI::ReplaceWidget(`id(`rp), settings_content);
+ UI::ReplaceWidget(`id(`rp), SettingsTab() );
InitSettings();
}
else if ( ret == `overview )
{
SaveSettings( event );
- UI::ReplaceWidget(`id(`rp), fstab_contents);
+ UI::ReplaceWidget(`id(`rp), FstabTab() );
InitFstabEntries();
- }
+ }*/
else if (ret == `abort && changed && !Popup::ReallyAbort (true))
{
ret = `again;
}
+ else
+ HandleEvent( ret );
}
while (ret != `back && ret != `next && ret != `abort);
@@ -620,7 +714,7 @@
{
// grab current settings, store them to SuSEFirewall::
if( UI::WidgetExists(`id(`fstable)) )
- SaveFstabEntries( event );
+ SaveFstabEntries( );
if( UI::WidgetExists(`id(`enable_nfs4)) )
SaveSettings( event );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-nfs-client-2.17.1/VERSION
new/yast2-nfs-client-2.17.2/VERSION
--- old/yast2-nfs-client-2.17.1/VERSION 2008-08-08 10:33:00.000000000 +0200
+++ new/yast2-nfs-client-2.17.2/VERSION 2008-08-14 17:49:48.000000000 +0200
@@ -1 +1 @@
-2.17.1
+2.17.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |