YaST Development
Threads by month
- ----- 2025 -----
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2003 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2002 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2001 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2000 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
January 2014
- 32 participants
- 154 discussions
Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-iscsi-client -> sle12
## BNC# 856494 : "YaST defaults to the current portal address instead of the persistent portal address when using iSCSI with load balancing" (ASSIGNED/)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client/yast2-iscsi-client.changes 2014-01-17 14:16:29.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-iscsi-client/yast2-iscsi-client.changes 2014-01-23 15:49:52.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 22 14:16:37 CET 2014 - gs(a)suse.de
+
+- detect persistent portal correctly (bnc#856494)
+- 3.1.3
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- installation-images
- installation-images-extras
- yast2-iscsi-client
- yast2-schema
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-iscsi-client (Old)
and /mounts/work_src_done/SLE12/yast2-iscsi-client (BS:build ID:31190 MAIL:yast-devel@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-iscsi-client", Maintainer is "yast-devel(a)opensuse.org"
Old:
----
yast2-iscsi-client-3.1.2.tar.bz2
New:
----
yast2-iscsi-client-3.1.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.wui1oP/_old 2014-01-27 12:49:30.000000000 +0100
+++ /var/tmp/diff_new_pack.wui1oP/_new 2014-01-27 12:49:30.000000000 +0100
@@ -17,28 +17,19 @@
Name: yast2-iscsi-client
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
+Group: System/YaST
+License: GPL-2.0
# Service module switched to systemd
-BuildRequires: docbook-xsl-stylesheets
-BuildRequires: doxygen
-BuildRequires: libicu-devel
-BuildRequires: libxslt
-BuildRequires: perl-XML-Writer
-BuildRequires: popt-devel
-BuildRequires: rubygem-rspec
-BuildRequires: sgml-skel
-BuildRequires: update-desktop-files
BuildRequires: yast2 >= 2.23.15
-BuildRequires: yast2-devtools >= 3.0.6
-BuildRequires: yast2-packagemanager-devel
-BuildRequires: yast2-packager
-BuildRequires: yast2-perl-bindings
-BuildRequires: yast2-testsuite
+BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libicu-devel yast2-packager
+BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: rubygem-rspec
Requires: yast2-packager
@@ -47,13 +38,11 @@
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
-BuildArch: noarch
+BuildArchitectures: noarch
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - iSCSI Client Configuration
-License: GPL-2.0
-Group: System/YaST
%description
This package contains the YaST2 component for configuration of an iSCSI
@@ -68,6 +57,7 @@
%install
%yast_install
+
%files
%defattr(-,root,root)
%dir %{yast_yncludedir}/iscsi-client
@@ -81,5 +71,3 @@
%{yast_scrconfdir}/iscsid.scr
%doc %{yast_docdir}
%{yast_schemadir}/autoyast/rnc/iscsi-client.rnc
-
-%changelog
++++++ yast2-iscsi-client-3.1.2.tar.bz2 -> yast2-iscsi-client-3.1.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.2/VERSION new/yast2-iscsi-client-3.1.3/VERSION
--- old/yast2-iscsi-client-3.1.2/VERSION 2013-12-02 14:13:04.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/VERSION 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3.1.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.changes
--- old/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.changes 2013-12-02 14:13:04.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.changes 2014-01-27 11:37:31.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jan 22 14:16:37 CET 2014 - gs(a)suse.de
+
+- detect persistent portal correctly (bnc#856494)
+- 3.1.3
+
+-------------------------------------------------------------------
Wed Nov 27 13:21:24 CET 2013 - gs(a)suse.de
- improve IPv6 support: filter out Scope:Link IPv6 addresses
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.spec
--- old/yast2-iscsi-client-3.1.2/package/yast2-iscsi-client.spec 2013-12-02 14:13:04.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/package/yast2-iscsi-client.spec 2014-01-27 11:37:31.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-iscsi-client
-Version: 3.1.2
+Version: 3.1.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -28,7 +28,7 @@
# Service module switched to systemd
BuildRequires: yast2 >= 2.23.15
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libicu-devel yast2-packager
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: rubygem-rspec
Requires: yast2-packager
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.2/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-3.1.3/src/modules/IscsiClientLib.rb
--- old/yast2-iscsi-client-3.1.2/src/modules/IscsiClientLib.rb 2013-12-02 14:13:04.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/src/modules/IscsiClientLib.rb 2014-01-27 11:37:31.000000000 +0100
@@ -375,7 +375,11 @@
elsif Builtins.search(row, "Portal:") != nil
if Builtins.search(row, "Current Portal:") != nil
portal = Ops.get(Builtins.splitstring(row, " "), 2, "")
- elsif Builtins.search(row, "Persistent Portal:") == nil
+ elsif Builtins.search(row, "Persistent Portal:") != nil
+ # 'Persistent Portal' overwrites current (is used for login)
+ portal = Ops.get(Builtins.splitstring(row, " "), 2, "")
+ else
+ # read 'Portal' (from output of -m node)
portal = Ops.get(Builtins.splitstring(row, " "), 1, "")
end
pos = Builtins.search(portal, ",")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.2/test/Makefile.am new/yast2-iscsi-client-3.1.3/test/Makefile.am
--- old/yast2-iscsi-client-3.1.2/test/Makefile.am 2013-11-28 11:10:04.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/test/Makefile.am 2014-01-27 11:37:31.000000000 +0100
@@ -1,5 +1,6 @@
TESTS = \
- ipEqual_spec.rb
+ ipEqual_spec.rb \
+ ScanDiscovered_spec.rb
TEST_EXTENSIONS = .rb
RB_LOG_COMPILER = rspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.2/test/ScanDiscovered_spec.rb new/yast2-iscsi-client-3.1.3/test/ScanDiscovered_spec.rb
--- old/yast2-iscsi-client-3.1.2/test/ScanDiscovered_spec.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-iscsi-client-3.1.3/test/ScanDiscovered_spec.rb 2014-01-27 11:37:31.000000000 +0100
@@ -0,0 +1,78 @@
+#! /usr/bin/rspec
+require_relative '../src/modules/IscsiClientLib'
+
+describe Yast::IscsiClientLibClass do
+ before :each do
+ @iscsilib = Yast::IscsiClientLibClass.new
+ @iscsilib.main()
+ end
+
+ describe "#ScanDiscovered for iscsiadm -m session -P 1" do
+ context "with Current Portal: and Persistent Portal: differ" do
+ it "returns list of connected targets with IPs of Persistent Portal" do
+ expect((a)iscsilib.ScanDiscovered(
+ ["Target: iqn.2013-10.de.suse:test_file1",
+ "\tCurrent Portal: 10.13.67.182:3260,1",
+ "\tPersistent Portal: 10.120.66.182:3260,1",
+ "\t\t**********",
+ "\t\tInterface:",
+ "\t\t**********",
+ "\t\tIface Name: default",
+ "\t\tIface Transport: tcp",
+ "\t\tIface Initiatorname: iqn.1996-04.de.suse:01:19eacab02a1d",
+ "\t\tIface IPaddress: <empty>",
+ "\t\tIface HWaddress: <empty>",
+ "\t\tIface Netdev: <empty>",
+ "\t\tSID: 1",
+ "\t\tiSCSI Connection State: TRANSPORT WAIT",
+ "\t\tiSCSI Session State: FREE",
+ "\t\tInternal iscsid Session State: REOPEN", "",
+ "Target: iqn.2013-10.de.suse:test_file2",
+ "\tCurrent Portal: [2620:113:80c0:890:e051:56:73c7:9171]:3260,1",
+ "\tPersistent Portal: [2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260,1",
+ "\t\t**********",
+ "\t\tInterface:",
+ "\t\t**********",
+ "\t\tIface Name: default",
+ "\t\tIface Transport: tcp",
+ "\t\tIface Initiatorname: iqn.1996-04.de.suse:01:19eacab02a1d",
+ "\t\tIface IPaddress: <empty>",
+ "\t\tIface HWaddress: <empty>",
+ "\t\tIface Netdev: <empty>",
+ "\t\tSID: 1",
+ "\t\tiSCSI Connection State: TRANSPORT WAIT",
+ "\t\tiSCSI Session State: FREE",
+ "\t\tInternal iscsid Session State: REOPEN", ""
+ ])).to eq(
+ ["10.120.66.182:3260 iqn.2013-10.de.suse:test_file1 default",
+ "[2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260 iqn.2013-10.de.suse:test_file2 default"]
+ )
+ end
+ end
+ end
+
+ describe "#ScanDiscovered for iscsiadm -m node -P 1" do
+ context "with Portal:" do
+ it "returns list of discovered targets with IPs of Portal" do
+ expect((a)iscsilib.ScanDiscovered(
+ ["Target: iqn.2013-10.de.suse:test_file2",
+ "\tPortal: [fe80::a00:27ff:fe1b:a7fe]:3260,1",
+ "\t\tIface Name: default",
+ "\tPortal: [2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260,1",
+ "\t\tIface Name: default",
+ "\tPortal: 10.120.66.182:3260,1",
+ "\t\tIface Name: default",
+ "\tPortal: [2620:113:80c0:8080:a00:27ff:fe1b:a7fe]:3260,1",
+ "\t\tIface Name: default"
+ ])). to eq(
+ [
+ "[2620:113:80c0:8080:e051:f9ea:73c7:9171]:3260 iqn.2013-10.de.suse:test_file2 default",
+ "10.120.66.182:3260 iqn.2013-10.de.suse:test_file2 default",
+ "[2620:113:80c0:8080:a00:27ff:fe1b:a7fe]:3260 iqn.2013-10.de.suse:test_file2 default"]
+ )
+ end
+ end
+ end
+
+end
+
continue with "q"...
Checked in at Mon Jan 27 12:50:50 CET 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
1
0
Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-s390 -> sle12
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-s390/yast2-s390.changes 2014-01-17 14:16:33.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-s390/yast2-s390.changes 2014-01-27 10:01:17.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Jan 23 11:17:15 UTC 2014 - jsrain(a)suse.cz
+
+- enhanced handling of large amount of disks (fate#313402,
+ fate#313403, fate#315984)
+- 3.1.2
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-s390 (Old)
and /mounts/work_src_done/SLE12/yast2-s390 (BS:build ID:31179 MAIL:yast-devel@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-s390", Maintainer is "yast-devel(a)opensuse.org"
Old:
----
yast2-s390-3.1.1.tar.bz2
New:
----
yast2-s390-3.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-s390.spec ++++++
--- /var/tmp/diff_new_pack.hyMPvw/_old 2014-01-27 12:29:20.000000000 +0100
+++ /var/tmp/diff_new_pack.hyMPvw/_new 2014-01-27 12:29:20.000000000 +0100
@@ -17,32 +17,23 @@
Name: yast2-s390
-Version: 3.1.1
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
-BuildRequires: docbook-xsl-stylesheets
-BuildRequires: doxygen
-BuildRequires: libxslt
-BuildRequires: perl-XML-Writer
-BuildRequires: sgml-skel
-BuildRequires: update-desktop-files
-BuildRequires: yast2
-BuildRequires: yast2-bootloader
-BuildRequires: yast2-devtools >= 3.0.6
-BuildRequires: yast2-testsuite
-BuildRequires: yast2-users
+Group: System/YaST
+License: GPL-2.0
+BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files
+BuildRequires: yast2 yast2-testsuite yast2-users yast2-bootloader
+BuildRequires: yast2-devtools >= 3.1.10
ExclusiveArch: s390 s390x
-Requires: s390-tools
-Requires: yast2
+Requires: yast2 s390-tools
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - S/390 Specific Features Configuration
-License: GPL-2.0
-Group: System/YaST
%description
This package contains the YaST component for configuration of
@@ -57,6 +48,7 @@
%install
%yast_install
+
%files
%defattr(-,root,root)
%dir %{yast_yncludedir}/s390
@@ -67,5 +59,3 @@
%{yast_desktopdir}/*.desktop
%{yast_schemadir}/autoyast/rnc/*.rnc
%doc %{yast_docdir}
-
-%changelog
++++++ yast2-s390-3.1.1.tar.bz2 -> yast2-s390-3.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.1/VERSION new/yast2-s390-3.1.2/VERSION
--- old/yast2-s390-3.1.1/VERSION 2013-12-09 12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.1/package/yast2-s390.changes new/yast2-s390-3.1.2/package/yast2-s390.changes
--- old/yast2-s390-3.1.1/package/yast2-s390.changes 2013-12-09 12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/package/yast2-s390.changes 2014-01-24 10:00:53.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Jan 23 11:17:15 UTC 2014 - jsrain(a)suse.cz
+
+- enhanced handling of large amount of disks (fate#313402,
+ fate#313403, fate#315984)
+- 3.1.2
+
+-------------------------------------------------------------------
Mon Dec 9 10:28:47 UTC 2013 - jreidinger(a)suse.com
- add COPYING to fix building
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.1/package/yast2-s390.spec new/yast2-s390-3.1.2/package/yast2-s390.spec
--- old/yast2-s390-3.1.1/package/yast2-s390.spec 2013-12-09 12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/package/yast2-s390.spec 2014-01-24 10:00:53.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-s390
-Version: 3.1.1
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -27,7 +27,7 @@
License: GPL-2.0
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files
BuildRequires: yast2 yast2-testsuite yast2-users yast2-bootloader
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
ExclusiveArch: s390 s390x
Requires: yast2 s390-tools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.1/src/autoyast-rnc/dasd.rnc new/yast2-s390-3.1.2/src/autoyast-rnc/dasd.rnc
--- old/yast2-s390-3.1.1/src/autoyast-rnc/dasd.rnc 2013-12-09 12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/src/autoyast-rnc/dasd.rnc 2014-01-24 10:00:53.000000000 +0100
@@ -10,5 +10,6 @@
element format { BOOLEAN }? &
element diag { BOOLEAN }?
}*
- }?
+ }? &
+ element format_unformatted { BOOLEAN }?
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.1/src/include/s390/dasd/dialogs.rb new/yast2-s390-3.1.2/src/include/s390/dasd/dialogs.rb
--- old/yast2-s390-3.1.1/src/include/s390/dasd/dialogs.rb 2013-12-09 12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/src/include/s390/dasd/dialogs.rb 2014-01-27 10:00:49.000000000 +0100
@@ -205,6 +205,7 @@
case action
when :activate, :deactivate
value = action == :activate
+ unformatted_disks = []
Builtins.foreach(selected) do |id|
channel = Ops.get_string(
@@ -212,13 +213,42 @@
[id, "channel"],
""
)
+ act_ret = 0
diag = Ops.get(DASDController.diag, channel, false)
if value
- DASDController.ActivateDisk(channel, diag)
+ act_ret = DASDController.ActivateDisk(channel, diag)
else
DASDController.DeactivateDisk(channel, diag)
end
+ if act_ret == 8 # 8 means disk is not formatted
+ unformatted_disks << channel
+ end
end
+ if unformatted_disks.size > 0
+ if unformatted_disks.size == 1
+ popup = Builtins.sformat(_("Device %1 is not formatted. Format device now?"), unformatted_disks[0])
+ else
+ popup = BUiltins.sformat(_("There are %1 unformatted devices. Format them now?"), unformatted_sisks.size)
+ end
+ # for autoinst, format unformatted disks later
+ if (! Mode.autoinst) && Popup.ContinueCancel(popup)
+ unformatted_disks.each do | channel |
+ #FIXME: possibly disks can be formatted in parallel
+ cmd = "ls '/sys/bus/ccw/devices/#{channel}/block/' | tr -d '\n'"
+ disk = SCR.Execute(path(".target.bash_output"), cmd)
+ if disk["exit"] == 0 && !disk["stdout"].empty?
+ DASDController.FormatDisks(
+ ["/dev/#{disk["stdout"]}"],
+ 1
+ )
+ diag = !!DASDController.diag[channel]
+ DASDController.ActivateDisk(channel, diag)
+ else
+ Popup.Error( Builtins.sformat("Couldn't find device for %1 channel", channel))
+ end
+ end
+ end
+ end
DASDController.ProbeDisks
return true
@@ -430,6 +460,8 @@
MenuButton(Id(:operation), _("Perform &Action"), PossibleActions())
) :
HBox(
+ PushButton(Id(:select_all), _("&Select All")),
+ PushButton(Id(:deselect_all), _("&Deselect All")),
HStretch(),
# menu button
MenuButton(Id(:operation), _("Perform &Action"), PossibleActions())
@@ -485,7 +517,15 @@
ret = Ops.get_symbol(event, "ID")
- if ret == :filter
+ if ret == :select_all
+
+ UI.ChangeWidget(Id(:table), :SelectedItems,
+ UI.QueryWidget(Id(:table), :Items).map { | item | item[0][0] })
+ ret = nil
+ elsif ret == :deselect_all
+ UI.ChangeWidget(Id(:table), :SelectedItems, [])
+ ret = nil
+ elsif ret == :filter
filter_min = Convert.to_string(UI.QueryWidget(:min_chan, :Value))
filter_max = Convert.to_string(UI.QueryWidget(:max_chan, :Value))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.1/src/include/s390/dasd/helps.rb new/yast2-s390-3.1.2/src/include/s390/dasd/helps.rb
--- old/yast2-s390-3.1.1/src/include/s390/dasd/helps.rb 2013-12-09 12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/src/include/s390/dasd/helps.rb 2014-01-24 10:00:53.000000000 +0100
@@ -74,7 +74,7 @@
) +
# Disk selection dialog help 3/4
_(
- "<p>To perform actions on multiple disks at once, mark these disks and click\n<b>Select or Deselect</b>.</p>\n"
+ "<p>To perform actions on multiple disks at once, mark these disks. To select all displayed disk (possibly after applying a filter), click\n<b>Select All</b> or <b>Deselect All</b>.</p>\n"
) +
# Disk selection dialog help 4/4
_(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-s390-3.1.1/src/modules/DASDController.rb new/yast2-s390-3.1.2/src/modules/DASDController.rb
--- old/yast2-s390-3.1.1/src/modules/DASDController.rb 2013-12-09 12:51:24.000000000 +0100
+++ new/yast2-s390-3.1.2/src/modules/DASDController.rb 2014-01-24 10:00:53.000000000 +0100
@@ -58,7 +58,8 @@
# Data was modified?
@modified = false
-
+ # format all unformated devices upon activation?
+ @format_unformatted = false
@proposal_valid = false
end
@@ -137,21 +138,54 @@
def Write
if !Mode.normal
to_format = []
+ to_reactivate = []
+ unformatted_devices = []
Builtins.foreach(@devices) do |index, device|
channel = Ops.get_string(device, "channel", "")
format = Ops.get_boolean(device, "format", false)
do_diag = Ops.get_boolean(device, "diag", false)
- ActivateDisk(channel, do_diag)
+ act_ret = ActivateDisk(channel, do_diag)
+ # FIXME: general activation error handling - also in sync with below
+ # for AutoInstall, format unformatted disks later at once
+ # even disks manually selected for formatting must be reactivated
+ if Mode.autoinst && act_ret == 8 && ( @format_unformatted || format )
+ format = true
+ to_reactivate << device
+ end
if format
dev_name = GetDeviceName(channel)
- to_format = Builtins.add(to_format, dev_name) if dev_name != nil
+ to_format << device
+ # unformtted disk, manual (not AutoYaS)
+ elsif act_ret == 8
+ unformatted_devices << device
+ end
+ end
+
+ if unformatted_devices.size > 0
+ if unformatted_devices.size == 1
+ message = Builtins.sformat(_("Device %1 is not formatted. Format device now?"), unformatted_devices[0])
+ else
+ message = BUiltins.sformat(_("There are %1 unformatted devices. Format them now?"), unformatted_devices.size)
+ end
+ if Popup.ContinueCancel( message )
+ unformatted_devices.each do | device |
+ to_format << device
+ to_reactivate << device
+ end
end
end
Builtins.y2milestone("Disks to format: %1", to_format)
FormatDisks(to_format, 8) if !Builtins.isempty(to_format)
+
+ to_reactivate.each do | device |
+ channel = device["channel"] || ""
+ do_diag = device["diag"] || false
+ # FIXME: general activation error handling - also in sync with above
+ ActivateDisk(channel, do_diag)
+ end
end
if !Mode.installation
@@ -190,6 +224,8 @@
{ index => d }
end
+ @format_unformatted = settings["format_unformatted"] || false
+
true
end
@@ -202,7 +238,10 @@
Builtins.contains(["channel", "format", "diag"], k)
end }
- { "devices" => l }
+ {
+ "devices" => l,
+ "format_unformatted" => @format_unformatted
+ }
end
@@ -512,6 +551,7 @@
# Activate disk
# @param [String] channel string Name of the disk to activate
# @param [Boolean] diag boolean Activate DIAG or not
+ # @return [Integer] exit code of the activation command
def ActivateDisk(channel, diag)
command = Builtins.sformat(
"/sbin/dasd_configure '%1' %2 %3",
@@ -528,41 +568,8 @@
)
if ret == 8
- popup = Builtins.sformat(
- _(
- "Device %1 is not formatted. Format device now?\n" +
- "If you want to format multiple devices in parallel,\n" +
- "press 'Cancel' and select 'Perform Action', 'Format' later on.\n"
- ),
- channel
- )
- if Mode.autoinst && Popup.TimedOKCancel(popup, 10) ||
- Popup.ContinueCancel(popup)
- cmd = Builtins.sformat(
- "ls '/sys/bus/ccw/devices/%1/block/' | tr -d '\n'",
- channel
- )
- disk = Convert.convert(
- SCR.Execute(path(".target.bash_output"), cmd),
- :from => "any",
- :to => "map <string, any>"
- )
- if Ops.get_integer(disk, "exit", -1) == 0 &&
- Ops.greater_than(
- Builtins.size(Ops.get_string(disk, "stdout", "")),
- 0
- )
- FormatDisks(
- [Builtins.sformat("/dev/%1", Ops.get_string(disk, "stdout", ""))],
- 1
- )
- ActivateDisk(channel, diag)
- else
- Popup.Error(
- Builtins.sformat("Couldn't find device for %1 channel", channel)
- )
- end
- end
+ # unformatted disk is now handled now outside this function
+ # however, don't issue any error
elsif ret == 7
# when return code is 7, set DASD offline
# https://bugzilla.novell.com/show_bug.cgi?id=561876#c9
@@ -573,7 +580,7 @@
@disk_configured = true
- nil
+ ret
end
@@ -806,7 +813,7 @@
publish :variable => :filter_min, :type => "string"
publish :variable => :filter_max, :type => "string"
publish :variable => :diag, :type => "map <string, boolean>"
- publish :function => :ActivateDisk, :type => "void (string, boolean)"
+ publish :function => :ActivateDisk, :type => "integer (string, boolean)"
publish :function => :DeactivateDisk, :type => "void (string, boolean)"
publish :function => :ProbeDisks, :type => "void ()"
publish :function => :FormatDisks, :type => "void (list <string>, integer)"
continue with "q"...
Checked in at Mon Jan 27 12:30:02 CET 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
1
0
Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-nfs-server -> sle12
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-nfs-server/yast2-nfs-server.changes 2014-01-17 14:16:31.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-nfs-server/yast2-nfs-server.changes 2014-01-27 11:10:13.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Jan 27 08:12:41 UTC 2014 - mfilka(a)suse.com
+
+- fate#315589
+ - deprecated bind mount configuration with NFSv4 export
+- 3.1.2
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-nfs-server
- yast2-schema
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-nfs-server (Old)
and /mounts/work_src_done/SLE12/yast2-nfs-server (BS:build ID:31187 MAIL:yast-devel@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-nfs-server", Maintainer is "yast-devel(a)opensuse.org"
Old:
----
yast2-nfs-server-3.1.1.tar.bz2
New:
----
yast2-nfs-server-3.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-nfs-server.spec ++++++
--- /var/tmp/diff_new_pack.RWxxwY/_old 2014-01-27 12:28:43.000000000 +0100
+++ /var/tmp/diff_new_pack.RWxxwY/_new 2014-01-27 12:28:43.000000000 +0100
@@ -17,31 +17,29 @@
Name: yast2-nfs-server
-Version: 3.1.1
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
+Group: System/YaST
+License: GPL-2.0+
# Changed implementation for checking if service is enabled 2.23.23 (affects testsuite)
-BuildRequires: perl-XML-Writer
-BuildRequires: update-desktop-files
BuildRequires: yast2 >= 2.23.23
-BuildRequires: yast2-devtools >= 3.0.6
-BuildRequires: yast2-testsuite
+BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite
+BuildRequires: yast2-devtools >= 3.1.10
# Service::Find
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
Requires: yast2-nfs-common
Recommends: nfs-kernel-server
-BuildArch: noarch
+BuildArchitectures: noarch
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - NFS Server Configuration
-License: GPL-2.0+
-Group: System/YaST
%description
The YaST2 component for configuration of an NFS server. NFS stands for
@@ -64,6 +62,7 @@
%install
%yast_install
+
%files
%defattr(-,root,root)
%dir %{yast_yncludedir}/nfs_server
@@ -82,5 +81,3 @@
%defattr(-,root,root)
%{yast_scrconfdir}/cfg_nfs.scr
%{yast_scrconfdir}/etc_idmapd_conf.scr
-
-%changelog
++++++ yast2-nfs-server-3.1.1.tar.bz2 -> yast2-nfs-server-3.1.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.1/README new/yast2-nfs-server-3.1.2/README
--- old/yast2-nfs-server-3.1.1/README 2013-11-15 13:12:10.000000000 +0100
+++ new/yast2-nfs-server-3.1.2/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-yast2-config-nfs_server is part of YaST2
-See the file COPYRIGHT.english for license terms
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.1/README.md new/yast2-nfs-server-3.1.2/README.md
--- old/yast2-nfs-server-3.1.1/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-nfs-server-3.1.2/README.md 2014-01-27 11:09:13.000000000 +0100
@@ -0,0 +1,90 @@
+YaST NFS Server Module
+======================
+
+The YaST NFS Server module manages configuration of an
+[NFS](https://en.wikipedia.org/wiki/Network_File_System) server. It's a part of
+[YaST](https://en.opensuse.org/Portal:YaST) — installation and configuration
+tool for [openSUSE](https://www.opensuse.org/) and [SUSE Linux
+Enterprise](https://www.suse.com/products/server/) (SLE).
+
+<p align="center">
+ <img src="doc/screenshot.png" alt="YaST NFS Server Module screenshot">
+</p>
+
+Features
+--------
+
+ * NFSv3
+ * NFSv4
+
+Installation
+------------
+
+To install the latest stable version on openSUSE or SLE, use zypper:
+
+ $ sudo zypper install yast2-nfs-server
+
+Running
+-------
+
+To run the module, use the following command:
+
+ $ sudo /usr/sbin/yast2 nfs-server
+
+This will run the module in text mode. For more options, including running in
+your desktop environment, see section on [running
+YaST](https://en.opensuse.org/SDB:Starting_YaST) in the YaST documentation.
+
+Documentation
+-------------
+
+User-level documentation for this module is available in the
+[openSUSE Reference documentation][user]. See also
+[general YaST documentation](https://en.opensuse.org/Portal:YaST).
+
+[user]: http://activedoc.opensuse.org/book/opensuse-reference/chapter-18-sharing-fi…
+
+Developer documentation specific for this module is in the [doc](doc)
+directory.
+
+Development
+-----------
+
+This module is developed as part of YaST. See
+[YaST development documentation](
+ https://en.opensuse.org/openSUSE:YaST_development)
+for information about [YaST architecture](
+ https://en.opensuse.org/openSUSE:YaST:_Architecture_Overview)
+[development environment](
+https://en.opensuse.org/openSUSE:YaST:_Preparing_the_Development_Environment)
+and other development-related topics.
+
+To get the source code, clone the GitHub repository:
+
+ $ git clone https://github.com/yast/yast-nfs-server.git
+
+Alternatively, you can fork the repository and clone your fork. This is most
+useful if you plan to contribute into the project.
+
+Before doing anything useful with the code, you need to setup a development
+environment. Fortunately, this is quite simple:
+
+ $ sudo zypper install yast2-devtools
+
+To run the module from the source code, use the `run` Rake task:
+
+ $ rake run
+
+To run the testsuite, use the `test` Rake task:
+
+ $ rake test
+
+For a complete list of tasks, run `rake -T`.
+
+Before submitting any change please read our [contribution
+guidelines](CONTRIBUTING.md).
+
+If you have any question, feel free to ask at the [development mailing
+list](http://lists.opensuse.org/yast-devel/) or at the
+[#yast](https://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
+We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.1/VERSION new/yast2-nfs-server-3.1.2/VERSION
--- old/yast2-nfs-server-3.1.1/VERSION 2013-11-15 13:12:10.000000000 +0100
+++ new/yast2-nfs-server-3.1.2/VERSION 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3.1.1
Files old/yast2-nfs-server-3.1.1/doc/screenshot.png and new/yast2-nfs-server-3.1.2/doc/screenshot.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.1/package/yast2-nfs-server.changes new/yast2-nfs-server-3.1.2/package/yast2-nfs-server.changes
--- old/yast2-nfs-server-3.1.1/package/yast2-nfs-server.changes 2013-11-15 13:12:10.000000000 +0100
+++ new/yast2-nfs-server-3.1.2/package/yast2-nfs-server.changes 2014-01-27 11:09:13.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Jan 27 08:12:41 UTC 2014 - mfilka(a)suse.com
+
+- fate#315589
+ - deprecated bind mount configuration with NFSv4 export
+- 3.1.2
+
+-------------------------------------------------------------------
Wed Nov 13 15:56:18 UTC 2013 - jreidinger(a)suse.com
- Add explicit COPYING file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.1/package/yast2-nfs-server.spec new/yast2-nfs-server-3.1.2/package/yast2-nfs-server.spec
--- old/yast2-nfs-server-3.1.1/package/yast2-nfs-server.spec 2013-11-15 13:12:10.000000000 +0100
+++ new/yast2-nfs-server-3.1.2/package/yast2-nfs-server.spec 2014-01-27 11:09:13.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-nfs-server
-Version: 3.1.1
+Version: 3.1.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -28,7 +28,7 @@
# Changed implementation for checking if service is enabled 2.23.23 (affects testsuite)
BuildRequires: yast2 >= 2.23.23
BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
# Service::Find
# Wizard::SetDesktopTitleAndIcon
Requires: yast2 >= 2.21.22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.1/src/include/nfs_server/routines.rb new/yast2-nfs-server-3.1.2/src/include/nfs_server/routines.rb
--- old/yast2-nfs-server-3.1.1/src/include/nfs_server/routines.rb 2013-11-15 13:12:10.000000000 +0100
+++ new/yast2-nfs-server-3.1.2/src/include/nfs_server/routines.rb 2014-01-27 11:09:13.000000000 +0100
@@ -145,55 +145,11 @@
end
# Give out appropriate default options
- # @param [Boolean] nfsv4 Is nfsv4 enabled ?
# @param [Array<Hash>] exports list of exports
# @param [String] client some string representation of the client (*, *.domain, ip address)
# @return a comma separated default options string, that is most appropriate
- def GetDefaultOpts(nfsv4, exports, client)
- exports = deep_copy(exports)
- withfsid = false
-
- return @default_options if !nfsv4
-
- Builtins.foreach(
- Convert.convert(
- exports,
- :from => "list <map>",
- :to => "list <map <string, any>>"
- )
- ) do |entry|
- Builtins.foreach(
- Convert.convert(
- Ops.get(entry, "allowed") { ["()"] },
- :from => "any",
- :to => "list <string>"
- )
- ) do |hostops|
- pos = Builtins.findfirstof(hostops, "(")
- opts = ""
- clientexpr = ""
- if pos != nil
- opts = Builtins.substring(hostops, Ops.add(pos, 1))
- clientexpr = Builtins.substring(hostops, 0, pos)
-
- pos = Builtins.findfirstof(opts, ")")
- opts = Builtins.substring(opts, 0, pos) if pos != nil
- end
- if ClientRelated(client, clientexpr) != 0
- if Builtins.issubstring(opts, "fsid=0")
- withfsid = true
- raise Break
- end
- end
- end
- raise Break if withfsid
- end
-
- if withfsid
- return @default_options
- else
- return Ops.add("fsid=0,crossmnt,", @default_options)
- end # bnc#471874 c1
+ def GetDefaultOpts(exports, client)
+ return @default_options
end
@@ -340,31 +296,23 @@
end
end
+ # Returns currently selected directory configured for export via NFS.
+ def current_export_dir
+ UI.QueryWidget(Id(:exportsbox), :CurrentItem)
+ end
+
# @param [Array<Hash>] exports list of exports
# @return a SelectionBox for the mountpoints, `id(`exportsbox) containing
# list of exported directory paths.
- # If nfsv4 is enabled return a table of 2 colums, first being the
- # export path and the second one having bindmount targets as specified
- # by in the export entries in /etc/exports
def ExportsSelBox(exports)
- exports = deep_copy(exports)
- if NfsServer.enable_nfsv4
- return Table(
- Id(:exptable),
- Opt(:notify, :immediate),
- Header(_("Directories"), _("Bindmount Targets")),
- ExportsRows(exports)
- )
- else
- return SelectionBox(
- Id(:exportsbox),
- Opt(:notify),
- # selection box label
- _("Dire&ctories"),
- ExportsItems(exports)
- )
- end
+ return SelectionBox(
+ Id(:exportsbox),
+ Opt(:notify),
+ # selection box label
+ _("Dire&ctories"),
+ ExportsItems(exports)
+ )
end
# Check for the validity of client specification:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.1/src/include/nfs_server/ui.rb new/yast2-nfs-server-3.1.2/src/include/nfs_server/ui.rb
--- old/yast2-nfs-server-3.1.1/src/include/nfs_server/ui.rb 2013-11-15 13:12:10.000000000 +0100
+++ new/yast2-nfs-server-3.1.2/src/include/nfs_server/ui.rb 2014-01-27 11:09:13.000000000 +0100
@@ -234,7 +234,7 @@
if hostchanged && !fromedit
if !optchanged
hosts = Convert.to_string(UI.QueryWidget(Id(:hostsent), :Value))
- opts = GetDefaultOpts(NfsServer.enable_nfsv4, exports, hosts)
+ opts = GetDefaultOpts(exports, hosts)
UI.ChangeWidget(Id(:optsent), :Value, opts)
optchanged = true
end
@@ -274,7 +274,7 @@
UI.CloseDialog
if opts == ""
- opts = GetDefaultOpts(NfsServer.enable_nfsv4, exports, hosts)
+ opts = GetDefaultOpts(exports, hosts)
end
opts = Builtins.deletechars(opts, " ()")
@@ -387,13 +387,10 @@
)
fw_contents =
# frame label
- Frame(
- _("Firewall"),
- VBox(
- VSpacing(0.2),
- Ops.get_term(fw_cwm_widget, "custom_widget", Empty()),
- VSpacing(0.2)
- )
+ VBox(
+ VSpacing(0.2),
+ Ops.get_term(fw_cwm_widget, "custom_widget", Empty()),
+ VSpacing(0.2)
)
nfsv4_contents = Frame(
@@ -514,14 +511,14 @@
def ExportsDialog
Wizard.SetScreenShotName("nfs-server-2-exports")
- # Help, part 1 of 5
+ # Help, part 1 of 4
help_text = _(
"<P>The upper box contains all the directories to export.\n" +
"If a directory is selected, the lower box shows the hosts allowed to\n" +
"mount this directory.</P>\n"
)
- # Help, part 2 of 5
+ # Help, part 2 of 4
help_text = Ops.add(
help_text,
_(
@@ -533,7 +530,7 @@
# #91175
if @use_star_for_anonymous
- # Help, part 3 of 5, variant for kernel space server
+ # Help, part 3 of 4, variant for kernel space server
help_text = Ops.add(
help_text,
_(
@@ -541,40 +538,14 @@
)
)
else
- # Help, part 3 of 5, variant for user space server
+ # Help, part 3 of 4, variant for user space server
help_text = Ops.add(
help_text,
_("<p>Leave the field empty to specify all hosts.</p>")
)
end
- if NfsServer.enable_nfsv4
- # Help, part 4 of 5, caution about fsid=0 in case NFSv4 is enabled.
- help_text = Ops.add(
- help_text,
- _(
- "<p>NFSv4 is enabled. Make sure that only one exported filesystem is marked with the fsid=0 option for a particular client.</p>"
- )
- )
-
- # bnc#471874, NFS4 is complex and so is our UI :-/
- # but let's fix the help at least
- # Watch out, the space is necessary between br and slash.
- help_text = Ops.add(
- help_text,
- _(
- "<p>In case of multiple exports to a NFSv4 client,\n" +
- "you need to bind the exported paths with no fsid=0 to the one with fsid=0.\n" +
- "To export the server paths <tt>/Eve</tt> and <tt>/Adam</tt> as\n" +
- "<tt>/</tt> and <tt>/husband</tt>, respectively, use<br />\n" +
- "<pre>/Eve 10.0.0.1(fsid=0,crossmnt,ro,...)\n" +
- "/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre>\n" +
- "</p>"
- )
- )
- end
-
- # Help, part 5 of 5
+ # Help, part 4 of 4
help_text = Ops.add(
help_text,
_("<P>Refer to <tt>man exports</tt> for more information.</P>\n")
@@ -648,31 +619,14 @@
oldmp = nil
# preselect an item - convenience, button enabling
if Ops.greater_than(Builtins.size(exports), 0)
- if NfsServer.enable_nfsv4
- UI.ChangeWidget(
- Id(:exptable),
- :CurrentItem,
- Ops.get_string(exports, [0, "mountpoint"], "")
- )
- else
- UI.ChangeWidget(
- Id(:exportsbox),
- :CurrentItem,
- Ops.get_string(exports, [0, "mountpoint"], "")
- )
- end
+ UI.ChangeWidget(
+ Id(:exportsbox),
+ :CurrentItem,
+ Ops.get_string(exports, [0, "mountpoint"], "")
+ )
end
begin
- mountpoint = ""
- if NfsServer.enable_nfsv4
- mountpoint = Convert.to_string(
- UI.QueryWidget(Id(:exptable), :CurrentItem)
- )
- else
- mountpoint = Convert.to_string(
- UI.QueryWidget(Id(:exportsbox), :CurrentItem)
- )
- end
+ mountpoint = current_export_dir
anymp = mountpoint != nil
@@ -716,7 +670,7 @@
Builtins.sformat(
"%1(%2)",
@use_star_for_anonymous ? "*" : "",
- GetDefaultOpts(NfsServer.enable_nfsv4, exports, "*")
+ GetDefaultOpts(exports, "*")
)
]
exports = Builtins.add(
@@ -724,23 +678,11 @@
{ "mountpoint" => mountpoint2, "allowed" => default_allowed }
)
UI.ReplaceWidget(Id(:exportsrep), ExportsSelBox(exports))
- if NfsServer.enable_nfsv4
- UI.ChangeWidget(Id(:exptable), :CurrentItem, mountpoint2)
- else
- UI.ChangeWidget(Id(:exportsbox), :CurrentItem, mountpoint2)
- end
+ UI.ChangeWidget(Id(:exportsbox), :CurrentItem, mountpoint2)
simulated = :alweditbut
end
elsif ret == :mpeditbut
- mp = nil
-
- if NfsServer.enable_nfsv4
- mp = Convert.to_string(UI.QueryWidget(Id(:exptable), :CurrentItem))
- else
- mp = Convert.to_string(
- UI.QueryWidget(Id(:exportsbox), :CurrentItem)
- )
- end
+ mp = current_export_dir
if mp != nil
mountpoint2 = GetDirectory(mp, Builtins.filter(exports) do |ent|
@@ -756,25 +698,11 @@
UI.ReplaceWidget(Id(:exportsrep), ExportsSelBox(exports))
- if NfsServer.enable_nfsv4
- UI.ChangeWidget(Id(:exptable), :CurrentItem, mountpoint2)
- else
- UI.ChangeWidget(Id(:exportsbox), :CurrentItem, mountpoint2)
- end
+ UI.ChangeWidget(Id(:exportsbox), :CurrentItem, mountpoint2)
end
end
elsif ret == :mpdelbut
- mountpoint2 = nil
-
- if NfsServer.enable_nfsv4
- mountpoint2 = Convert.to_string(
- UI.QueryWidget(Id(:exptable), :CurrentItem)
- )
- else
- mountpoint2 = Convert.to_string(
- UI.QueryWidget(Id(:exportsbox), :CurrentItem)
- )
- end
+ mountpoint2 = current_export_dir
exports = Builtins.filter(exports) do |entry|
Ops.get_string(entry, "mountpoint", "") != mountpoint2
@@ -782,32 +710,14 @@
UI.ReplaceWidget(Id(:exportsrep), ExportsSelBox(exports))
if Ops.greater_than(Builtins.size(exports), 0)
- if NfsServer.enable_nfsv4
- UI.ChangeWidget(
- Id(:exptable),
- :CurrentItem,
- Ops.get_string(exports, [0, "mountpoint"], "")
- )
- else
- UI.ChangeWidget(
- Id(:exportsbox),
- :CurrentItem,
- Ops.get_string(exports, [0, "mountpoint"], "")
- )
- end
- end
- elsif ret == :alwnewbut
- mountpoint2 = nil
-
- if NfsServer.enable_nfsv4
- mountpoint2 = Convert.to_string(
- UI.QueryWidget(Id(:exptable), :CurrentItem)
- )
- else
- mountpoint2 = Convert.to_string(
- UI.QueryWidget(Id(:exportsbox), :CurrentItem)
+ UI.ChangeWidget(
+ Id(:exportsbox),
+ :CurrentItem,
+ Ops.get_string(exports, [0, "mountpoint"], "")
)
end
+ elsif ret == :alwnewbut
+ mountpoint2 = current_export_dir
if mountpoint2 != nil
allowed = FindAllowed(exports, mountpoint2)
@@ -838,24 +748,10 @@
:Items,
AllowedTableItems(allowed)
)
- if NfsServer.enable_nfsv4
- UI.ReplaceWidget(Id(:exportsrep), ExportsSelBox(exports))
- UI.ChangeWidget(Id(:exptable), :CurrentItem, mountpoint2)
- end
end
end
elsif ret == :alweditbut
- mountpoint2 = nil
-
- if NfsServer.enable_nfsv4
- mountpoint2 = Convert.to_string(
- UI.QueryWidget(Id(:exptable), :CurrentItem)
- )
- else
- mountpoint2 = Convert.to_string(
- UI.QueryWidget(Id(:exportsbox), :CurrentItem)
- )
- end
+ mountpoint2 = current_export_dir
if mountpoint2 != nil
allowed = FindAllowed(exports, mountpoint2)
@@ -898,24 +794,10 @@
:Items,
AllowedTableItems(allowed)
)
- if NfsServer.enable_nfsv4
- UI.ReplaceWidget(Id(:exportsrep), ExportsSelBox(exports))
- UI.ChangeWidget(Id(:exptable), :CurrentItem, mountpoint2)
- end
end
end
elsif ret == :alwdelbut
- mountpoint2 = nil
-
- if NfsServer.enable_nfsv4
- mountpoint2 = Convert.to_string(
- UI.QueryWidget(Id(:exptable), :CurrentItem)
- )
- else
- mountpoint2 = Convert.to_string(
- UI.QueryWidget(Id(:exportsbox), :CurrentItem)
- )
- end
+ mountpoint2 = current_export_dir
if mountpoint2 != nil
allowed = FindAllowed(exports, mountpoint2)
@@ -936,10 +818,6 @@
:Items,
AllowedTableItems(allowed)
)
- if NfsServer.enable_nfsv4
- UI.ReplaceWidget(Id(:exportsrep), ExportsSelBox(exports))
- UI.ChangeWidget(Id(:exptable), :CurrentItem, mountpoint2)
- end
end
end
elsif ret == :abort && !Popup.ReallyAbort(true)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.1/testsuite/tests/routines1.out new/yast2-nfs-server-3.1.2/testsuite/tests/routines1.out
--- old/yast2-nfs-server-3.1.1/testsuite/tests/routines1.out 2013-11-15 13:12:10.000000000 +0100
+++ new/yast2-nfs-server-3.1.2/testsuite/tests/routines1.out 2014-01-27 11:09:13.000000000 +0100
@@ -10,8 +10,8 @@
Return nil
Return [`item (`id ("/projects"), "/projects "), `item (`id ("/usr"), "/usr "), `item (`id ("/pub"), "/pub ")]
Return []
-Return `Table (`id (`exptable), `opt (`notify, `immediate), `header ("Directories", "Bindmount Targets"), [`item (`id ("/projects"), "/projects ", ""), `item (`id ("/usr"), "/usr ", ""), `item (`id ("/pub"), "/pub ", "")])
-Return `Table (`id (`exptable), `opt (`notify, `immediate), `header ("Directories", "Bindmount Targets"), [])
+Return `SelectionBox (`id (`exportsbox), `opt (`notify), "Dire&ctories", [`item (`id ("/projects"), "/projects "), `item (`id ("/usr"), "/usr "), `item (`id ("/pub"), "/pub ")])
+Return `SelectionBox (`id (`exportsbox), `opt (`notify), "Dire&ctories", [])
Return [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.localdomain(ro)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
Return [$["allowed":["proj*.local.domain(rw)"], "mountpoint":"/projects"], $["allowed":["*.local.domain(ro)", "@trusted(rw)"], "mountpoint":"/usr"], $["allowed":["(ro,insecure,all_squash)"], "mountpoint":"/pub"]]
Return []
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-nfs-server-3.1.1/testsuite/yast2-nfs-server.test/ag_exports.exp new/yast2-nfs-server-3.1.2/testsuite/yast2-nfs-server.test/ag_exports.exp
--- old/yast2-nfs-server-3.1.1/testsuite/yast2-nfs-server.test/ag_exports.exp 2013-11-15 13:12:10.000000000 +0100
+++ new/yast2-nfs-server-3.1.2/testsuite/yast2-nfs-server.test/ag_exports.exp 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#
-# test driver for External Parser AGents
-#
-
-load_lib "yast2_epag.exp"
-# disable because ycpc -E does not do the kind of normalization we want
-#run_epag_tests "ag_exports"
continue with "q"...
Checked in at Mon Jan 27 12:29:16 CET 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
1
0
Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-installation -> sle12
## BNC# 854500 : "NetworkManager isn't configured to be used for network handling" (RESOLVED/FIXED)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-01-17 14:16:29.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-01-27 11:06:29.000000000 +0100
@@ -1,0 +2,42 @@
+Mon Jan 27 09:56:26 UTC 2014 - mfilka(a)suse.com
+
+- fate#316768, bnc#854500
+ - enable network service according product feature
+- 3.1.24
+
+-------------------------------------------------------------------
+Fri Jan 24 12:01:29 UTC 2014 - lslezak(a)suse.cz
+
+- removed inst_scc.rb client (moved to yast2-registration)
+- 3.1.23
+
+-------------------------------------------------------------------
+Tue Jan 21 14:18:08 UTC 2014 - jreidinger(a)suse.com
+
+- Remove icons from system analysis according to Ken's comments
+ (fate#314695)
+- 3.1.22
+
+-------------------------------------------------------------------
+Tue Jan 21 12:15:21 UTC 2014 - jreidinger(a)suse.com
+
+- Remove "Change..." button in non-textual installation
+- Add "Export Configuration" button in non-textual installation
+ (FATE#308539)
+- Add "Export Configuration" menu item in textual installation
+ (FATE#308539)
+- 3.1.21
+
+-------------------------------------------------------------------
+Tue Jan 21 08:48:17 UTC 2014 - jsrain(a)suse.cz
+
+- adjusted UI according to Ken's comments (fate#314695)
+- 3.1.20
+
+-------------------------------------------------------------------
+Mon Jan 13 09:58:46 UTC 2014 - jreidinger(a)suse.com
+
+- add clone proposal and finish client (FATE#308539)
+- 3.1.19
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-installation
- at least 19 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old)
and /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:31186 MAIL:yast-devel@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation", Maintainer is "yast-devel(a)opensuse.org"
Old:
----
yast2-installation-3.1.18.tar.bz2
New:
----
yast2-installation-3.1.24.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.chfCJZ/_old 2014-01-27 12:27:13.000000000 +0100
+++ /var/tmp/diff_new_pack.chfCJZ/_new 2014-01-27 12:27:13.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-installation
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,33 +17,31 @@
Name: yast2-installation
-Version: 3.1.18
+Version: 3.1.24
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
+Group: System/YaST
+License: GPL-2.0
+Url: http://github.com/yast/yast-installation
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - Installation Parts
-License: GPL-2.0
-Group: System/YaST
Source1: YaST2-Second-Stage.service
Source2: YaST2-Firstboot.service
-BuildRequires: docbook-xsl-stylesheets
-BuildRequires: libxslt
-BuildRequires: rubygem-rspec
-BuildRequires: update-desktop-files
-BuildRequires: yast2-core-devel
+BuildRequires: docbook-xsl-stylesheets libxslt update-desktop-files yast2-core-devel
BuildRequires: yast2-devtools >= 3.1.10
+BuildRequires: rubygem-rspec
# Linuxrc.keys
BuildRequires: yast2 >= 3.1.9
-# AutoinstConfig::getProposalList
-Requires: autoyast2-installation >= 2.17.1
+# clone_system client
+Requires: autoyast2-installation >= 3.1.5
# ProductProfile
Requires: yast2 >= 3.1.9
@@ -95,9 +93,8 @@
Conflicts: yast2-ycp-ui-bindings < 2.17.3
# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103)
+Requires: tar gzip
Requires: coreutils
-Requires: gzip
-Requires: tar
%if 0%{?suse_version} >= 1210
BuildRequires: systemd-devel
@@ -127,12 +124,12 @@
BuildArch: noarch
%package devel-doc
+Group: Documentation/HTML
Requires: yast2-installation >= 2.15.34
PreReq: %fillup_prereq
Summary: YaST2 - Installation Parts
-Group: Documentation/HTML
%description
System installation code as present on installation media.
@@ -159,6 +156,7 @@
install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
+
%post
%{fillup_only -ns security checksig}
@@ -193,6 +191,7 @@
%dir /usr/share/autoinstall/modules
%dir %{yast_yncludedir}/installation
%{yast_yncludedir}/installation/*
+%{yast_libdir}/installation
# agents
%{yast_scrconfdir}/etc_passwd.scr
@@ -221,5 +220,3 @@
%defattr(-,root,root)
%doc %{yast_docdir}
%exclude %{yast_docdir}/COPYING
-
-%changelog
++++++ yast2-installation-3.1.18.tar.bz2 -> yast2-installation-3.1.24.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/doc/installation_clients.md new/yast2-installation-3.1.24/doc/installation_clients.md
--- old/yast2-installation-3.1.18/doc/installation_clients.md 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.24/doc/installation_clients.md 2014-01-27 11:05:46.000000000 +0100
@@ -0,0 +1,61 @@
+Installation Clients
+======================
+
+Installation uses some special clients for inst modules. The goal of this
+article is to describe which one is needed for each task.
+
+
+Wizard Plug-in (`inst_` client)
+-----------------------------------------
+
+When a new dialog needs to be added into the installation work-flow then a new
+client with `inst_` prefix needs to be created. (In general it can be any
+client, this is a convention. The work-flow manager can find also the clients
+without the prefix.)
+
+The new client needs to be added to the installation control file to (the work-flow
+section)[TODO link], and the file must be present in the inst-sys during
+installation. (It can be part of the inst-sys or it can be added dynamically
+from an add-on media or via (Driver Update)[http://en.opensuse.org/SDB:Linuxrc#p_dud])
+
+
+Installation Summary Plug-in (`_proposal` client)
+-----------------------------------------------------------
+
+When a new module should be seen only in the installation summary page or in a
+different proposal screen, then a client with suffix `_proposal` is used. Such
+client must accept string as the first parameter which specifies the action
+which is being performed and a `Hash` as the second parameter with optional
+arguments.
+
+The proposals are defined in the installation control file in (the proposal
+section)[TODO link].
+
+The actions can be:
+
+- `"MakeProposal"` that creates a proposal for the module. It can have parameter `"force_reset"`
+ that can force reset and create a new one from scratch. Response is a `Hash` with proposal text,
+ optional link definitions and a help text. **TODO specify exactly format.**
+- `"AskUser"` for automatic or manual user request to change the proposed configuration. Parameter is
+ `"chosen_id"` which specify action. It can be `"id"` from `"Description"` action
+ which should open dialog to modify values or links specified in `"MakeProposal"`
+ which should do action depending on link like disable service. Returns if proposal changed. **TODO exact structure**
+- `"Description"` to get the description of the proposal in rich text, menu item and its `"id"`.
+ **TODO describe here exact structure and examples**
+- `"Write"` to write the settings. Called only if the proposal is not skipped. **TODO looks like now all proposals are skipped**
+
+
+Write Plug-in at the End of Installation (`_finish` client )
+--------------------------------------------
+
+When a module needs to write its settings at the end of installation then a
+client with suffix `_finish` is used. Such client must accept string as the
+first parameter which specifies the action that is being performed.
+
+The list finish clients is specified in `inst_finish.rb` client.
+
+Actions can be:
+
+- `"Info"` that gets the information about client (like number of steps, its title
+ and in which mode it should be used). **TODO exact structure and example**
+- `"Write"` to write the settings.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/package/yast2-installation.changes new/yast2-installation-3.1.24/package/yast2-installation.changes
--- old/yast2-installation-3.1.18/package/yast2-installation.changes 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/package/yast2-installation.changes 2014-01-27 11:05:46.000000000 +0100
@@ -1,4 +1,46 @@
-------------------------------------------------------------------
+Mon Jan 27 09:56:26 UTC 2014 - mfilka(a)suse.com
+
+- fate#316768, bnc#854500
+ - enable network service according product feature
+- 3.1.24
+
+-------------------------------------------------------------------
+Fri Jan 24 12:01:29 UTC 2014 - lslezak(a)suse.cz
+
+- removed inst_scc.rb client (moved to yast2-registration)
+- 3.1.23
+
+-------------------------------------------------------------------
+Tue Jan 21 14:18:08 UTC 2014 - jreidinger(a)suse.com
+
+- Remove icons from system analysis according to Ken's comments
+ (fate#314695)
+- 3.1.22
+
+-------------------------------------------------------------------
+Tue Jan 21 12:15:21 UTC 2014 - jreidinger(a)suse.com
+
+- Remove "Change..." button in non-textual installation
+- Add "Export Configuration" button in non-textual installation
+ (FATE#308539)
+- Add "Export Configuration" menu item in textual installation
+ (FATE#308539)
+- 3.1.21
+
+-------------------------------------------------------------------
+Tue Jan 21 08:48:17 UTC 2014 - jsrain(a)suse.cz
+
+- adjusted UI according to Ken's comments (fate#314695)
+- 3.1.20
+
+-------------------------------------------------------------------
+Mon Jan 13 09:58:46 UTC 2014 - jreidinger(a)suse.com
+
+- add clone proposal and finish client (FATE#308539)
+- 3.1.19
+
+-------------------------------------------------------------------
Wed Jan 8 12:46:34 UTC 2014 - jsrain(a)suse.cz
- added capability to install OEM images (fate#316326)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/package/yast2-installation.spec new/yast2-installation-3.1.24/package/yast2-installation.spec
--- old/yast2-installation-3.1.18/package/yast2-installation.spec 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/package/yast2-installation.spec 2014-01-27 11:05:46.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.18
+Version: 3.1.24
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -25,6 +25,7 @@
Group: System/YaST
License: GPL-2.0
+Url: http://github.com/yast/yast-installation
Requires: yast2-ruby-bindings >= 1.0.0
Summary: YaST2 - Installation Parts
@@ -39,8 +40,8 @@
# Linuxrc.keys
BuildRequires: yast2 >= 3.1.9
-# AutoinstConfig::getProposalList
-Requires: autoyast2-installation >= 2.17.1
+# clone_system client
+Requires: autoyast2-installation >= 3.1.5
# ProductProfile
Requires: yast2 >= 3.1.9
@@ -190,6 +191,7 @@
%dir /usr/share/autoinstall/modules
%dir %{yast_yncludedir}/installation
%{yast_yncludedir}/installation/*
+%{yast_libdir}/installation
# agents
%{yast_scrconfdir}/etc_passwd.scr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/Makefile.am new/yast2-installation-3.1.24/src/Makefile.am
--- old/yast2-installation-3.1.18/src/Makefile.am 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/src/Makefile.am 2014-01-27 11:05:46.000000000 +0100
@@ -8,6 +8,8 @@
modules/SystemFilesCopy.rb
client_DATA = \
+ clients/clone_proposal.rb \
+ clients/clone_finish.rb \
clients/copy_files_finish.rb \
clients/copy_logs_finish.rb \
clients/copy_systemfiles_finish.rb \
@@ -45,7 +47,6 @@
clients/inst_restore_settings.rb \
clients/inst_rpmcopy_secondstage.rb \
clients/inst_save_hardware_status.rb \
- clients/inst_scc.rb \
clients/inst_scenarios.rb \
clients/inst_system_analysis.rb \
clients/inst_upgrade_urls.rb \
@@ -100,6 +101,11 @@
fillup_DATA = \
fillup/sysconfig.security-checksig
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA)
+ylibdir = "${yast2dir}/lib/installation"
+ylib_DATA = \
+ lib/installation/clone_settings.rb
+
+
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(schemafiles_DATA) $(desktop_DATA) $(fillup_DATA) $(ylib_DATA)
include $(top_srcdir)/Makefile.am.common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/clients/clone_finish.rb new/yast2-installation-3.1.24/src/clients/clone_finish.rb
--- old/yast2-installation-3.1.18/src/clients/clone_finish.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.24/src/clients/clone_finish.rb 2014-01-27 11:05:46.000000000 +0100
@@ -0,0 +1,70 @@
+# encoding: utf-8
+
+# ------------------------------------------------------------------------------
+# Copyright (c) 2014 Novell, Inc. All Rights Reserved.
+#
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of version 2 of the GNU General Public License as published by the
+# Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, contact Novell, Inc.
+#
+# To contact Novell about this file by physical or electronic mail, you may find
+# current contact information at www.novell.com.
+# ------------------------------------------------------------------------------
+
+
+module Yast
+ import "Installation"
+
+ class CloneFinishClient < Client
+ def main
+
+ textdomain "installation"
+
+ func = ""
+
+ # Check arguments
+ args = WFM.Args
+ if args.size > 0 && args[0].is_a?(::String)
+ func = args[0]
+ end
+
+ Builtins.y2milestone("starting clone_finish")
+ Builtins.y2debug("func=%1", func)
+
+ case func
+ when "Info"
+ return {
+ "steps" => 1,
+ # progress step title
+ "title" => _(
+ "Generating AutoYaST profile if needed..."
+ ),
+ "when" => [:installation]
+ }
+ when "Write"
+ WFM.call("clone_proposal", ["Write"])
+
+ # copy from insts_sys to target system
+ if File.exists? "/root/autoinst.xml"
+ WFM.Execute(path(".local.bash"), "cp /root/autoinst.xml #{Installation.destdir}/root/autoinst.xml")
+ end
+
+ Builtins.y2milestone("clone_finish Write finished")
+ else
+ raise ("unknown function: #{func}")
+ end
+
+ return nil
+ end
+ end
+end
+
+Yast::CloneFinishClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/clients/clone_proposal.rb new/yast2-installation-3.1.24/src/clients/clone_proposal.rb
--- old/yast2-installation-3.1.18/src/clients/clone_proposal.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.24/src/clients/clone_proposal.rb 2014-01-27 11:05:46.000000000 +0100
@@ -0,0 +1,125 @@
+require "installation/clone_settings"
+
+module Yast
+ import "UI"
+ import "Label"
+
+ class CloneProposalClient < Client
+ CLONE_ENABLE_LINK = "clone_enable"
+ CLONE_DISABLE_LINK = "clone_disable"
+ CLONE_ACTION_ID = "clone"
+
+ def main
+ textdomain "installation"
+
+ @clone_settings = ::Installation::CloneSettings.instance
+ Yast.import "Installation"
+ Yast.import "ProductFeatures"
+
+ func = WFM.Args(0)
+ param = WFM.Args(1)
+
+ product_clone_active = ProductFeatures.GetBooleanFeature(
+ "globals",
+ "enable_clone"
+ )
+ if @clone_settings.enabled.nil?
+ y2milestone("Set default value for cloning")
+ @clone_settings.enabled = product_clone_active
+ end
+
+ case func
+ when "MakeProposal"
+ @clone_settings.enabled = product_clone_active if param["force_reset"]
+
+ ret = {
+ "preformatted_proposal" => proposal_text,
+ "links" => [CLONE_ENABLE_LINK, CLONE_DISABLE_LINK],
+ # TRANSLATORS: help text
+ "help" => _(
+ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n" +
+ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n" +
+ "needs a profile to know what the installed system should look like. If this option is\n" +
+ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
+ )
+ }
+ when "AskUser"
+ chosen_id = Ops.get(param, "chosen_id")
+ Builtins.y2milestone(
+ "Clone proposal change requested, id %1",
+ chosen_id
+ )
+
+ case chosen_id
+ when CLONE_DISABLE_LINK
+ @clone_settings.enabled = false
+ when CLONE_ENABLE_LINK
+ @clone_settings.enabled = true
+ when CLONE_ACTION_ID
+ clone_dialog
+ else
+ raise "Unexpected value #{chosen_id}"
+ end
+
+ ret = { "workflow_sequence" => :next }
+ when "Description"
+ ret = {
+ # this is a heading
+ "rich_text_title" => _("Clone System Configuration"),
+ # this is a menu entry
+ "menu_title" => _("&Clone System Configuration"),
+ "id" => CLONE_ACTION_ID
+ }
+ when "Write"
+ WFM.call "clone_system" if @clone_settings.enabled?
+ ret = true
+ else
+ raise "Unsuported action #{func}"
+ end
+
+ return ret
+ end
+
+ def proposal_text
+ ret = "<ul><li>\n"
+
+ if @clone_settings.enabled?
+ ret << Builtins.sformat(
+ # TRANSLATORS: Installation overview
+ # IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
+ _(
+ "The AutoYaST profile will be written under /root/autoinst.xml (<a href=\"%1\">do not write it</a>)."
+ ),
+ CLONE_DISABLE_LINK
+ )
+ else
+ ret << Builtins.sformat(
+ # TRANSLATORS: Installation overview
+ # IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
+ _(
+ "The AutoYaST profile will not be saved (<a href=\"%1\">write it</a>)."
+ ),
+ CLONE_ENABLE_LINK
+ )
+ end
+
+ ret << "</li></ul>\n"
+ end
+
+ def clone_dialog
+ dialog = VBox(
+ CheckBox(Id(:value_holder), _("Write AutoYaST profile to /root/autoinst.xml"),
+ @clone_settings.enabled?
+ ),
+ PushButton(Id(:ok), Label.OKButton)
+ )
+
+ UI.OpenDialog dialog
+ UI.UserInput
+ @clone_settings.enabled = UI.QueryWidget(:value_holder, :Value)
+ UI.CloseDialog
+ end
+ end
+end
+
+Yast::CloneProposalClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/clients/inst_complex_welcome.rb new/yast2-installation-3.1.24/src/clients/inst_complex_welcome.rb
--- old/yast2-installation-3.1.18/src/clients/inst_complex_welcome.rb 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/src/clients/inst_complex_welcome.rb 2014-01-27 11:05:46.000000000 +0100
@@ -120,21 +120,16 @@
Left(
HSquash(
HBox(
- HSquash(Icon.Simple("yast-language")),
- @text_mode ? Empty() : HSpacing(2),
- Left(@languagesel),
- HSpacing(1),
- HSquash(Icon.Simple("yast-keyboard")),
- @text_mode ? Empty() : HSpacing(2),
- Left(@keyboardsel),
- HSpacing(10)
+ HWeight(1, Left(@languagesel)),
+ HSpacing(3),
+ HWeight(1, Left(@keyboardsel))
)
)
),
VSpacing(1),
VWeight(1, VStretch()),
VWeight(
- 20,
+ 30,
Left(
HSquash(
VBox(
@@ -229,8 +224,6 @@
UI.ChangeWidget(Id(:keyboard), :Value, @kbd)
end
- Wizard.SetTitleIcon("suse")
-
# Get the user input.
#
@ret = nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/clients/inst_finish.rb new/yast2-installation-3.1.24/src/clients/inst_finish.rb
--- old/yast2-installation-3.1.18/src/clients/inst_finish.rb 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/src/clients/inst_finish.rb 2014-01-27 11:05:46.000000000 +0100
@@ -129,6 +129,7 @@
"autoinst_scripts1",
"copy_files",
"copy_systemfiles",
+ "clone",
# For live installer only
Mode.live_installation ? "live_copy_files" : "",
"switch_scr"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/clients/inst_proposal.rb new/yast2-installation-3.1.24/src/clients/inst_proposal.rb
--- old/yast2-installation-3.1.18/src/clients/inst_proposal.rb 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/src/clients/inst_proposal.rb 2014-01-27 11:05:46.000000000 +0100
@@ -50,6 +50,7 @@
Yast.import "Popup"
Yast.import "Language"
Yast.import "GetInstArgs"
+ Yast.import "String"
Yast.include self, "installation/misc.rb"
@@ -175,9 +176,8 @@
get_submod_descriptions_and_build_menu
end
- # check for hyperlink id
-
- if Ops.is_string?(@input)
+ case @input
+ when ::String #hyperlink
# get module for hyperlink id
@submod = Ops.get_string(@id2submod, @input, "")
@@ -200,25 +200,33 @@
# so we have to do this special case here. Kind of broken.
return :finish if @input == :finish
end
- elsif @input == "rel_notes"
- WFM.CallFunction("release_notes_popup", [])
- elsif @input == :finish
+ when :finish
return :finish
- elsif @input == :abort
+ when :abort
if Stage.initial
return :abort if Popup.ConfirmAbort(:painless)
else
return :abort if Popup.ConfirmAbort(:incomplete)
end
- elsif @input == :reset_to_defaults &&
- Popup.ContinueCancel(
+ when :reset_to_defaults
+ next unless Popup.ContinueCancel(
# question in a popup box
_("Really reset everything to default values?") + "\n" +
# explain consequences of a decision
_("You will lose all changes.")
)
make_proposal(true, false) # force_reset
- elsif @input == :skip || @input == :dontskip
+ when :export_config
+ path = UI.AskForSaveFileName("/", "*.xml", _("Location of Stored Configuration"))
+ next unless path
+
+ WFM.CallFunction("clone_proposal", ["Write"])
+ if !File.exists?("/root/autoinst.xml")
+ raise _("Failed to store configuration. Details can be found in log.")
+ end
+
+ WFM.Execute(path(".local.bash"), "mv -- /root/autoinst.xml '#{String.Quote(path)}'")
+ when :skip, :dontskip
if Convert.to_boolean(UI.QueryWidget(Id(:skip), :Value))
# User doesn't want to use any of the settings
UI.ChangeWidget(
@@ -236,7 +244,7 @@
make_proposal(false, false)
UI.ChangeWidget(Id(:menu), :Enabled, true)
end
- elsif @input == :next
+ when :next
@skip = UI.WidgetExists(Id(:skip)) ?
Convert.to_boolean(UI.QueryWidget(Id(:skip), :Value)) :
true
@@ -270,18 +278,13 @@
Wizard.HideReleaseNotesButton
return :next
end
- elsif @input == :back
+ when :back
Wizard.HideReleaseNotesButton
Wizard.SetNextButton(:next, Label.NextButton) if Stage.initial
return :back
end
end # while input loop
-
- # NOTREACHED
-
- # EOF
-
nil
end
@@ -984,15 +987,25 @@
)
)
+ if UI.TextMode()
+ change_point = ReplacePoint(
+ Id(:rep_menu),
+ # menu button
+ MenuButton(Id(:menu_dummy), _("&Change..."), [Item(Id(:dummy), "")])
+ )
+ else
+ change_point = PushButton(
+ Id(:export_config),
+ # menu button
+ _("&Export Configuration")
+ )
+ end
+
# change menu
menu_box = VBox(
HBox(
HStretch(),
- ReplacePoint(
- Id(:rep_menu),
- # menu button
- MenuButton(Id(:menu_dummy), _("&Change..."), [Item(Id(:dummy), "")])
- ),
+ change_point,
HStretch()
),
ReplacePoint(Id("inst_proposal_progress"), Empty())
@@ -1054,9 +1067,15 @@
# May contain newlines, but don't make it very much longer than the original.
Left(
Label(
- _(
- "Click a headline to make changes or use the \"Change...\" menu below."
- )
+ if UI.TextMode()
+ _(
+ "Click a headline to make changes or use the \"Change...\" menu below."
+ )
+ else
+ _(
+ "Click a headline to make changes."
+ )
+ end
)
),
rt,
@@ -1084,6 +1103,7 @@
nil
end
+
def get_submod_descriptions_and_build_menu
menu_list = []
new_submodules = []
@@ -1091,34 +1111,29 @@
@titles = []
descriptions = {}
- Builtins.foreach(@submodules) do |submod|
+ @submodules.each do |submod|
description = submod_description(submod)
- if description == nil
+ if description.nil?
Builtins.y2milestone(
"Submodule %1 not available (not installed?)",
submod
)
else
if description != {}
- Ops.set(description, "no", no)
- Ops.set(descriptions, submod, description)
- new_submodules = Builtins.add(new_submodules, submod)
- title = Ops.get_string(
- description,
- "rich_text_title",
- Ops.get_string(description, "rich_text_raw_title", submod)
- )
- id = Ops.get_string(
- description,
- "id",
- Builtins.sformat("module_%1", no)
- )
+ description["no"] = no
+ descriptions[submod] = description
+ new_submodules << submod
+ title = description["rich_text_title"] ||
+ description["rich_text_raw_title"] ||
+ submod
+
+ id = description["id"] || Builtins.sformat("module_%1", no)
+
+ @titles << title
+ @submod2id[submod] = id
+ @id2submod[id] = submod
- @titles = Builtins.add(@titles, title)
- Ops.set(@submod2id, submod, id)
- Ops.set(@id2submod, id, submod)
-
- no = Ops.add(no, 1)
+ no += 1
end
end
end
@@ -1126,52 +1141,47 @@
@submodules = deep_copy(new_submodules) # maybe some submodules are not installed
Builtins.y2milestone("Execution order after rewrite: %1", @submodules)
- # now build the menu button
- Builtins.foreach(@submodules_presentation) do |submod|
- descr = Ops.get_map(descriptions, submod, {})
- if descr != {}
- no2 = Ops.get_integer(descr, "no", 0)
- id = Ops.get_string(descr, "id", Builtins.sformat("module_%1", no2))
- if Builtins.haskey(descr, "menu_titles")
- Builtins.foreach(Ops.get_list(descr, "menu_titles", [])) do |i|
- id2 = Ops.get(i, "id", "")
- title = Ops.get(i, "title", "")
- if id2 != "" && title != ""
- menu_list = Builtins.add(
- menu_list,
- Item(Id(id2), Ops.add(title, "..."))
- )
+ if UI.TextMode
+ # now build the menu button
+ Builtins.foreach(@submodules_presentation) do |submod|
+ descr = descriptions[submod] || {}
+ next if descr.empty?
+
+ no2 = descr["no"] || 0
+ id = descr["id"] || Builtins.sformat("module_%1", no2)
+ if descr.has_key? "menu_titles"
+ descr["menu_titles"].each do |i|
+ id2 = i["id"]
+ title = i["title"]
+ if id2 && title
+ menu_list << Item(Id(id2), Ops.add(title, "..."))
else
Builtins.y2error("Invalid menu item: %1", i)
end
end
else
- menu_title = Ops.get_string(
- descr,
- "menu_title",
- Ops.get_string(descr, "rich_text_title", submod)
- )
- menu_list = Builtins.add(
- menu_list,
- Item(Id(id), Ops.add(menu_title, "..."))
- )
+ menu_title = descr["menu_title"] ||
+ descr["rich_text_title"] ||
+ submod
+
+ menu_list << Item(Id(id), Ops.add(menu_title, "..."))
end
end
- end
- # menu button item
- menu_list = Builtins.add(
- menu_list,
- Item(Id(:reset_to_defaults), _("&Reset to defaults"))
- )
- # menu button
- UI.ReplaceWidget(
- Id(:rep_menu),
- MenuButton(Id(:menu), _("&Change..."), menu_list)
- )
+ # menu button item
+ menu_list << Item(Id(:reset_to_defaults), _("&Reset to defaults")) <<
+ Item(Id(:export_config), _("&Export Configuration"))
+
+ # menu button
+ UI.ReplaceWidget(
+ Id(:rep_menu),
+ MenuButton(Id(:menu), _("&Change..."), menu_list)
+ )
+ end
- Ops.greater_than(no, 1)
+ return no > 1
end
+
def set_icon
icon = "yast-software"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/clients/inst_scc.rb new/yast2-installation-3.1.24/src/clients/inst_scc.rb
--- old/yast2-installation-3.1.18/src/clients/inst_scc.rb 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/src/clients/inst_scc.rb 1970-01-01 01:00:00.000000000 +0100
@@ -1,109 +0,0 @@
-# encoding: utf-8
-
-# ------------------------------------------------------------------------------
-# Copyright (c) 2013 Novell, Inc. All Rights Reserved.
-#
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of version 2 of the GNU General Public License as published by the
-# Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, contact Novell, Inc.
-#
-# To contact Novell about this file by physical or electronic mail, you may find
-# current contact information at www.novell.com.
-# ------------------------------------------------------------------------------
-#
-# Summary: Ask user for the SCC credentials
-#
-
-module Yast
- class InstSccClient < Client
- def main
- Yast.import "UI"
-
- textdomain "installation"
-
- Yast.import "Popup"
- Yast.import "GetInstArgs"
- Yast.import "Wizard"
- Yast.import "Report"
-
- @test_mode = WFM.Args.include?("test")
-
- Wizard.CreateDialog if @test_mode
-
- show_scc_credentials_dialog
-
- ret = nil
- email = nil
- reg_code = nil
-
- continue_buttons = [:next, :back, :close, :abort]
- while !continue_buttons.include?(ret) do
- ret = UI.UserInput
-
- if ret == :next
- email = UI.QueryWidget(Id(:email), :Value)
- reg_code = UI.QueryWidget(Id(:reg_code), :Value)
-
- # TODO: validate the email and the reg_key ?? How to skip registration then?
- #if email.empty?
- # Popup.Error(_("The email address cannot be empty."))
- # ret = nil
- #end
- end
- end
-
- if ret == :next && email && reg_code
- Popup.ShowFeedback(_("Sending Data"), _("Contacting the SUSE Customer Center server..."))
-
- # TODO: connect to the SCC server here
- sleep(7)
-
- Popup.ClearFeedback
- end
-
- Wizard.CloseDialog if @test_mode
-
- return ret
- end
-
-
- private
-
- def scc_credentials_dialog
- Frame(_("SUSE Customer Center Credentials"),
- MarginBox(1, 0.5,
- VBox(
- InputField(Id(:email), _("&Email")),
- VSpacing(0.5),
- InputField(Id(:reg_code), _("Registration &Code"))
- )
- )
- )
- end
-
- def scc_help_text
- # TODO: improve the help text
- _("Enter SUSE Customer Center credentials here to register the system to get updates and add-on products.")
- end
-
- def show_scc_credentials_dialog
- Wizard.SetContents(
- _("SUSE Customer Center Registration"),
- scc_credentials_dialog,
- scc_help_text,
- GetInstArgs.enable_back || @test_mode,
- GetInstArgs.enable_next || @test_mode
- )
- end
- end
-end
-
-Yast::InstSccClient.new.main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/clients/inst_system_analysis.rb new/yast2-installation-3.1.24/src/clients/inst_system_analysis.rb
--- old/yast2-installation-3.1.18/src/clients/inst_system_analysis.rb 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/src/clients/inst_system_analysis.rb 2014-01-27 11:05:46.000000000 +0100
@@ -91,7 +91,6 @@
@actions_todo = []
@actions_doing = []
@actions_functions = []
- @visible_icons = []
Builtins.y2milestone("Probing done: %1", Installation.probing_done)
if !Installation.probing_done
@@ -107,10 +106,6 @@
@actions_functions,
fun_ref(method(:ActionUSB), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-usb.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -126,10 +121,6 @@
@actions_functions,
fun_ref(method(:ActionFireWire), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-firewire.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -145,10 +136,6 @@
@actions_functions,
fun_ref(method(:ActionFloppyDisks), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-floppy.png"
- )
end
# TRANSLATORS: progress step
@@ -165,10 +152,6 @@
@actions_functions,
fun_ref(method(:ActionHHDControllers), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-hdd-controller.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -184,10 +167,6 @@
@actions_functions,
fun_ref(method(:ActionLoadModules), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-hdd-controller-kernel-module.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(@actions_todo, _("Probe hard disks"))
@@ -200,7 +179,6 @@
@actions_functions,
fun_ref(method(:ActionHDDProbe), "boolean ()")
)
- @visible_icons = Builtins.add(@visible_icons, "32x32/apps/yast-hdd.png")
WFM.CallFunction("inst_features", [])
end
@@ -219,10 +197,6 @@
@actions_functions,
fun_ref(method(:SearchForLinuxPartitions), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-search-linux-partition.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(@actions_todo, _("Search for system files"))
@@ -236,10 +210,6 @@
@actions_functions,
fun_ref(method(:FilesFromOlderSystems), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-system-files.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -255,10 +225,6 @@
@actions_functions,
fun_ref(method(:EvaluateUpdatePossibilities), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-update-possibility.png"
- )
# TRANSLATORS: progress step
@actions_todo = Builtins.add(
@@ -274,12 +240,8 @@
@actions_functions,
fun_ref(method(:InitInstallationRepositories), "boolean ()")
)
- @visible_icons = Builtins.add(
- @visible_icons,
- "32x32/apps/yast-package-manager.png"
- )
- Progress.NewProgressIcons(
+ Progress.New(
# TRANSLATORS: dialog caption
_("System Probing"),
" ",
@@ -287,8 +249,7 @@
@actions_todo,
@actions_doing,
# TRANSLATORS: dialog help
- _("YaST is probing computer hardware and installed systems now."),
- [@visible_icons]
+ _("YaST is probing computer hardware and installed systems now.")
)
Builtins.foreach(@actions_functions) do |run_function|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/clients/network_finish.rb new/yast2-installation-3.1.24/src/clients/network_finish.rb
--- old/yast2-installation-3.1.18/src/clients/network_finish.rb 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/src/clients/network_finish.rb 2014-01-27 11:05:46.000000000 +0100
@@ -42,6 +42,7 @@
Yast.import "Linuxrc"
Yast.import "String"
Yast.import "NetworkService"
+ Yast.import "Lan"
@ret = nil
@func = ""
@@ -69,6 +70,15 @@
"when" => [:installation, :update, :autoinst]
}
elsif @func == "Write"
+
+ if Lan.UseNetworkManager
+ NetworkService.use_network_manager
+ else
+ NetworkService.use_wicked
+ end
+
+ NetworkService.EnableDisableNow
+
# if network running, write network configuration
# also in case of IPv6 (bnc#477917)
if NetworkService.isNetworkRunning || NetworkService.isNetworkv6Running
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/src/lib/installation/clone_settings.rb new/yast2-installation-3.1.24/src/lib/installation/clone_settings.rb
--- old/yast2-installation-3.1.18/src/lib/installation/clone_settings.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-installation-3.1.24/src/lib/installation/clone_settings.rb 2014-01-27 11:05:46.000000000 +0100
@@ -0,0 +1,11 @@
+require "singleton"
+
+module Installation
+ # helper module to make proposal value persistent
+ class CloneSettings
+ include Singleton
+
+ attr_accessor :enabled
+ alias_method :enabled?, :enabled
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.18/startup/Makefile.am new/yast2-installation-3.1.24/startup/Makefile.am
--- old/yast2-installation-3.1.18/startup/Makefile.am 2014-01-08 15:45:47.000000000 +0100
+++ new/yast2-installation-3.1.24/startup/Makefile.am 2014-01-27 11:05:46.000000000 +0100
@@ -4,7 +4,6 @@
ystartupbindir=$(ystartupdir)/startup
ystartupbin_SCRIPTS = \
- AUTHOR \
YaST2.First-Stage \
YaST2.Second-Stage \
YaST2.call \
continue with "q"...
Checked in at Mon Jan 27 12:28:27 CET 2014 by ro
Remember to have fun...
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
1
0
![](https://seccdn.libravatar.org/avatar/48aac6e4860a93ba11c4d81866ce1b14.jpg?s=120&d=mm&r=g)
[yast-devel] Request 214785 changed to accepted (submit openSUSE:Factory/yast2-iscsi-client)
by Tomáš Chvátal 27 Jan '14
by Tomáš Chvátal 27 Jan '14
27 Jan '14
Visit https://build.opensuse.org/request/show/214785
State of request 214785 was changed by scarabeus_factory:
new -> accepted
Comment:
checkin
Actions:
- submit YaST:Head/yast2-iscsi-client => openSUSE:Factory/yast2-iscsi-client
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
1
0
![](https://seccdn.libravatar.org/avatar/48aac6e4860a93ba11c4d81866ce1b14.jpg?s=120&d=mm&r=g)
[yast-devel] Request 214784 changed to accepted (submit openSUSE:Factory/yast2-testsuite)
by Tomáš Chvátal 27 Jan '14
by Tomáš Chvátal 27 Jan '14
27 Jan '14
Visit https://build.opensuse.org/request/show/214784
State of request 214784 was changed by scarabeus_factory:
new -> accepted
Comment:
checkin
Actions:
- submit YaST:Head/yast2-testsuite => openSUSE:Factory/yast2-testsuite
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
1
0
![](https://seccdn.libravatar.org/avatar/48aac6e4860a93ba11c4d81866ce1b14.jpg?s=120&d=mm&r=g)
[yast-devel] Request 214768 changed to accepted (submit openSUSE:Factory/yast2-theme)
by Tomáš Chvátal 27 Jan '14
by Tomáš Chvátal 27 Jan '14
27 Jan '14
Visit https://build.opensuse.org/request/show/214768
State of request 214768 was changed by scarabeus_factory:
new -> accepted
Comment:
checkin
Actions:
- submit YaST:Head/yast2-theme => openSUSE:Factory/yast2-theme
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
1
0
why was this moved to the NTP details screen?
--
"The wise are known for their understanding, and pleasant
words are persuasive." Proverbs 16:21 (New Living Translation)
Team OS/2 ** Reg. Linux User #211409 ** a11y rocks!
Felix Miata *** http://fm.no-ip.com/
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
3
5
This email is automatic generated from yast CI node. It lists of pull requests that have no activity more then three working days. If your module is listed, please check all pull request, why they are not merged yet.
Pending requests in repository yast-network:
- Doc: cleanup old, add a new diagram (40 days)
https://github.com/yast/yast-network/pull/142
- propose new object API for devices (39 days)
https://github.com/yast/yast-network/pull/128
Pending requests in repository yast-packager:
- Display a warning when using online repositories with less than 1GiB RAM (20 days)
https://github.com/yast/yast-packager/pull/33
Pending requests in repository yast-yast2:
- Document and test AsciiFile (18 days)
https://github.com/yast/yast-yast2/pull/149
Pending requests in repository skelcd-control-openSUSE:
- Installation Media removed from upgrade proposal (13 days)
https://github.com/yast/skelcd-control-openSUSE/pull/4
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
1
0
![](https://seccdn.libravatar.org/avatar/e4e8389140088920840a562d3ea05469.jpg?s=120&d=mm&r=g)
[yast-devel] Request 214686 changed to accepted (submit openSUSE:Factory/yast2)
by Stephan Kulow 24 Jan '14
by Stephan Kulow 24 Jan '14
24 Jan '14
Visit https://build.opensuse.org/request/show/214686
State of request 214686 was changed by coolo:
new -> accepted
Comment:
checkin
Actions:
- submit YaST:Head/yast2 => openSUSE:Factory/yast2
--
Configure notifications at https://build.opensuse.org/user/notifications
openSUSE Build Service (https://build.opensuse.org/)
--
To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org
To contact the owner, e-mail: yast-devel+owner(a)opensuse.org
1
0