From c737198138af882fdb134ecaf38020871697608d Mon Sep 17 00:00:00 2001 From: duyiwei Date: Fri, 15 Sep 2023 15:31:23 +0800 Subject: [PATCH] modify arg coreos.liveiso --- mantle/cmd/kola/testiso.go | 2 +- src/cmd-buildextend-live | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mantle/cmd/kola/testiso.go b/mantle/cmd/kola/testiso.go index 7b0bf24f..13b124c4 100644 --- a/mantle/cmd/kola/testiso.go +++ b/mantle/cmd/kola/testiso.go @@ -690,7 +690,7 @@ func testLiveLogin(ctx context.Context, outdir string) error { return err } - completionChannel, err := builder.VirtioChannelRead("coreos.liveiso-success") + completionChannel, err := builder.VirtioChannelRead("nestos.liveiso-success") if err != nil { return err } diff --git a/src/cmd-buildextend-live b/src/cmd-buildextend-live index 8c649745..6bfbe00b 100755 --- a/src/cmd-buildextend-live +++ b/src/cmd-buildextend-live @@ -333,7 +333,7 @@ def generate_iso(): img_metal], stdout=subprocess.PIPE, text=True) kargs_array = [karg for karg in result.stdout.split() if karg.split('=')[0] not in live_exclude_kargs] - kargs_array.append(f"coreos.liveiso={volid}") + kargs_array.append(f"nestos.liveiso={volid}") kargs = ' '.join(kargs_array) print(f'Substituting ISO kernel arguments: {kargs}') @@ -584,7 +584,7 @@ def generate_iso(): # The only difference with the miniso is that we drop these two files. # Keep everything else the same to maximize file matching between the # two versions so we can get the smallest delta. E.g. we keep the - # `coreos.liveiso` karg, even though the miniso doesn't need it. + # `nestos.liveiso` karg, even though the miniso doesn't need it. # nestos-installer takes care of removing it. os.unlink(iso_rootfs) os.unlink(miniso_data) -- Gitee