summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-09 15:54:58 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-09 15:54:58 +0000
commit8a37bd2d08472a8798a28881633855552bf1b006 (patch)
treec4879b0d75e100a71716da3ae484d3e8d09ab007
parent089954045f4c5198afe80446b310b8bca4f2a5d4 (diff)
downloaddrakx-8a37bd2d08472a8798a28881633855552bf1b006.tar
drakx-8a37bd2d08472a8798a28881633855552bf1b006.tar.gz
drakx-8a37bd2d08472a8798a28881633855552bf1b006.tar.bz2
drakx-8a37bd2d08472a8798a28881633855552bf1b006.tar.xz
drakx-8a37bd2d08472a8798a28881633855552bf1b006.zip
ensure userdrake works when diskdrake --fileshare is embedded or run through kdesu
-rw-r--r--perl-install/any.pm2
-rwxr-xr-xperl-install/standalone/diskdrake2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5eb2bb114..910567547 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -891,7 +891,7 @@ Allowing this will permit users to simply click on \"Share\" in konqueror and na
N("The per-user sharing uses the group \"fileshare\".
You can use userdrake to add a user to this group.")
}, [])) {
- exec "userdrake"; #- exec instead of fork&exec so that the root XAUTHORITY is kept valid
+ run_program::run('userdrake');
}
}
}
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 51885b908..eaaf06dde 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -66,7 +66,7 @@ my $in = 'interactive'->vnew('su');
if ($type eq 'fileshare') {
require any;
any::fileshare_config($in, '');
- $in->exit(0); #- !! not reached if userdrake is called
+ $in->exit(0);
}
my $all_hds = fsedit::get_hds({}, $in);