summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gotti <jgotti@mandriva.com>2002-08-06 08:43:13 +0000
committerJonathan Gotti <jgotti@mandriva.com>2002-08-06 08:43:13 +0000
commit5e2cec12876acd9ae25227ced8a0670dda3fe4c7 (patch)
tree1fa3dbec338d0a36f2c603f07e156bfdc9d87c29
parent38484acd48eaa17770a6c8960736aeab28fe16bb (diff)
downloaddrakx-5e2cec12876acd9ae25227ced8a0670dda3fe4c7.tar
drakx-5e2cec12876acd9ae25227ced8a0670dda3fe4c7.tar.gz
drakx-5e2cec12876acd9ae25227ced8a0670dda3fe4c7.tar.bz2
drakx-5e2cec12876acd9ae25227ced8a0670dda3fe4c7.tar.xz
drakx-5e2cec12876acd9ae25227ced8a0670dda3fe4c7.zip
add standalone::explanations for bootsplash configuration
-rw-r--r--perl-install/bootlook.pm21
1 files changed, 14 insertions, 7 deletions
diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index 39b234d59..062e334f0 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -180,8 +180,12 @@ sub {
#lilo installation
if (-f $themes{'path'}.$combo{'lilo'}->entry->get_text() . $themes{'lilo'}{'file'}) {
use File::Copy;
- copy($lilomsg,"/boot/lilo-graphic/message.old") or $in->ask_warn(_("Error"), _("unable to backup lilo message"));
- copy($themes{'path'} . $combo{'lilo'}->entry->get_text() . $themes{'lilo'}{'file'}, $lilomsg) or $in->ask_warn(_("Error"), _("can't change lilo message"));
+ ( copy($lilomsg,"/boot/lilo-graphic/message.old")
+ and standalone::explanations(_("Backup %s to %s.old",$lilomsg,$lilomsg)) )
+ or $in->ask_warn(_("Error"), _("unable to backup lilo message"));
+ ( copy($themes{'path'} . $combo{'lilo'}->entry->get_text() . $themes{'lilo'}{'file'}, $lilomsg)
+ and standalone::explanations(_("Copy %s to %s",$themes{'path'} . $combo{'lilo'}->entry->get_text() . $themes{'lilo'}{'file'},$lilomsg)) )
+ or $in->ask_warn(_("Error"), _("can't change lilo message"));
} else {
$error = 1;
$in->ask_warn(_("Error"), _("Lilo message not found"));
@@ -214,7 +218,7 @@ THEME=" . $combo{'boot'}->entry->get_text() . "
LOGO_CONSOLE=" . ($keep_logo ? 'yes' : 'no') . "\n";
if (-f $boot_conf_file) {
eval { output($boot_conf_file, $bootsplash_cont) };
- $@ and $in->ask_warn(_("Error"), _("Can't write /etc/sysconfig/bootsplash."));
+ $@ and $in->ask_warn(_("Error"), _("Can't write /etc/sysconfig/bootsplash.")) or standalone::explanations(_("Write %s",$boot_conf_file));
} else {
$in->ask_warn(_("Error"), _("Can't write /etc/sysconfig/bootsplash\nFile not found."));
$error = 1;
@@ -227,10 +231,11 @@ LOGO_CONSOLE=" . ($keep_logo ? 'yes' : 'no') . "\n";
foreach (map { if_(m|^/boot/initrd-(.*)\.img|, $1) } glob '/boot/*'){
if ( system("mkinitrd -f /boot/initrd-$_.img $_" ) ) {
$in->ask_warn(_("Error"),
- _("Can't launch mkinitrd -f /boot/initrd-".$_.".img $_.
-Type \"mkinitrd -f /boot/initrd-".$_.".img $_\" in command line as root."));
+ _("Can't launch mkinitrd -f /boot/initrd-%s.img %s.", $_,$_));
$error = 1;
- }
+ } else {
+ standalone::explanations(_("Make initrd 'mkinird -f /boot/initrd-%s.img %s'.", $_,$_));
+ }
}
}
if (system('lilo')) {
@@ -238,7 +243,9 @@ Type \"mkinitrd -f /boot/initrd-".$_.".img $_\" in command line as root."));
_("Can't relaunch LiLo!
Launch \"lilo\" as root in command line to complete LiLo theme installation."));
$error = 1;
- }
+ } else {
+ standalone::explanations(_("Relaunch 'lilo'"));
+ }
$in->ask_warn(_(($error)?"Error":"Notice"),
_($error?"Theme installation failed!":"LiLo and Bootsplash themes installation successfull"));
}