diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-01-05 20:55:20 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-01-05 20:55:20 +0000 |
| commit | fd6b89e3d9cb165829a25cd196b5340104a4e440 (patch) | |
| tree | c14cf6f6d8be04fa8cdfe65fc8e68411b399e757 /make_boot_img | |
| parent | 49a8229d69ae7b82dff1417857285f5f0a73f43f (diff) | |
| download | drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar.gz drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar.bz2 drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.tar.xz drakx-backup-do-not-use-fd6b89e3d9cb165829a25cd196b5340104a4e440.zip | |
no_comment
Diffstat (limited to 'make_boot_img')
| -rwxr-xr-x | make_boot_img | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/make_boot_img b/make_boot_img index ceed9091f..c6f5431bf 100755 --- a/make_boot_img +++ b/make_boot_img @@ -14,7 +14,6 @@ if ($>) { $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}"; } - $install = $ {{ pcmcia => "full-install", network => "install", @@ -22,10 +21,8 @@ $install = $ {{ hd => "local-install" }}{$type} or die; -$0 =~ /initrd/ ? - initrd($mnt, $img) : - msg_boot_img($mnt, $img); - #boot_img($mnt, $img); +$img =~ /rdz$/ ? initrd($mnt, $img) : msg_boot_img($mnt, $img); +#boot_img($mnt, $img); sub __ { print @_, "\n"; system(@_); } sub _ { __ @_; $? and die; } @@ -67,7 +64,7 @@ sub boot_img { _ "bunzip2 -c $instdir/installinit/emptyboot.img.bz2 > $img"; _ "$sudo mount -t msdos -o umask=0 $img $mnt -o loop"; _ "cat vmlinuz > $mnt/vmlinuz"; - initrd("${mnt}2", "$mnt/$type.rdz"); + -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz"); output("$mnt/syslinux.cfg", " default linux @@ -92,7 +89,7 @@ sub msg_boot_img { } _ "$sudo mount -t msdos -o umask=0 $img $mnt -o loop"; _ "cat vmlinuz > $mnt/vmlinuz"; - initrd("${mnt}2", "$mnt/$type.rdz"); + -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz"); my $timeout = $ks ? 1 : 72; my $setmode = !($type eq 'hd') && "mode 0x101\n"; |