summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfigurator.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-05 22:54:25 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-05 22:54:25 +0000
commit680a22985ade4719c431cf2c43daed9eafd3bd4e (patch)
treebe13b6cba642cb168425d7de4a19ab934a111af1 /perl-install/Xconfigurator.pm
parent4b3042e3c70ac231a17c33e0527bf3c2afc2d376 (diff)
downloaddrakx-backup-do-not-use-680a22985ade4719c431cf2c43daed9eafd3bd4e.tar
drakx-backup-do-not-use-680a22985ade4719c431cf2c43daed9eafd3bd4e.tar.gz
drakx-backup-do-not-use-680a22985ade4719c431cf2c43daed9eafd3bd4e.tar.bz2
drakx-backup-do-not-use-680a22985ade4719c431cf2c43daed9eafd3bd4e.tar.xz
drakx-backup-do-not-use-680a22985ade4719c431cf2c43daed9eafd3bd4e.zip
no_comment
Diffstat (limited to 'perl-install/Xconfigurator.pm')
-rw-r--r--perl-install/Xconfigurator.pm16
1 files changed, 3 insertions, 13 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 8c492f542..14aa8ac28 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -113,8 +113,9 @@ sub readMonitorsDB {
sub rewriteInittab {
my ($runlevel) = @_;
- substInFile { s/^(id:)[35](:initdefault:)\s*$/$1$runlevel$2\n/ }
- (grep { -r $_ } "$prefix/etc/inittab" or log::l("missing inittab!!!"), return);
+ my $f = "$prefix/etc/inittab";
+ -r $f or log::l("missing inittab!!!"), return;
+ substInFile { s/^(id:)[35](:initdefault:)\s*$/$1$runlevel$2\n/ } $f;
}
sub keepOnlyLegalModes {
@@ -748,16 +749,5 @@ _("I can set up your computer to automatically start X upon booting.
Would you like X to start when you reboot?"), 1);
rewriteInittab($run ? 5 : 3) unless $::testing;
-
- $in->ask_warn(_("X successfully configured"),
-_("Configuration file has been written. Take a look at it before running 'startx'.
-
-Within the server, press Ctrl, Alt and '+' simultaneously to cycle through video resolutions.
-
-Pressing Ctrl, Alt and Backspace simultaneously immediately exits the server
-
-For further configuration, refer to /usr/X11R6/lib/X11/doc/README.Config.
-
-")) unless $::auto;
}
}