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# 860089 : "System does not boot into installed system after installation" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-installation/yast2-installation.changes 2014-02-17 17:58:19.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-installation/yast2-installation.changes 2014-02-18 17:42:28.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 18 17:09:08 CET 2014 - locilka@suse.com + +- Copying all udev rules from inst-sys to installed system + (bnc#860089) +- 3.1.36 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-installation - at least 18 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-installation (Old) and /mounts/work_src_done/SLE12/yast2-installation (BS:build ID:33000 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-installation-3.1.35.tar.bz2 New: ---- yast2-installation-3.1.36.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.1Du5Jw/_old 2014-02-18 17:53:10.000000000 +0100 +++ /var/tmp/diff_new_pack.1Du5Jw/_new 2014-02-18 17:53:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.35 +Version: 3.1.36 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-installation-3.1.35.tar.bz2 -> yast2-installation-3.1.36.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.35/package/yast2-installation.changes new/yast2-installation-3.1.36/package/yast2-installation.changes --- old/yast2-installation-3.1.35/package/yast2-installation.changes 2014-02-17 15:55:11.000000000 +0100 +++ new/yast2-installation-3.1.36/package/yast2-installation.changes 2014-02-18 17:40:09.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 18 17:09:08 CET 2014 - locilka@suse.com + +- Copying all udev rules from inst-sys to installed system + (bnc#860089) +- 3.1.36 + +------------------------------------------------------------------- Mon Feb 17 13:45:08 UTC 2014 - jreidinger@suse.com - fix detection if ssh daemon run diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.35/package/yast2-installation.spec new/yast2-installation-3.1.36/package/yast2-installation.spec --- old/yast2-installation-3.1.35/package/yast2-installation.spec 2014-02-17 15:55:11.000000000 +0100 +++ new/yast2-installation-3.1.36/package/yast2-installation.spec 2014-02-18 17:40:09.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.35 +Version: 3.1.36 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.35/src/clients/copy_files_finish.rb new/yast2-installation-3.1.36/src/clients/copy_files_finish.rb --- old/yast2-installation-3.1.35/src/clients/copy_files_finish.rb 2014-02-17 15:55:11.000000000 +0100 +++ new/yast2-installation-3.1.36/src/clients/copy_files_finish.rb 2014-02-18 17:40:09.000000000 +0100 @@ -28,10 +28,10 @@ # Authors: # Jiri Srain <jsrain@suse.cz> # -# $Id$ -# module Yast class CopyFilesFinishClient < Client + include Yast::Logger + def main Yast.import "Pkg" Yast.import "UI" @@ -366,51 +366,26 @@ nil end + UDEV_RULES_DIR = "/etc/udev/rules.d" + # see bugzilla #328126 def CopyHardwareUdevRules - udev_rules_srcdir = "/etc/udev/rules.d/" - udev_rules_destdir = Builtins.sformat( - "%1%2", - Installation.destdir, - udev_rules_srcdir - ) + udev_rules_destdir = File.join(Installation.destdir, UDEV_RULES_DIR) - if !FileUtils.Exists(udev_rules_destdir) - Builtins.y2milestone( - "%1 does not exist yet, creating it", - udev_rules_destdir - ) - WFM.Execute( - path(".local.bash"), - Builtins.sformat("mkdir -p '%1'", udev_rules_destdir) - ) + if ! FileUtils.Exists(udev_rules_destdir) + log.info "Directory #{udev_rules_destdir} does not exist yet, creating it" + WFM.Execute(path(".local.bash"), "mkdir -p #{udev_rules_destdir}") end - # udev files that should be copied - # Copy network rules early to get them to initrd, bnc#666079 - files_to_copy = ["70-persistent-cd.rules", "70-persistent-net.rules"] - - Builtins.foreach(files_to_copy) do |one_file| - one_file_from = Builtins.sformat("%1%2", udev_rules_srcdir, one_file) - one_file_to = Builtins.sformat("%1%2", udev_rules_destdir, one_file) - if !FileUtils.Exists(one_file_from) - Builtins.y2milestone("Udev file not generated, so do not copy it: %1", one_file_from) - elsif FileUtils.Exists(one_file_to) - Builtins.y2milestone("File %1 exists, skipping", one_file_to) - else - cmd = Builtins.sformat( - "cp -a '%1' '%2'", - String.Quote(one_file_from), - String.Quote(udev_rules_destdir) - ) - cmd_out = Convert.to_map(WFM.Execute(path(".local.bash_output"), cmd)) + # Copy all udev files, but do not overwrite those that already exist + # on the system bnc#860089 + # They are (also) needed for initrd bnc#666079 + cmd = "cp -avr --no-clobber #{UDEV_RULES_DIR}/. #{udev_rules_destdir}" + log.info "Copying all udev rules from #{UDEV_RULES_DIR} to #{udev_rules_destdir}" + cmd_out = WFM.Execute(path(".local.bash_output"), cmd) - if Ops.get_integer(cmd_out, "exit", -1) != 0 - Builtins.y2error("Command failed '%1': %2", cmd, cmd_out) - else - Builtins.y2milestone("Copied to %1", one_file_to) - end - end + if cmd_out["exit"] != 0 + log.error "Error copying udev rules" end nil continue with "q"... Checked in at Tue Feb 18 17:54:09 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