Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit yast2-network
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 18 Sep 2007 15:33:44 +0200
- Message-id: <20070918133345.55FCE678331@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-network
checked in at Tue Sep 18 15:33:44 CEST 2007.
--------
--- yast2-network/yast2-network.changes 2007-09-12 16:40:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-09-18 15:10:16.521052000 +0200
@@ -1,0 +2,8 @@
+Tue Sep 18 14:54:18 CEST 2007 - kmachalkova@xxxxxxx
+
+- Removed all udev rules workarounds (manually removing lockfiles,
+ tmp rules, calling udevtrigger) - just copy udev rules for net and
+ cd to the installed system iff they don't already exist (#292375)
+- 2.15.77
+
+-------------------------------------------------------------------
Old:
----
yast2-network-2.15.76.tar.bz2
New:
----
yast2-network-2.15.77.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.b21090/_old 2007-09-18 15:33:11.000000000 +0200
+++ /var/tmp/diff_new_pack.b21090/_new 2007-09-18 15:33:11.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.15.76)
+# spec file for package yast2-network (Version 2.15.77)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,13 +11,13 @@
# norootforbuild
Name: yast2-network
-Version: 2.15.76
+Version: 2.15.77
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.76.tar.bz2
-prefix: /usr
+Source0: yast2-network-2.15.77.tar.bz2
+Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
BuildRequires: update-desktop-files
@@ -42,14 +42,15 @@
# carrier detection
Conflicts: yast2-core < 2.10.6
Summary: YaST2 - Network Configuration
+
%package devel-doc
-Version: 2.15.76
+Version: 2.15.77
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.15.76.tar.bz2
-prefix: /usr
+Source0: yast2-network-2.15.77.tar.bz2
+Prefix: /usr
Requires: yast2-network >= 2.15.53
Summary: YaST2 - Developer documentation for yast2-network
@@ -62,7 +63,6 @@
--------
Michal Svec <msvec@xxxxxxx>
-
%description devel-doc
This package contains autogenerated documentation for yast2-network
@@ -73,7 +73,7 @@
Michal Svec <msvec@xxxxxxx>
%prep
-%setup -n yast2-network-2.15.76
+%setup -n yast2-network-2.15.77
%build
%{prefix}/bin/y2tool y2autoconf
@@ -130,7 +130,6 @@
%dir %{prefix}/share/doc/packages/yast2-network
%{prefix}/share/doc/packages/yast2-network/COPYING
%{prefix}/share/doc/packages/yast2-network/COPYRIGHT.english
-
%readme %{prefix}/share/doc/packages/yast2-network/README
%files devel-doc
@@ -141,6 +140,11 @@
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Tue Sep 18 2007 - kmachalkova@xxxxxxx
+- Removed all udev rules workarounds (manually removing lockfiles,
+ tmp rules, calling udevtrigger) - just copy udev rules for net and
+ cd to the installed system iff they don't already exist (#292375)
+- 2.15.77
* Wed Sep 12 2007 - kmachalkova@xxxxxxx
- Do not re-add network devices (incl. loopback) into available
devices list each time Lan::Import() is called (#308132)
++++++ yast2-network-2.15.76.tar.bz2 -> yast2-network-2.15.77.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.76/src/clients/save_network.ycp new/yast2-network-2.15.77/src/clients/save_network.ycp
--- old/yast2-network-2.15.76/src/clients/save_network.ycp 2007-09-12 14:11:43.000000000 +0200
+++ new/yast2-network-2.15.77/src/clients/save_network.ycp 2007-09-18 15:09:14.000000000 +0200
@@ -319,25 +319,37 @@
"/var/lib/dhcpcd",
String::Quote (Installation::destdir)));
- // --------------------------------------------------------------
- // Copy udev rules for persistent names
- // workaround (#292375):
- // delete lock files
- WFM::Execute(.local.bash, "rm -rf /dev/.udev/.lock*; rm /dev/.udev/tmp-rules*");
- // re-trigger event for net
- WFM::Execute(.local.bash, "udevtrigger --subsystem-match=net");
+ //Deleting lockfiles and re-triggering udev events for *net is not needed any more
+ //(#292375 c#18)
string udev_rules_srcdir = "/etc/udev/rules.d";
- string udev_rules_srcfile = "70-persistent-net.rules";
+ string net_srcfile = "70-persistent-net.rules";
+ string cd_srcfile = "70-persistent-cd.rules";
+
string udev_rules_destdir = sformat("%1%2", String::Quote (Installation::destdir), udev_rules_srcdir);
+ string net_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, net_srcfile);
+ string cd_destfile = sformat("%1%2/%3", String::Quote (Installation::destdir), udev_rules_srcdir, cd_srcfile);
//Do not create udev_rules_destdir if it already exists (in case of update)
//(bug #293366, c#7)
+
if (! FileUtils::Exists( udev_rules_destdir ))
- WFM::Execute (.local.bash, sformat (
- "mkdir -p '%1'; /bin/cp -p '%2/%3' '%1'",
- udev_rules_destdir,
- udev_rules_srcdir, udev_rules_srcfile));
+ {
+ y2milestone("%1 does not exist yet, creating it", udev_rules_destdir);
+ WFM::Execute (.local.bash, sformat ("mkdir -p '%1'", udev_rules_destdir));
+ }
+
+ if (! FileUtils::Exists( net_destfile ))
+ {
+ y2milestone("Copying %1 to the installed system ", net_srcfile);
+ WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, net_srcfile, net_destfile));
+ }
+
+ if (! FileUtils::Exists( cd_destfile ))
+ {
+ y2milestone("Copying %1 to the installed system ", cd_srcfile);
+ WFM::Execute (.local.bash, sformat ("/bin/cp -p '%1/%2' '%3'", udev_rules_srcdir, cd_srcfile, cd_destfile));
+ }
// close and chroot back
WFM::SCRClose (new_SCR);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.76/src/lan/address.ycp new/yast2-network-2.15.77/src/lan/address.ycp
--- old/yast2-network-2.15.76/src/lan/address.ycp 2007-09-10 09:55:57.000000000 +0200
+++ new/yast2-network-2.15.77/src/lan/address.ycp 2007-09-18 12:11:09.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: address.ycp 40799 2007-09-07 11:08:57Z mzugec $
+ * $Id: address.ycp 40916 2007-09-14 12:10:37Z kmachalkova $
*/
{
@@ -797,40 +797,40 @@
map<string, any> wd_content = $[
- "tab_order" : ["t_general", "t_addr", "hardware"],
- "tabs" : $[
- "t_general" : $[
- "header" : _("&General"),
- "contents" :
- `MarginBox (1, 0,
- `VBox (
- `MarginBox (1, 0,
- `VBox(
- // TODO:
- // "MANDATORY",
- `Frame( _("Device Activation"), `HBox(("STARTMODE"), `HStretch())),
- `VSpacing(0.4),
- `Frame(_("Firewall Zone"), `HBox(("FWZONE"), `HStretch())),
- `VSpacing(0.4),
- `Frame(_("Device Control"), `HBox(("USERCONTROL"), `HStretch())) ,
- `VSpacing (0.4),
- `Frame(_("Maximum Transfer Unit (MTU)"), `HBox(("MTU"), `HStretch())),
- `VStretch()
- )
- )
- )
- ),
+ "tab_order" : ["t_general", "t_addr", "hardware"],
+ "tabs" : $[
+ "t_general" : $[
+ "header" : _("&General"),
+ "contents" :
+ `MarginBox (1, 0,
+ `VBox (
+ `MarginBox (1, 0,
+ `VBox(
+ // TODO:
+ // "MANDATORY",
+ `Frame( _("Device Activation"), `HBox(("STARTMODE"), `HStretch())),
+ `VSpacing(0.4),
+ `Frame(_("Firewall Zone"), `HBox(("FWZONE"), `HStretch())),
+ `VSpacing(0.4),
+ `Frame(_("Device Control"), `HBox(("USERCONTROL"), `HStretch())) ,
+ `VSpacing (0.4),
+ `Frame(_("Maximum Transfer Unit (MTU)"), `HBox(("MTU"), `HStretch())),
+ `VStretch()
+ )
+ )
+ )
+ ),
// FIXME we have helps per widget and for the whole
// tab set but not for one tab
- "help": _("<p>Configure the detailed network card settings here.</p>"),
+ "help": _("<p>Configure the detailed network card settings here.</p>"),
],
- "t_addr" : $[
- // FIXME: here it does not complain about missing
- // shortcuts
- "header" : _("&Address"),
- "contents" : address_contents,
- // Address tab help
- "help": _("<p>Configure your IP address.</p>"),
+ "t_addr" : $[
+ // FIXME: here it does not complain about missing
+ // shortcuts
+ "header" : _("&Address"),
+ "contents" : address_contents,
+ // Address tab help
+ "help": _("<p>Configure your IP address.</p>"),
],
"hardware" : $[
"header" : _("&Hardware"),
@@ -841,12 +841,13 @@
"contents" : `Empty (),
"widget_names" : [],
]
- ],
- "initial_tab" : "t_addr",
- "widget_descr" : wd,
- "tab_help" : "",
- "fallback_functions" : functions,
- ];
+ ],
+ "initial_tab" : "t_addr",
+ "widget_descr" : wd,
+ "tab_help" : "",
+ "fallback_functions" : functions,
+ ];
+
hw_standalone=false;
wd = (map<string, map<string,any> >) union (wd, $[
"tab" : CWMTab::CreateWidget (wd_content)
@@ -863,9 +864,10 @@
"abort_button" : Label::CancelButton (),
"next_button" : Label::NextButton (),
"fallback_functions" : functions,
- "disable_buttons" :
- (LanItems::operation!=`add ||(LanItems::operation==`edit && LanItems::getCurrentItem()["ifcfg"]:""=="")) ? [ "back_button" ] : []
- ]);
+ "disable_buttons" : (LanItems::operation!=`add ||
+ (LanItems::operation==`edit && LanItems::getCurrentItem()["ifcfg"]:""==""))
+ ? [ "back_button" ] : []
+ ]);
Wizard::RestoreAbortButton();
y2milestone ("ShowAndRun: %1", ret);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.76/VERSION new/yast2-network-2.15.77/VERSION
--- old/yast2-network-2.15.76/VERSION 2007-09-12 13:52:54.000000000 +0200
+++ new/yast2-network-2.15.77/VERSION 2007-09-18 14:57:35.000000000 +0200
@@ -1 +1 @@
-2.15.76
+2.15.77
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |