Merge pull request #623 from kobliha/SUSEConnect_cleanup_at_start

Calling SUSEConnect --cleanup at startup
yast · Nov 2, 2017 · 8443eee · 8443eee
2 parents ef434d7 + bd726f0
commit 8443eee
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Nov  2 13:05:34 CET 2017 - locilka@suse.com
+
+- Cleanup old registration attempts before starting Installer. This
+  is needed for restarted installation after it has been aborted
+  earlier (bsc#1065167).
+- 4.0.12
+
 -------------------------------------------------------------------
 Mon Oct 30 15:09:06 UTC 2017 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.0.11
+Version:        4.0.12
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/startup/First-Stage/F09-start b/startup/First-Stage/F09-start
@@ -7,6 +7,16 @@ log "====================="
 #---------------------------------------------
 callHooks preFirstCall
 
+# 9.05) cleanup before (re)starting
+
+# bsc#1065167: Installer does not allow to change a base product when it's
+# already registered. When installation is aborted and then restarted,
+# the data of the previous registration was not automatically removed.
+#
+# log "Cleaning up previous registration attempts"
+# Using /dev/null - If there is nothing to do, let it fail silently
+SUSEConnect --cleanup > /dev/null 2>&1
+
 #=============================================
 # 9.1) check for driver update mode
 #---------------------------------------------