summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-27 12:35:17 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-27 12:35:17 +0000
commited2fcde3323d29d60a970c862bfe927c7c1ff27b (patch)
treeaf0bfd99fe698e00689fc40db77cbadc66e887c3
parente5965a71d74d192156ec54e42926dddacd5dc8af (diff)
downloaddrakx-ed2fcde3323d29d60a970c862bfe927c7c1ff27b.tar
drakx-ed2fcde3323d29d60a970c862bfe927c7c1ff27b.tar.gz
drakx-ed2fcde3323d29d60a970c862bfe927c7c1ff27b.tar.bz2
drakx-ed2fcde3323d29d60a970c862bfe927c7c1ff27b.tar.xz
drakx-ed2fcde3323d29d60a970c862bfe927c7c1ff27b.zip
(require_root_capability): having extracted it from interactive enable
to further simplify it
-rw-r--r--perl-install/common.pm6
1 files changed, 1 insertions, 5 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index d605676a6..8fa267d46 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -248,13 +248,9 @@ sub require_root_capability {
if ($ENV{DISPLAY} && system('/usr/X11R6/bin/xtest') == 0) {
if (fuzzy_pidofs(qr/\bkwin\b/) > 0) {
exec("kdesu", "-c", "$0 @ARGV") or die N("kdesu missing");
- } else {
- exec { 'consolehelper' } $0, @ARGV or die N("consolehelper missing");
-
}
- } else {
- exec { 'consolehelper' } $0, @ARGV or die N("consolehelper missing");
}
+ exec { 'consolehelper' } $0, @ARGV or die N("consolehelper missing");
# still not root ?
die "you must be root to run this program" if $>;