summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-13 14:12:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-13 14:12:14 +0000
commit74b1eb7d7a36dd519fcb6cd9440a64315446b5f1 (patch)
treee368070107edf36dcec0d3cefce3b22921abc0a1
parent878eb8b7626a6a31287e2051412b4a2019b4dff5 (diff)
downloaddrakx-74b1eb7d7a36dd519fcb6cd9440a64315446b5f1.tar
drakx-74b1eb7d7a36dd519fcb6cd9440a64315446b5f1.tar.gz
drakx-74b1eb7d7a36dd519fcb6cd9440a64315446b5f1.tar.bz2
drakx-74b1eb7d7a36dd519fcb6cd9440a64315446b5f1.tar.xz
drakx-74b1eb7d7a36dd519fcb6cd9440a64315446b5f1.zip
write syslinux.cfg before cp'ing the .rdz to catch the "not enough room" case
-rwxr-xr-xmake_boot_img31
1 files changed, 16 insertions, 15 deletions
diff --git a/make_boot_img b/make_boot_img
index 4b18ad11f..ad8297ba0 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -220,6 +220,22 @@ sub boot_img_i386 {
(my $initrd_type = $type) =~ s/-changedisk//;
initrd($tmp_mnt_initrd, $initrd_type, $I, $rdz);
my $short_type = substr($type, 0, 8);
+
+ my $timeout = 72;
+ output "$mnt/syslinux.cfg",
+"default linux
+prompt 1
+timeout $timeout
+display boot.msg
+F1 help.msg
+F2 advanced.msg
+F3 boot.msg
+" . join('', map {
+"label $_->[0]
+ kernel vmlinuz
+ append initrd=$short_type.rdz $_->[1]
+" } entries_append($type));
+
eval { _ "cp -f $rdz $mnt/$short_type.rdz" };
if ($@) {
unlink "$mnt/$short_type.rdz";
@@ -241,21 +257,6 @@ sub boot_img_i386 {
}
unlink $rdz;
- my $timeout = 72;
- output "$mnt/syslinux.cfg",
-"default linux
-prompt 1
-timeout $timeout
-display boot.msg
-F1 help.msg
-F2 advanced.msg
-F3 boot.msg
-" . join('', map {
-"label $_->[0]
- kernel vmlinuz
- append initrd=$short_type.rdz $_->[1]
-" } entries_append($type));
-
_ "sync";
_ "df $mnt";
_ "$sudo umount $mnt";