summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-02-26 15:40:41 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-02-26 15:40:41 +0000
commitde3cda2b7d4c2dbff6b1a36dfd648554bfc85165 (patch)
tree504608355fd7ee19d4b74a00e08fb24fc59d40a4
parent1584118af5f96e76d6e4b756c24a490c90039242 (diff)
downloaddrakx-de3cda2b7d4c2dbff6b1a36dfd648554bfc85165.tar
drakx-de3cda2b7d4c2dbff6b1a36dfd648554bfc85165.tar.gz
drakx-de3cda2b7d4c2dbff6b1a36dfd648554bfc85165.tar.bz2
drakx-de3cda2b7d4c2dbff6b1a36dfd648554bfc85165.tar.xz
drakx-de3cda2b7d4c2dbff6b1a36dfd648554bfc85165.zip
- kill used once only bootlook module
- inline oneliners use only once - kill unused variables - strict pragma fixes - ...
-rw-r--r--perl-install/bootlook.pm322
-rwxr-xr-xperl-install/standalone/drakboot321
2 files changed, 309 insertions, 334 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
deleted file mode 100644
index 09c4e676c..000000000
--- a/perl-install/bootlook.pm
+++ /dev/null
@@ -1,322 +0,0 @@
-package bootlook;
-
-# Control-center
-
-# Copyright (C) 2001-2002 MandrakeSoft
-# Yves Duret <yduret at mandrakesoft.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-
-use common;
-use Config;
-use POSIX;
-use interactive;
-use standalone;
-use Xconfig::various;
-use any;
-use log;
-use bootloader;
-use fs;
-use ugtk2 qw(:helpers :wrappers :create);
-
-my $in = 'interactive'->vnew('su', 'default');
-
-my @winm;
-my @usernames = list_users();
-
-my $no_bootsplash;
-my $x_mode = Xconfig::various::runlevel() == 5;
-my $auto_mode = any::get_autologin();
-my $inmain = 0;
-my $lilogrub = chomp_(`detectloader -q`);
-
-my $w = ugtk2->new();
-my $window = $w->{window};
-$window->signal_connect(delete_event => sub { utk2->exit(0) });
-unless ($::isEmbedded) {
- $w->{rwindow}->set_title(N("Boot Style Configuration"));
- $window->set_border_width(2);
-
- ### menus definition
- # the menus are not shown but they provides shiny shortcut like C-q
- my @menu_items = ({ path => N("/_File"), type => '<Branch>' },
- { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { ugtk2->exit(0) } },
- );
- create_factory_menu($w->{rwindow}, @menu_items);
- ######### menus end
-}
-
-my $user_combo = new Gtk2::Combo;
-$user_combo->set_popdown_strings(@usernames);
-$user_combo->entry->set_text($auto_mode->{autologin}) if $auto_mode->{autologin};
-my $desktop_combo = new Gtk2::Combo;
-$desktop_combo->set_popdown_strings(get_wm());
-$desktop_combo->entry->set_text($auto_mode->{desktop}) if $auto_mode->{desktop};
-
-my $disp_mode = arch() =~ /ppc/ ? N("Yaboot mode") : N("Lilo/grub mode");
-
-my %themes = ('path' => '/usr/share/bootsplash/themes/',
- 'default' => 'Mandrake',
- 'def_thmb' => '/usr/share/libDrakX/pixmaps/nosplash_thumb.png',
- 'lilo' => {'file' => '/lilo/message',
- 'thumb' => '/lilo/thumb.png' },
- 'boot' => {'path' => '/images/',
- #'thumb'=>'/images/thumb.png',
- },
- );
-my $cur_res = top(cat_('/etc/lilo.conf') =~ /[^#]*vga=(.*)/);
-#- verify that current resolution is ok
-if (member( $cur_res, qw( 785 788 791 794))) {
- ($cur_res) = $bootloader::vga_modes{$cur_res} =~ /^([0-9x]+).*?$/;
-} else {
- $no_bootsplash = 1; #- we can't select any theme we're not in Framebuffer mode :-/
-}
-
-#- and check that lilo is the correct loader
-$no_bootsplash ||= chomp_(`detectloader -q`) ne 'LILO';
-$no_bootsplash = 0 if $::testing;
-my @thms;
-my @lilo_thms = if_(!$themes{default}, qw(default));
-my @boot_thms = if_(!$themes{default}, qw(default));
-chdir($themes{path}); #- we must change directory for correct @thms assignement
-foreach (all('.')) {
- if (-d $themes{path} . $_ && m/^[^.]/) {
- push @thms, $_;
- -f $themes{path} . $_ . $themes{lilo}{file} and push @lilo_thms, $_;
- -f $themes{path} . $_ . $themes{boot}{path} . "bootsplash-$cur_res.jpg" and push @boot_thms, $_;
- }
-# $_ eq $themes{'defaut'} and $default = $themes{'defaut'};
-}
-my %combo = ('thms' => '', 'lilo' => '', 'boot' => '');
-foreach (keys(%combo)) {
- $combo{$_} = new Gtk2::Combo;
- $combo{$_}->set_value_in_list(1, 0);
-}
-
-$combo{thms}->set_popdown_strings(@thms);
-$combo{lilo}->set_popdown_strings(@lilo_thms);
-$combo{boot}->set_popdown_strings(@boot_thms) if !$no_bootsplash;
-
-my $lilo_pixbuf;
-my $lilo_pic = gtkcreate_img($themes{def_thmb});
-
-my $boot_pixbuf;
-my $boot_pic = gtkcreate_img($themes{def_thmb});
-
-my $thm_button = new Gtk2::Button(N("Install themes"));
-my $logo_thm = new Gtk2::CheckButton(N("Display theme\nunder console"));
-my $B_create = new Gtk2::Button(N("Create new theme"));
-my $keep_logo = 1;
-$logo_thm->set_active(1);
-$logo_thm->signal_connect(clicked => sub { invbool(\$keep_logo) });
-$B_create->signal_connect(clicked => sub {
- system('/usr/sbin/draksplash ');
- });
-#- ******** action to take on changing combos values
-
-$combo{thms}->entry->signal_connect(changed => sub {
- my $thm_txt = $combo{thms}->entry->get_text();
- $combo{lilo}->entry->set_text(member($thm_txt, @lilo_thms) ? $thm_txt : $themes{default} || 'default');
- $combo{boot}->entry->set_text(member($thm_txt, @boot_thms) ? $thm_txt : $themes{default} || 'default');
-
-});
-
-$combo{lilo}->entry->signal_connect(changed => sub {
- my $new_file = $themes{path} . $combo{lilo}->entry->get_text() . $themes{lilo}{thumb};
- undef($lilo_pixbuf);
- $lilo_pixbuf = gtkcreate_pixbuf(-r $new_file ? $new_file : $themes{def_thmb});
- $lilo_pixbuf = $lilo_pixbuf->scale_simple(155, 116, 'nearest');
- $lilo_pic->set_from_pixbuf($lilo_pixbuf);
-});
-
-$no_bootsplash == 0
- and $combo{boot}->entry->signal_connect( changed => sub {
- my $img_file = $themes{path}.$combo{boot}->entry->get_text().$themes{boot}{path}."bootsplash-$cur_res.jpg";
- $boot_pic = gtkcreate_img( $img_file);
-});
-
-$combo{thms}->entry->set_text($themes{default});
-
-$thm_button->signal_connect('clicked',
-
-sub {
- my $error = 0;
- my $boot_conf_file = '/etc/sysconfig/bootsplash';
- my $lilomsg = '/boot/message-graphic';
- #lilo installation
- if (-f $themes{path}.$combo{lilo}->entry->get_text() . $themes{lilo}{file}) {
- use MDK::Common::File;
- log::explanations(N("Backup %s to %s.old",$lilomsg,$lilomsg));
- cp_af($lilomsg, "/boot/message-graphic.old");
- #can't use this anymore or $in->ask_warn(N("Error"), N("unable to backup lilo message"));
- log::explanations(N("Copy %s to %s", $themes{path} . $combo{lilo}->entry->get_text() . $themes{lilo}{file},$lilomsg));
- cp_af($themes{path} . $combo{lilo}->entry->get_text() . $themes{lilo}{file}, $lilomsg);
- #can't use this anymore or $in->ask_warn(N("Error"), N("can't change lilo message"));
- } else {
- $error = 1;
- $in->ask_warn(N("Error"), N("Lilo message not found"));
- }
- #bootsplash install
- if (-f $themes{path} . $combo{boot}->entry->get_text() . $themes{boot}{path} . "bootsplash-$cur_res.jpg") {
- my $bootsplash_cont = "# -*- Mode: shell-script -*-
-# Specify here if you want add the splash logo to initrd when
-# generating an initrd. You can specify :
-#
-# SPLASH=no to don't have a splash screen
-#
-# SPLASH=auto to make autodetect the splash screen
-#
-# SPLASH=INT When Integer could be 800x600 1024x768 1280x1024
-#
-SPLASH=$cur_res
-# Choose the themes. The should be based in
-# /usr/share/bootsplash/themes/
-THEME=" . $combo{boot}->entry->get_text() . "
-# Say yes here if you want to leave the logo on the console.
-# Three options :
-#
-# LOGO_CONSOLE=no don't display logo under console.
-#
-# LOGO_CONSOLE=yes display logo under console.
-#
-# LOGO_CONSOLE=theme leave the theme to decide.
-#
-LOGO_CONSOLE=" . ($keep_logo ? 'yes' : 'no') . "\n";
- if (-f $boot_conf_file) {
- eval { output($boot_conf_file, $bootsplash_cont) };
- $@ and $in->ask_warn(N("Error"), N("Can't write /etc/sysconfig/bootsplash.")) or log::explanations(N("Write %s",$boot_conf_file));
- } else {
- $in->ask_warn(N("Error"), N("Can't write /etc/sysconfig/bootsplash\nFile not found."));
- $error = 1;
- }
- } else {
- $in->ask_warn("Error", "BootSplash screen not found");
- }
- #here is mkinitrd time
- if (!$error) {
- foreach (map { if_(m|^initrd-(.*)\.img|, $1) } all('/boot')) {
- if (system("mkinitrd -f /boot/initrd-$_.img $_")) {
- $in->ask_warn(N("Error"),
- N("Can't launch mkinitrd -f /boot/initrd-%s.img %s.", $_,$_));
- $error = 1;
- } else {
- log::explanations(N("Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'.", $_,$_));
- }
- }
- }
- if (system('lilo')) {
- $in->ask_warn(N("Error"),
-N("Can't relaunch LiLo!
-Launch \"lilo\" as root in command line to complete LiLo theme installation."));
- $error = 1;
- } else {
- log::explanations(N("Relaunch 'lilo'"));
- }
- $in->ask_warn($error ? N("Error") : N("Notice"),
- $error ? N("Theme installation failed!") : N("LiLo and Bootsplash themes installation successfull"));
-});
-
-my $x_box;
-
-gtkadd($window,
- gtkpack__(my $global_vbox = new Gtk2::VBox(0,0),
- gtkadd(new Gtk2::Frame($disp_mode),
- # gtkpack__(new Gtk2::VBox(0,0),
- (gtkpack_(gtkset_border_width(new Gtk2::HBox(0, 0),5),
- 1, N("You are currently using %s as your boot manager.
-Click on Configure to launch the setup wizard.", $lilogrub),
- 0, gtksignal_connect(new Gtk2::Button(N("Configure")), clicked => $::lilo_choice),
- )),
- # "" #we need some place under the button -- replaced by gtkset_border_width( for the moment
- # )
-
- ),
- #Splash Selector
- gtkadd(my $thm_frame = new Gtk2::Frame( N("Splash selection")),
- gtkpack__(gtkset_border_width(new Gtk2::HBox(0,5),5),
- gtkpack__(new Gtk2::VBox(0,5),
- N("Themes"),
- $combo{thms},
- N("\nSelect the theme for\nlilo and bootsplash,\nyou can choose\nthem separately"),
- $logo_thm),
- gtkpack__(new Gtk2::VBox(0,5),
- N("Lilo screen"),
- $combo{lilo},
- $lilo_pic,
- $B_create),
- gtkpack__(new Gtk2::VBox(0,5),
- N("Bootsplash"),
- $combo{boot},
- $boot_pic,
- $thm_button))
- ),
-
- gtkadd(new Gtk2::Frame(N("System mode")),
- gtkpack__(new Gtk2::VBox(0, 5),
- gtksignal_connect(gtkset_active(new Gtk2::CheckButton(N("Launch the graphical environment when your system starts")), $x_mode), clicked => sub {
- $x_box->set_sensitive(!$x_mode);
- $x_mode = !$x_mode;
- }),
- gtkpack__(gtkset_sensitive($x_box = Gtk2::HBox->new(0, 0), $x_mode),
- gtkpack__(Gtk2::VBox->new(0, 0),
- gtkradio((N("Yes, I want autologin with this (user, desktop)")) x 2, N("No, I don't want autologin")),
- ),
- gtkpack__(new Gtk2::VBox(0, 10),
- $user_combo,
- $desktop_combo
- )
- )
- )
- ),
- gtkadd(gtkset_layout(new Gtk2::HButtonBox, 'end'),
- gtksignal_connect(new Gtk2::Button(N("OK")), clicked => sub {
- Xconfig::various::runlevel($x_mode ? 5 : 3);
- ugtk2->exit(0);
- }),
- gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub { ugtk2->exit(0) })
- )
- )
- );
-
-$window->show_all();
-$no_bootsplash and $thm_frame->hide();
-gtkflush();
-$inmain = 1;
-$w->main;
-Gtk2->exit(0);
-
-#-------------------------------------------------------------
-# get user names to put in combo
-#-------------------------------------------------------------
-
-
-sub get_wm {
- @winm = split(' ', `/usr/sbin/chksession -l`);
-}
-
-#-------------------------------------------------------------
-# launch autologin functions
-#-------------------------------------------------------------
-
-sub updateAutologin {
- my ($usern, $deskt) = ($user_combo->entry->get_text(), $desktop_combo->entry->get_text());
- if ($x_yes_button->get_active()) {
- $in->do_pkgs->install('autologin') if $x_mode;
- any::set_autologin($usern, $deskt);
- } else {
- any::set_autologin(undef) if $x_no_button->get_active();
- }
-}
diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 0e0765b9b..811caa2fd 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -1,9 +1,30 @@
#!/usr/bin/perl
-use lib qw(/usr/lib/libDrakX);
+# DrakBoot
+
+# Copyright (C) 2001-2003 MandrakeSoft
+# Yves Duret
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-use standalone; #- warning, standalone must be loaded very first, for 'explanations'
+use strict;
+use diagnostics;
+use lib qw(/usr/lib/libDrakX);
+use standalone; #- warning, standalone must be loaded very first, for 'explanations'
+use c;
use common;
use interactive;
use any;
@@ -11,18 +32,278 @@ use bootloader;
use detect_devices;
use fsedit;
use fs;
-use c;
+use Config;
+use POSIX;
+use Xconfig::various;
+use log;
+use bootloader;
my $in = 'interactive'->vnew('su', 'bootloader');
-$::lilo_choice = \&lilo_choice;
+if (!$in->isa('interactive::gtk')) {
+ lilo_choice();
+ $in->exit(0);
+}
+require ugtk2;
+import ugtk2 qw(:helpers :wrappers :create);
+
+my $no_bootsplash;
+my $x_mode = Xconfig::various::runlevel() == 5;
+my $auto_mode = any::get_autologin();
+my $lilogrub = chomp_(`detectloader -q`);
+
+my $w = ugtk2->new();
+my $window = $w->{window};
+$window->signal_connect(delete_event => sub { utk2->exit(0) });
+unless ($::isEmbedded) {
+ $w->{rwindow}->set_title(N("Boot Style Configuration"));
+ $window->set_border_width(2);
-if ($in->isa('interactive::gtk')) {
- require 'bootlook.pm';
+ ### menus definition
+ # the menus are not shown but they provides shiny shortcut like C-q
+ my @menu_items = ({ path => N("/_File"), type => '<Branch>' },
+ {
+ path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { ugtk2->exit(0) } },
+ );
+ create_factory_menu($w->{rwindow}, @menu_items);
+ ######### menus end
+}
+
+my $user_combo = new Gtk2::Combo;
+$user_combo->set_popdown_strings(list_users());
+$user_combo->entry->set_text($auto_mode->{autologin}) if $auto_mode->{autologin};
+my $desktop_combo = new Gtk2::Combo;
+$desktop_combo->set_popdown_strings(split(' ', `/usr/sbin/chksession -l`));
+$desktop_combo->entry->set_text($auto_mode->{desktop}) if $auto_mode->{desktop};
+
+my $disp_mode = arch() =~ /ppc/ ? N("Yaboot mode") : N("Lilo/grub mode");
+
+my %themes = ('path' => '/usr/share/bootsplash/themes/',
+ 'default' => 'Mandrake',
+ 'def_thmb' => '/usr/share/libDrakX/pixmaps/nosplash_thumb.png',
+ 'lilo' => {'file' => '/lilo/message',
+ 'thumb' => '/lilo/thumb.png' },
+ 'boot' => {'path' => '/images/',
+ #'thumb'=>'/images/thumb.png',
+ },
+ );
+my $cur_res = top(cat_('/etc/lilo.conf') =~ /[^#]*vga=(.*)/);
+#- verify that current resolution is ok
+if (member( $cur_res, qw( 785 788 791 794))) {
+ ($cur_res) = $bootloader::vga_modes{$cur_res} =~ /^([0-9x]+).*?$/;
} else {
- lilo_choice();
+ $no_bootsplash = 1; #- we can't select any theme we're not in Framebuffer mode :-/
+}
+
+#- and check that lilo is the correct loader
+$no_bootsplash ||= chomp_(`detectloader -q`) ne 'LILO';
+$no_bootsplash = 0 if $::testing;
+my @thms;
+my @lilo_thms = if_(!$themes{default}, qw(default));
+my @boot_thms = if_(!$themes{default}, qw(default));
+chdir($themes{path}); #- we must change directory for correct @thms assignement
+foreach (all('.')) {
+ if (-d $themes{path} . $_ && m/^[^.]/) {
+ push @thms, $_;
+ -f $themes{path} . $_ . $themes{lilo}{file} and push @lilo_thms, $_;
+ -f $themes{path} . $_ . $themes{boot}{path} . "bootsplash-$cur_res.jpg" and push @boot_thms, $_;
+ }
+ # $_ eq $themes{'defaut'} and $default = $themes{'defaut'};
+}
+my %combo = ('thms' => '', 'lilo' => '', 'boot' => '');
+foreach (keys(%combo)) {
+ $combo{$_} = new Gtk2::Combo;
+ $combo{$_}->set_value_in_list(1, 0);
}
+$combo{thms}->set_popdown_strings(@thms);
+$combo{lilo}->set_popdown_strings(@lilo_thms);
+$combo{boot}->set_popdown_strings(@boot_thms) if !$no_bootsplash;
+
+my $lilo_pixbuf;
+my $lilo_pic = gtkcreate_img($themes{def_thmb});
+
+my $boot_pic = gtkcreate_img($themes{def_thmb});
+
+my $thm_button = new Gtk2::Button(N("Install themes"));
+my $logo_thm = new Gtk2::CheckButton(N("Display theme\nunder console"));
+my $B_create = new Gtk2::Button(N("Create new theme"));
+my $keep_logo = 1;
+$logo_thm->set_active(1);
+$logo_thm->signal_connect(clicked => sub { invbool(\$keep_logo) });
+$B_create->signal_connect(clicked => sub {
+ system('/usr/sbin/draksplash ');
+ });
+#- ******** action to take on changing combos values
+
+$combo{thms}->entry->signal_connect(changed => sub {
+ my $thm_txt = $combo{thms}->entry->get_text();
+ $combo{lilo}->entry->set_text(member($thm_txt, @lilo_thms) ? $thm_txt : $themes{default} || 'default');
+ $combo{boot}->entry->set_text(member($thm_txt, @boot_thms) ? $thm_txt : $themes{default} || 'default');
+
+ });
+
+$combo{lilo}->entry->signal_connect(changed => sub {
+ my $new_file = $themes{path} . $combo{lilo}->entry->get_text() . $themes{lilo}{thumb};
+ undef($lilo_pixbuf);
+ $lilo_pixbuf = gtkcreate_pixbuf(-r $new_file ? $new_file : $themes{def_thmb});
+ $lilo_pixbuf = $lilo_pixbuf->scale_simple(155, 116, 'nearest');
+ $lilo_pic->set_from_pixbuf($lilo_pixbuf);
+ });
+
+$no_bootsplash == 0
+ and $combo{boot}->entry->signal_connect( changed => sub {
+ my $img_file = $themes{path}.$combo{boot}->entry->get_text().$themes{boot}{path}."bootsplash-$cur_res.jpg";
+ $boot_pic = gtkcreate_img( $img_file);
+ });
+
+$combo{thms}->entry->set_text($themes{default});
+
+$thm_button->signal_connect('clicked',
+ sub {
+ my $error = 0;
+ my $boot_conf_file = '/etc/sysconfig/bootsplash';
+ my $lilomsg = '/boot/message-graphic';
+ #lilo installation
+ if (-f $themes{path}.$combo{lilo}->entry->get_text() . $themes{lilo}{file}) {
+ use MDK::Common::File;
+ log::explanations(N("Backup %s to %s.old",$lilomsg,$lilomsg));
+ cp_af($lilomsg, "/boot/message-graphic.old");
+ #can't use this anymore or $in->ask_warn(N("Error"), N("unable to backup lilo message"));
+ log::explanations(N("Copy %s to %s", $themes{path} . $combo{lilo}->entry->get_text() . $themes{lilo}{file},$lilomsg));
+ cp_af($themes{path} . $combo{lilo}->entry->get_text() . $themes{lilo}{file}, $lilomsg);
+ #can't use this anymore or $in->ask_warn(N("Error"), N("can't change lilo message"));
+ } else {
+ $error = 1;
+ $in->ask_warn(N("Error"), N("Lilo message not found"));
+ }
+ #bootsplash install
+ if (-f $themes{path} . $combo{boot}->entry->get_text() . $themes{boot}{path} . "bootsplash-$cur_res.jpg") {
+ my $bootsplash_cont = "# -*- Mode: shell-script -*-
+# Specify here if you want add the splash logo to initrd when
+# generating an initrd. You can specify :
+#
+# SPLASH=no to don't have a splash screen
+#
+# SPLASH=auto to make autodetect the splash screen
+#
+# SPLASH=INT When Integer could be 800x600 1024x768 1280x1024
+#
+SPLASH=$cur_res
+# Choose the themes. The should be based in
+# /usr/share/bootsplash/themes/
+THEME=" . $combo{boot}->entry->get_text() . "
+# Say yes here if you want to leave the logo on the console.
+# Three options :
+#
+# LOGO_CONSOLE=no don't display logo under console.
+#
+# LOGO_CONSOLE=yes display logo under console.
+#
+# LOGO_CONSOLE=theme leave the theme to decide.
+#
+LOGO_CONSOLE=" . ($keep_logo ? 'yes' : 'no') . "\n";
+ if (-f $boot_conf_file) {
+ eval { output($boot_conf_file, $bootsplash_cont) };
+ $@ and $in->ask_warn(N("Error"), N("Can't write /etc/sysconfig/bootsplash.")) or log::explanations(N("Write %s",$boot_conf_file));
+ } else {
+ $in->ask_warn(N("Error"), N("Can't write /etc/sysconfig/bootsplash\nFile not found."));
+ $error = 1;
+ }
+ } else {
+ $in->ask_warn("Error", "BootSplash screen not found");
+ }
+ #here is mkinitrd time
+ if (!$error) {
+ foreach (map { if_(m|^initrd-(.*)\.img|, $1) } all('/boot')) {
+ if (system("mkinitrd -f /boot/initrd-$_.img $_")) {
+ $in->ask_warn(N("Error"),
+ N("Can't launch mkinitrd -f /boot/initrd-%s.img %s.", $_,$_));
+ $error = 1;
+ } else {
+ log::explanations(N("Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'.", $_,$_));
+ }
+ }
+ }
+ if (system('lilo')) {
+ $in->ask_warn(N("Error"),
+ N("Can't relaunch LiLo!
+Launch \"lilo\" as root in command line to complete LiLo theme installation."));
+ $error = 1;
+ } else {
+ log::explanations(N("Relaunch 'lilo'"));
+ }
+ $in->ask_warn($error ? N("Error") : N("Notice"),
+ $error ? N("Theme installation failed!") : N("LiLo and Bootsplash themes installation successfull"));
+ });
+
+my $x_box;
+
+gtkadd($window,
+ gtkpack__(new Gtk2::VBox(0,0),
+ gtkadd(new Gtk2::Frame($disp_mode),
+ # gtkpack__(new Gtk2::VBox(0,0),
+ (gtkpack_(gtkset_border_width(new Gtk2::HBox(0, 0),5),
+ 1, N("You are currently using %s as your boot manager.
+Click on Configure to launch the setup wizard.", $lilogrub),
+ 0, gtksignal_connect(new Gtk2::Button(N("Configure")), clicked => \&lilo_choice),
+ )),
+ # "" #we need some place under the button -- replaced by gtkset_border_width( for the moment
+ # )
+
+ ),
+ #Splash Selector
+ gtkadd(my $thm_frame = new Gtk2::Frame( N("Splash selection")),
+ gtkpack__(gtkset_border_width(new Gtk2::HBox(0,5),5),
+ gtkpack__(new Gtk2::VBox(0,5),
+ N("Themes"),
+ $combo{thms},
+ N("\nSelect the theme for\nlilo and bootsplash,\nyou can choose\nthem separately"),
+ $logo_thm),
+ gtkpack__(new Gtk2::VBox(0,5),
+ N("Lilo screen"),
+ $combo{lilo},
+ $lilo_pic,
+ $B_create),
+ gtkpack__(new Gtk2::VBox(0,5),
+ N("Bootsplash"),
+ $combo{boot},
+ $boot_pic,
+ $thm_button))
+ ),
+
+ gtkadd(new Gtk2::Frame(N("System mode")),
+ gtkpack__(new Gtk2::VBox(0, 5),
+ gtksignal_connect(gtkset_active(new Gtk2::CheckButton(N("Launch the graphical environment when your system starts")), $x_mode), clicked => sub {
+ $x_box->set_sensitive(!$x_mode);
+ $x_mode = !$x_mode;
+ }),
+ gtkpack__(gtkset_sensitive($x_box = Gtk2::HBox->new(0, 0), $x_mode),
+ gtkpack__(Gtk2::VBox->new(0, 0),
+ my @auto_buttons = gtkradio((N("Yes, I want autologin with this (user, desktop)")) x 2, N("No, I don't want autologin")),
+ ),
+ gtkpack__(new Gtk2::VBox(0, 10),
+ $user_combo,
+ $desktop_combo
+ )
+ )
+ )
+ ),
+ gtkadd(gtkset_layout(new Gtk2::HButtonBox, 'end'),
+ gtksignal_connect(new Gtk2::Button(N("OK")), clicked => sub {
+ Xconfig::various::runlevel($x_mode ? 5 : 3);
+ updateAutologin();
+ ugtk2->exit(0);
+ }),
+ gtksignal_connect(new Gtk2::Button(N("Cancel")), clicked => sub { ugtk2->exit(0) })
+ )
+ )
+ );
+
+$window->show_all();
+$no_bootsplash and $thm_frame->hide();
+gtkflush();
+$w->main;
$in->exit(0);
sub lilo_choice {
@@ -43,10 +324,26 @@ sub lilo_choice {
my $loader = arch() =~ /ppc/ ? "Yaboot" : "LILO";
if ($@) {
- $in->ask_warn('',
- [ N("Installation of %s failed. The following error occured:", $loader),
- grep { !/^Warning:/ } cat_("/tmp/.error") ]);
- unlink "/tmp/.error";
- goto ask;
+ $in->ask_warn('',
+ [ N("Installation of %s failed. The following error occured:", $loader),
+ grep { !/^Warning:/ } cat_("/tmp/.error") ]);
+ unlink "/tmp/.error";
+ goto ask;
+ }
+}
+
+
+
+#-------------------------------------------------------------
+# launch autologin functions
+#-------------------------------------------------------------
+
+sub updateAutologin {
+ my ($usern, $deskt) = ($user_combo->entry->get_text(), $desktop_combo->entry->get_text());
+ if ($auto_buttons[0]->get_active()) {
+ $in->do_pkgs->install('autologin') if $x_mode;
+ any::set_autologin($usern, $deskt);
+ } else {
+ any::set_autologin(undef) if $auto_buttons[0]->get_active();
}
}