summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-05-03 10:13:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-05-03 10:13:54 +0000
commiteee05b3c5fb17a5d1c2585781189b2a35badabf4 (patch)
tree0badcba1d8083d0714782b2bcc6168bee7fa847a
parenta24ecedcd1ea63f3c8cb9668fbd7567704a54dd0 (diff)
downloaddrakx-backup-do-not-use-eee05b3c5fb17a5d1c2585781189b2a35badabf4.tar
drakx-backup-do-not-use-eee05b3c5fb17a5d1c2585781189b2a35badabf4.tar.gz
drakx-backup-do-not-use-eee05b3c5fb17a5d1c2585781189b2a35badabf4.tar.bz2
drakx-backup-do-not-use-eee05b3c5fb17a5d1c2585781189b2a35badabf4.tar.xz
drakx-backup-do-not-use-eee05b3c5fb17a5d1c2585781189b2a35badabf4.zip
hd.img and hdcdrom_usb.img are dead already too
-rwxr-xr-xmake_boot_img10
1 files changed, 2 insertions, 8 deletions
diff --git a/make_boot_img b/make_boot_img
index ddfd09721..d7b9ba59d 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -102,8 +102,6 @@ sub initrd {
my $install = ${{
network => "stage1-network",
cdrom => "stage1-cdrom",
- hd => "stage1-disk",
- hdcdrom_usb => "stage1-medias-usb",
}}{$type} || 'stage1-full';
install_stripped("$instdir/init", "$mnt/sbin");
install_stripped("$instdir/$install", "$mnt/sbin/stage1");
@@ -140,9 +138,7 @@ sub initrd {
sub entries_append {
my ($type) = @_;
- my $automatic = "";
- $automatic = "automatic=method:cdrom" if $type eq "cdrom";
- $automatic = "automatic=method:disk" if $type eq "hd";
+ my $automatic = $type eq "cdrom" ? 'automatic=method:cdrom' : '';
my @simple_entries = (
linux => $default_vga,
@@ -170,9 +166,7 @@ sub boot_img_i386 {
__ "$sudo umount $mnt 2>/dev/null";
- if ($type eq "hd") {
- _ "bunzip2 -c $instdir/init-data/msgboot.img.bz2 > $img";
- } elsif ($type eq "all") {
+ if ($type eq "all") {
_ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo-2880.img.bz2 > $img";
} else {
_ "bunzip2 -c $instdir/init-data/msgboot-graphicallogo.img.bz2 > $img";