for Driver fbdev, rework to allow configuring vga= in bootloader and telling to reboot instead of restarting X server (now i simply need to configure bootloader in Xconfig::main::write() when need_reboot)

1 files changed, 9 insertions, 2 deletions

diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 6083f6cb7..8b2104d27 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -44,7 +44,8 @@ $configure_this ||= $::auto ? 'auto_install' : 'everything';
 
 	if ($configure_this eq 'everything') {
 	    check_XFree($in);
-	    Xconfig::main::configure_everything_or_configure_chooser($in, $options, $::auto);
+	    my ($raw_X, $rc) = Xconfig::main::configure_everything_or_configure_chooser($in, $options, $::auto);
+	    $rc;
 	} elsif ($configure_this eq 'auto_install') {
 	    Xconfig::main::configure_everything_auto_install(Xconfig::default::configure($in->do_pkgs), $in->do_pkgs, {}, $options);
 	} elsif ($configure_this eq 'monitor') {
@@ -53,7 +54,13 @@ $configure_this ||= $::auto ? 'auto_install' : 'everything';
 	    Xconfig::main::configure_resolution($in, Xconfig::xfree->read);
 	}
     };
-    ask_for_X_restart($in) if $rc && !$::auto;
+    if (!$::auto) {
+	if ($rc eq 'need_restart') {
+	    ask_for_X_restart($in);
+	} elsif ($rc eq 'need_reboot') {
+	    $in->ask_warn('', N("You need to reboot for changes to take effect"));
+	}
+    }
 
     $in->exit($rc ? 0 : 1);
 }