From 9d13c48ee88315ecfb43845fe2b938e1d26b926442bfcddcdb6c32fda1ac7c0e Mon Sep 17 00:00:00 2001
From: YaST  Team Bot <yast-internal@suse.de>
Date: Thu, 16 Apr 2015 12:45:18 +0000
Subject: [PATCH] - Always enable systemd startup services for Second Stage and
   Firstboot (bsc#924278) - 3.1.139

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=710
---
 yast2-installation-3.1.138.tar.bz2 |  3 ---
 yast2-installation-3.1.139.tar.bz2 |  3 +++
 yast2-installation.changes         |  7 +++++++
 yast2-installation.spec            | 11 ++++++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)
 delete mode 100644 yast2-installation-3.1.138.tar.bz2
 create mode 100644 yast2-installation-3.1.139.tar.bz2

diff --git a/yast2-installation-3.1.138.tar.bz2 b/yast2-installation-3.1.138.tar.bz2
deleted file mode 100644
index bb91e5b..0000000
--- a/yast2-installation-3.1.138.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9db95dd4d271af53770836f51ad951ae526d6a31f01478f903f6768d9d59937c
-size 386098
diff --git a/yast2-installation-3.1.139.tar.bz2 b/yast2-installation-3.1.139.tar.bz2
new file mode 100644
index 0000000..5cbb1c4
--- /dev/null
+++ b/yast2-installation-3.1.139.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:04126708dde12ede5e8209b2dd1bd3a88f9ddf2f8d60bd4e88b4cf3d10d503fa
+size 386527
diff --git a/yast2-installation.changes b/yast2-installation.changes
index 6b37610..fe1b222 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Apr 16 13:02:23 CEST 2015 - locilka@suse.com
+
+- Always enable systemd startup services for Second Stage and
+  Firstboot (bsc#924278)
+- 3.1.139
+
 -------------------------------------------------------------------
 Thu Apr  2 09:27:55 UTC 2015 - jreidinger@suse.com
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index 8102d8c..2e958dd 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.138
+Version:        3.1.139
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -172,6 +172,15 @@ install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
 
 %service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service
 
+# bsc#924278 Always enable these services by default, they are already listed
+# in systemd-presets-branding package, but that works for new installations
+# only, it does not work for upgrades from SLE 11 where scripts had different
+# name and were not handled by systemd.
+# When we upgrade/update from systemd-based system, scripts are always enabled
+# by the %service_add_post macro.
+systemctl enable YaST2-Second-Stage.service
+systemctl enable YaST2-Firstboot.service
+
 %pre
 %service_add_pre YaST2-Second-Stage.service YaST2-Firstboot.service