diff --git a/mantle/platform/metal.go b/mantle/platform/metal.go index e45d8b2326e962179d3111550e20c208037e415b..d4fb2d8190a43ad9f57e545ec9b4f757b1246847 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 6bfbe00b05330431d410674ddfd3c0cf6af8206d..d503351a74e580f946ed73545359c1422f92c99c 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)