From 9195da04c23579f9116148dec82eecebf8deb9b6 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 28 Oct 2018 19:36:42 +0000
Subject: 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.
---
 draklive-install | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'draklive-install')

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();
 }
 
-- 
cgit v1.2.1