summaryrefslogtreecommitdiffstats
path: root/drakclassic
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-09 23:17:35 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-09 23:17:35 +0000
commit63555aa270059488b013e6c802cca64a8d6eebdc (patch)
tree75c481453e459dc2aea279a86eb89ceedfd0ecf1 /drakclassic
parent71146812d733fdc46abe1d77b7d68f9859cdc124 (diff)
downloaddrakiso-63555aa270059488b013e6c802cca64a8d6eebdc.tar
drakiso-63555aa270059488b013e6c802cca64a8d6eebdc.tar.gz
drakiso-63555aa270059488b013e6c802cca64a8d6eebdc.tar.bz2
drakiso-63555aa270059488b013e6c802cca64a8d6eebdc.tar.xz
drakiso-63555aa270059488b013e6c802cca64a8d6eebdc.zip
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.
Diffstat (limited to 'drakclassic')
-rwxr-xr-xdrakclassic10
1 files changed, 5 insertions, 5 deletions
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);
}
###############################################################################