fix #2826 (aka pixel sucks):

pixel changed the booloader module api by throwing an exception
instead of using the ugly /tmp/.error temporary file and altered drakx
callers but forget to update standalone/* callers (aka drakboot).

now, with this patch, any error during lilo/grub installation is
catched and displayed, which is more generic than checking for spaces.

1 files changed, 7 insertions, 7 deletions

diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot
index 63d92dba0..81f566b4d 100755
--- a/perl-install/standalone/drakboot
+++ b/perl-install/standalone/drakboot
@@ -328,15 +328,15 @@ sub lilo_choice {
     
   ask:
     local $::isEmbedded = 0;
-    any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL}) or return;
-    eval { bootloader::install($bootloader, $fstab, $all_hds->{hds}) };
-
+    eval {
+        any::setupBootloader($in, $bootloader, $all_hds, $fstab, $ENV{SECURE_LEVEL});
+        bootloader::install($bootloader, $fstab, $all_hds->{hds});
+    };
     my $loader = arch() =~ /ppc/ ? "Yaboot" : "LILO";
-    if ($@) {
+    my $err = $@;
+    if ($err) {
         $in->ask_warn('', 
-                      [ N("Installation of %s failed. The following error occured:", $loader),
-                        grep { !/^Warning:/ } cat_("/tmp/.error") ]);
-        unlink "/tmp/.error";
+                      [ N("Installation of %s failed. The following error occured:", $loader), $err ]);
         goto ask;
     }
 }