summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-08 15:35:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-08 15:35:54 +0000
commit6f865b719ea0bbd102fb025636017a6d2e16f4e3 (patch)
tree040064bf4e204d1c06ab72cfc18d8514abca7031
parentc5b0785a8dd762af24536922eb56510f623adaca (diff)
downloaddrakx-6f865b719ea0bbd102fb025636017a6d2e16f4e3.tar
drakx-6f865b719ea0bbd102fb025636017a6d2e16f4e3.tar.gz
drakx-6f865b719ea0bbd102fb025636017a6d2e16f4e3.tar.bz2
drakx-6f865b719ea0bbd102fb025636017a6d2e16f4e3.tar.xz
drakx-6f865b719ea0bbd102fb025636017a6d2e16f4e3.zip
~fix~ calling userdrake in "diskdrake --fileshare"
-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 45af4d0c3..3f0a2b77e 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.")
}, [])) {
- if (!fork()) { exec "userdrake" or c::_exit(0) }
+ exec "userdrake"; #- exec instead of fork&exec so that the root XAUTHORITY is kept valid
}
}
}
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 5498fcab8..8ed482c10 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);
+ $in->exit(0); #- !! not reached if userdrake is called
}
my $all_hds = fsedit::get_hds({}, $in);