Avoid creating unwanted mount points in the live system.

With a persistent live system, this can cause problems on subsequent
installs, although the previous commit also mitigates against that.

2 files changed, 6 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index 07ec117..16e8b3d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- avoid creating unwanted mount points in live system
 - avoid copying inactive mount points
 - increase window size when display size is > 800x600 (mga#23435)
 - revert to rebooting after completing install from boot menu
diff --git a/draklive-install b/draklive-install
index c830d5b..69d1b7b 100755
--- a/draklive-install
+++ b/draklive-install
@@ -353,7 +353,11 @@ sub setup_bootloader {
     any::setupBootloaderBeforeStandalone($in->do_pkgs, $bootloader, $all_hds, $fstab);
     undef $_wait;
     local $::Wizard_no_previous = 0;
-    any::setupBootloaderUntilInstalled($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL});
+    #- don't use any::setupBootloaderUntilInstalled - it creates unwanted mount
+    #- points in the live system
+    do {
+        any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}) or $in->exit;
+    } while !any::installBootloader($in, $bootloader, $all_hds);
     sync_logs();
 }