summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-12-23 09:10:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-12-23 09:10:39 +0000
commit5a9afd422235d3082b8cb838ced57878ea832914 (patch)
treeb4888b566445ae492f3ac99ec80ad888a12b4090
parent7f4f95c2c3e4309f59798601d73b8a0f11b82639 (diff)
downloaddrakx-5a9afd422235d3082b8cb838ced57878ea832914.tar
drakx-5a9afd422235d3082b8cb838ced57878ea832914.tar.gz
drakx-5a9afd422235d3082b8cb838ced57878ea832914.tar.bz2
drakx-5a9afd422235d3082b8cb838ced57878ea832914.tar.xz
drakx-5a9afd422235d3082b8cb838ced57878ea832914.zip
- don't ask X to restart in auto mode
- set exit status to 1 when configuration failed (esp. auto mode)
-rwxr-xr-xperl-install/standalone/XFdrake4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index ee5fda955..4c0a63f52 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -53,9 +53,9 @@ $configure_this ||= 'everything';
Xconfig::main::configure_resolution($in, Xconfig::xfree->read);
}
};
- ask_for_X_restart($in) if $rc;
+ ask_for_X_restart($in) if $rc && !$::auto;
- $in->exit(0);
+ $in->exit($rc ? 0 : 1);
}
sub check_XFree {