From 63555aa270059488b013e6c802cca64a8d6eebdc Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Tue, 9 Jan 2018 23:17:35 +0000
Subject: draklive: allow installer GUI to be used and run as normal user.

Read all configuration from the main config file and automatically
generate the auto_inst.cfg.pl file. Run the installer GUI in a nested
X server if any items are not specified in the config file. Use sudo
to run any steps that need root privileges, to avoid running the X
server as root.
---
 drakclassic | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'drakclassic')

diff --git a/drakclassic b/drakclassic
index 9414544..308cf46 100755
--- a/drakclassic
+++ b/drakclassic
@@ -52,12 +52,12 @@ $::force = 0;
 sub clean {
     my ($build) = @_;
 
-    if (-e ($build->get_system_root)) {
-        # There shouldn't be anything mounted in the chroot, but play it safe...
-        umount_all_in_chroot($build);
-        system('sudo rm -rf ' . $build->get_system_root);
+    if (-e $build->get_builddir) {
+        system('rm -rf ' . $build->get_builddir);
+    }
+    if (-e $build->get_chroot_dir) {
+        system('sudo rm -rf ' . $build->get_chroot_dir);
     }
-    system('rm -rf ' . $build->get_builddir) if -e ($build->get_builddir);
 }
 
 ###############################################################################
-- 
cgit v1.2.1