make inst_live_cleanup work before switch to chroot

yast · Jan 6, 2014 · 251bd32 · 251bd32
1 parent 964a90a
commit 251bd32
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/package/yast2-live-installer.changes b/package/yast2-live-installer.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan  6 13:07:52 UTC 2014 - jsrain@suse.cz
+
+- make inst_live_cleanup work before switch to chroot
+
 -------------------------------------------------------------------
 Wed Nov 13 15:56:18 UTC 2013 - jreidinger@suse.com
 

diff --git a/src/clients/inst_live_cleanup.rb b/src/clients/inst_live_cleanup.rb
@@ -39,18 +39,18 @@ def main
       # Call a script if it exists
       @scriptname = "/usr/bin/correct_live_install"
 
-      if FileUtils.Exists(@scriptname)
+      if FileUtils.Exists("/mnt/" + @scriptname)
         Builtins.y2milestone(
           "Calling %1 returned %2",
           @scriptname,
-          SCR.Execute(path(".target.bash_output"), @scriptname)
+          SCR.Execute(path(".target.bash_output"), "chroot /mnt " + @scriptname)
         )
         Builtins.y2milestone(
           "Removing %1 returned %2",
           @scriptname,
           SCR.Execute(
             path(".target.bash_output"),
-            Builtins.sformat("/bin/rm %1", @scriptname)
+            Builtins.sformat("chroot /mnt /bin/rm %1", @scriptname)
           )
         )
       else
@@ -66,7 +66,7 @@ def main
       @out = Convert.to_map(
         SCR.Execute(
           path(".target.bash_output"),
-          "/bin/rpm -e yast2-live-installer"
+          "chroot /mnt /bin/rpm -e yast2-live-installer"
         )
       )