--- a/util/s390x/zipl2grub.pl.in +++ b/util/s390x/zipl2grub.pl.in @@ -7,6 +7,9 @@ my $default = '@sysconfdir@/default/grub'; my $fallback = '@sysconfdir@/zipl.conf'; my $sysconfbl = '@sysconfdir@/sysconfig/bootloader'; +my $defimage = "/boot/image"; +my $definitrd = "/boot/initrd"; +my $Image = "$defimage"; my $zipldir = ""; my $running = ""; my $refresh = 1; # needs to default to "on" until most bugs are shaken out! @@ -166,7 +169,7 @@ my $msg = ""; $msg .= sprintf( "%s: %s\n", $C, $cat[$_[0]]) if ($_[0] > 0); - $msg .= "Usage: $C [-v] [-d] [-f] [-T template] [-z ZIPLDIR]\n"; + $msg .= "Usage: $C [-v] [-d] [-f] [-T template] [-z ZIPLDIR] [-i imagepath]\n"; Panic( $_[0], $msg . "\n"); } @@ -183,6 +186,7 @@ (/^--?help/ || /^-h/) && (Usage(0)); (/^--zipldir$/ || /^-z$/) && ($zipldir = shift || Usage(2), next); (/^--template$/ || /^-T$/) && ($in = shift || Usage(3), next); + (/^--image$/ || /^-i$/) && ($Image = shift || Usage(5), $force = 1, next); (/^-/) && (Usage(1)); Usage(1); } @@ -378,11 +382,8 @@ } # copy out kernel and initrd -my $defimage = "/boot/image"; -my $definitrd = "/boot/initrd"; my $ziplimage = "$zipldir/image"; my $ziplinitrd = "$zipldir/initrd"; -my $Image = "$defimage"; if ( ! $running && ! $force ) { chomp( $running = qx{uname -r});