@@ -1447,13 +1447,6 @@ func coreosInstallerSupportsISOKargs() (bool, error) {
1447
1447
return strings .Contains (out , "kargs" ), nil
1448
1448
}
1449
1449
1450
- // supportsIsoKargs returns true if we support modifying ISO kargs on the
1451
- // current arch. We could also auto-detect this, but would probably still want
1452
- // some assertions that we detected as supported on !s390x.
1453
- func (builder * QemuBuilder ) supportsIsoKargs () bool {
1454
- return builder .architecture != "s390x"
1455
- }
1456
-
1457
1450
func (builder * QemuBuilder ) setupIso () error {
1458
1451
if err := builder .ensureTempdir (); err != nil {
1459
1452
return err
@@ -1498,11 +1491,9 @@ func (builder *QemuBuilder) setupIso() error {
1498
1491
return errors .Wrapf (err , "running `coreos-installer iso kargs modify`; old CoreOS ISO?" )
1499
1492
}
1500
1493
// Only actually emit a warning if we expected it to be supported
1501
- if builder .supportsIsoKargs () {
1502
- stderr := stderrb .String ()
1503
- plog .Warningf ("running coreos-installer iso kargs modify: %v: %q" , err , stderr )
1504
- plog .Warning ("likely targeting an old CoreOS ISO; ignoring..." )
1505
- }
1494
+ stderr := stderrb .String ()
1495
+ plog .Warningf ("running coreos-installer iso kargs modify: %v: %q" , err , stderr )
1496
+ plog .Warning ("likely targeting an old CoreOS ISO; ignoring..." )
1506
1497
}
1507
1498
} else if len (builder .AppendKernelArgs ) > 0 {
1508
1499
return fmt .Errorf ("coreos-installer does not support appending kernel args" )
0 commit comments