From 4e180e04741d24fc282754684033a965d631eb11 Mon Sep 17 00:00:00 2001 From: duyiwei Date: Fri, 15 Sep 2023 15:35:16 +0800 Subject: [PATCH] modify arg coreos.live.rootfs_url --- mantle/platform/metal.go | 2 +- src/cmd-buildextend-live | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mantle/platform/metal.go b/mantle/platform/metal.go index e45d8b23..d4fb2d81 100644 --- a/mantle/platform/metal.go +++ b/mantle/platform/metal.go @@ -343,7 +343,7 @@ func (t *installerRun) destroy() error { func (t *installerRun) completePxeSetup(kargs []string) error { if t.kern.rootfs != "" && !t.inst.PxeAppendRootfs { - kargs = append(kargs, fmt.Sprintf("coreos.live.rootfs_url=%s/%s", t.baseurl, t.kern.rootfs)) + kargs = append(kargs, fmt.Sprintf("nestos.live.rootfs_url=%s/%s", t.baseurl, t.kern.rootfs)) } kargsStr := strings.Join(kargs, " ") diff --git a/src/cmd-buildextend-live b/src/cmd-buildextend-live index 6bfbe00b..d503351a 100755 --- a/src/cmd-buildextend-live +++ b/src/cmd-buildextend-live @@ -261,7 +261,7 @@ def generate_iso(): # Generate initramfs stamp file indicating that this is a live # initramfs. Store the build ID in it. - stamppath = os.path.join(tmpinitrd_base, 'etc/coreos-live-initramfs') + stamppath = os.path.join(tmpinitrd_base, 'etc/nestos-live-initramfs') os.makedirs(os.path.dirname(stamppath), exist_ok=True) with open(stamppath, 'w') as fh: fh.write(args.build + '\n') @@ -269,7 +269,7 @@ def generate_iso(): # Generate rootfs stamp file with the build ID, indicating that the # rootfs has been appended and confirming that initramfs and rootfs are # from the same build. - stamppath = os.path.join(tmpinitrd_rootfs, 'etc/coreos-live-rootfs') + stamppath = os.path.join(tmpinitrd_rootfs, 'etc/nestos-live-rootfs') os.makedirs(os.path.dirname(stamppath), exist_ok=True) with open(stamppath, 'w') as fh: fh.write(args.build + '\n') @@ -320,7 +320,7 @@ def generate_iso(): cp_reflink(iso_rootfs, pxe_rootfs) # Save stream hash of rootfs for verifying out-of-band fetches os.makedirs(os.path.join(tmpinitrd_base, 'etc'), exist_ok=True) - make_stream_hash(pxe_rootfs, os.path.join(tmpinitrd_base, 'etc/coreos-live-want-rootfs')) + make_stream_hash(pxe_rootfs, os.path.join(tmpinitrd_base, 'etc/nestos-live-want-rootfs')) # Add common content iso_initramfs = os.path.join(tmpisoimagespxe, initrd_img) extend_initrd(iso_initramfs, tmpinitrd_base) -- Gitee