summaryrefslogtreecommitdiffstats
path: root/draklive2
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-01 19:49:13 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-04-01 19:49:13 +0100
commit7cf01146c8f52d3025db18d93a3ff64b9b54e971 (patch)
treec35da9421fea0094b1ea3564a4074be571a11535 /draklive2
parentc6dd77e2cc4c79b33579a062afe19c3d50bc536a (diff)
downloaddrakiso-7cf01146c8f52d3025db18d93a3ff64b9b54e971.tar
drakiso-7cf01146c8f52d3025db18d93a3ff64b9b54e971.tar.gz
drakiso-7cf01146c8f52d3025db18d93a3ff64b9b54e971.tar.bz2
drakiso-7cf01146c8f52d3025db18d93a3ff64b9b54e971.tar.xz
drakiso-7cf01146c8f52d3025db18d93a3ff64b9b54e971.zip
Revised config and settings path handling.
Don't default to system dirs - we expect to run as normal user now.
Diffstat (limited to 'draklive2')
-rwxr-xr-xdraklive25
1 files changed, 2 insertions, 3 deletions
diff --git a/draklive2 b/draklive2
index ebea408..55dd070 100755
--- a/draklive2
+++ b/draklive2
@@ -95,7 +95,7 @@ my @actions = (
my @all = qw(root boot loop master);
my $build_object = 'MGA::DrakISO::LiveBuild'->new;
-my $config_root = '/etc/draklive';
+my $config_root = '.';
my $config_path = 'config/build.cfg';
my $settings_path = 'config/settings.cfg';
@@ -164,8 +164,7 @@ draklive2 [options]
--config-root <dir>
root directory containing config and additional files
- defaults to current directory if it contains a
- configuration file, otherwise to "/etc/draklive"
+ defaults to current directory
--config <file> use this configuration file to control the build
defaults to "config/build.cfg"