[yast-commit] [ci_new_pac] JFYI yast2-installation -> sle12

14 Mar 2014

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




Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes	2014-03-12 16:59:13.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes	2014-03-13 14:27:49.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Mar 13 09:46:18 UTC 2014 - jreidinger@suse.com
+
+- add kernel parameters for s390 when cio_ignore enabled to never
+  blacklist console or ipl devices (fate#315318)
+- 3.1.54
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-installation
- at least 20 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old)
 and      /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:34314 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-installation", Maintainer is "yast-commit@opensuse.org"


Old:
----
  yast2-installation-3.1.53.tar.bz2

New:
----
  yast2-installation-3.1.54.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.9Gi4lk/_old	2014-03-14 11:50:47.000000000 +0100
+++ /var/tmp/diff_new_pack.9Gi4lk/_new	2014-03-14 11:50:47.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.53
+Version:        3.1.54
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-installation-3.1.53.tar.bz2 -> yast2-installation-3.1.54.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.53/package/yast2-installation.changes new/yast2-installation-3.1.54/package/yast2-installation.changes
--- old/yast2-installation-3.1.53/package/yast2-installation.changes	2014-03-12 13:54:30.000000000 +0100
+++ new/yast2-installation-3.1.54/package/yast2-installation.changes	2014-03-13 14:24:33.000000000 +0100
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Thu Mar 13 09:46:18 UTC 2014 - jreidinger@suse.com
+
+- add kernel parameters for s390 when cio_ignore enabled to never
+  blacklist console or ipl devices (fate#315318)
+- 3.1.54
+
+-------------------------------------------------------------------
 Wed Mar 12 12:00:40 UTC 2014 - mfilka@suse.com
 
 - bnc#858523
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.53/package/yast2-installation.spec new/yast2-installation-3.1.54/package/yast2-installation.spec
--- old/yast2-installation-3.1.53/package/yast2-installation.spec	2014-03-12 13:54:30.000000000 +0100
+++ new/yast2-installation-3.1.54/package/yast2-installation.spec	2014-03-13 14:24:33.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.53
+Version:        3.1.54
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.53/src/lib/installation/cio_ignore.rb new/yast2-installation-3.1.54/src/lib/installation/cio_ignore.rb
--- old/yast2-installation-3.1.53/src/lib/installation/cio_ignore.rb	2014-03-12 13:54:30.000000000 +0100
+++ new/yast2-installation-3.1.54/src/lib/installation/cio_ignore.rb	2014-03-13 14:24:33.000000000 +0100
@@ -149,9 +149,31 @@
           raise "cio_ignore command failed with stderr: #{res["stderr"]}"
         end
 
+        # add kernel parameters that ensure that ipl and console device is never
+        # blacklisted (fate#315318)
+        add_boot_kernel_parameters
+
         nil
       else
-        raise "Uknown action passed as first parameter"
+        raise "Uknown action #{func} passed as first parameter"
+      end
+    end
+
+  private
+    def add_boot_kernel_parameters
+      Yast.import "Bootloader"
+
+      res = Yast::Bootloader.Read
+
+      # API is not much intuitive, see Yast::Bootloader.setKernelParam for details
+      res &&= Yast::Bootloader.setKernelParam("DEFAULT", "IPLDEV", "true")
+      res &&= Yast::Bootloader.setKernelParam("DEFAULT", "CONDEV", "true")
+
+
+      res &&= Yast::Bootloader.Write
+
+      if !res
+        raise "failed to write kernel parameters for IPL and console device"
       end
     end
   end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.53/test/cio_ignore_test.rb new/yast2-installation-3.1.54/test/cio_ignore_test.rb
--- old/yast2-installation-3.1.53/test/cio_ignore_test.rb	2014-03-12 13:54:30.000000000 +0100
+++ new/yast2-installation-3.1.54/test/cio_ignore_test.rb	2014-03-13 14:24:33.000000000 +0100
@@ -105,11 +105,24 @@
     end
 
     describe "first parameter \"Write\"" do
+      before(:each) do
+        stub_const("Yast::Bootloader", double())
+
+        allow(Yast::Bootloader).to receive(:Write) { true }
+        allow(Yast::Bootloader).to receive(:Read) { true }
+        allow(Yast::Bootloader).to receive(:setKernelParam) { true }
+
+        allow(Yast::SCR).to receive(:Execute).
+          once.
+          and_return({"exit" => 0, "stdout" => "", "stderr" => ""})
+      end
+
       describe "Device blacklisting is disabled" do
         it "do nothing" do
           ::Installation::CIOIgnore.instance.enabled = false
 
           expect(Yast::SCR).to_not receive(:Execute)
+          expect(Yast::Bootloader).to_not receive(:Read)
 
           subject.run("Write")
         end
@@ -146,6 +159,27 @@
           expect{subject.run("Write")}.to raise_error(RuntimeError, /stderr/)
         end
 
+        it "adds kernel parameters IPLDEV and CONDEV to the bootloader" do
+          expect(Yast::Bootloader).to receive(:Write).once { true }
+          expect(Yast::Bootloader).to receive(:Read).once { true }
+          allow(Yast::Bootloader).to receive(:setKernelParam).once.
+            with("DEFAULT", "IPLDEV", "true").and_return(true)
+          allow(Yast::Bootloader).to receive(:setKernelParam).once.
+            with("DEFAULT", "CONDEV", "true").and_return(true)
+
+          subject.run("Write")
+        end
+
+        it "raises an exception if modifying kernel parameters failed" do
+          expect(Yast::Bootloader).to receive(:Write).never
+          expect(Yast::Bootloader).to receive(:Read).once { true }
+          allow(Yast::Bootloader).to receive(:setKernelParam).once.
+            with("DEFAULT", "IPLDEV", "true").and_return(true)
+          allow(Yast::Bootloader).to receive(:setKernelParam).once.
+            with("DEFAULT", "CONDEV", "true").and_return(false)
+
+          expect{subject.run("Write")}.to raise_error(RuntimeError, /failed to write kernel parameters/)
+        end
       end
     end
 

continue with "q"...


Checked in at Fri Mar 14 11:50:53 CET 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

ro

tags

participants (1)