From 8103f8156d0aef51e1d78efc67210495a2273067 Mon Sep 17 00:00:00 2001 From: "zhongling.h" Date: Wed, 16 Feb 2022 15:44:30 +0800 Subject: [PATCH] rebrand coreos-installer to lifseaos-installer Signed-off-by: zhongling.h --- src/cmd-buildextend-live | 8 ++++---- src/create_disk.sh | 2 +- src/osmet-pack | 8 ++++---- src/supermin-init-prelude.sh | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cmd-buildextend-live b/src/cmd-buildextend-live index cc5d0292..6d271bad 100755 --- a/src/cmd-buildextend-live +++ b/src/cmd-buildextend-live @@ -521,7 +521,7 @@ def generate_iso(): # the like, and we're assuming that none of our platforms use the last # 24 bytes of it. # - # This allows an external tool, `coreos-installer iso embed`, to modify + # This allows an external tool, `lifseaos-installer iso embed`, to modify # an existing ISO image to embed a user's custom Ignition config. # The tool wraps the Ignition config in a cpio.gz and uses our header # to write it directly into the ISO image. The cpio.gz will be read @@ -534,7 +534,7 @@ def generate_iso(): # Recently, we also play a similar trick for injecting kernel arguments: we # store the location of "karg embed areas" at the end of the System Area # (in the 72 bytes before the 24 bytes for the initrd info). This is then - # picked up by `coreos-installer iso embed-kargs`. + # picked up by `lifseaos-installer iso embed-kargs`. if basearch != "s390x": # size of System Area section at start of ISO9660 images ISO_SYSTEM_AREA_SIZE = 32768 @@ -550,7 +550,7 @@ def generate_iso(): assert len(files_with_karg_embed_areas) <= MAX_KARG_FILES # these can really never change without ratcheting on the - # coreos-installer side first + # lifseaos-installer side first INITRDFMT = '<8s2Q' assert struct.calcsize(INITRDFMT) == 24 KARGSFMT = f"<8s{MAX_KARG_FILES+1+1}Q" # +1 for area length and +1 for offset to default read-only '.cmdline' @@ -569,7 +569,7 @@ def generate_iso(): struct.calcsize(KARGSFMT))) offsets = [0] * (MAX_KARG_FILES + 1) # +1 for offset to default - # This is ours default read-only '.cmdline' file, which is used for `coreos-installer iso kargs reset ISO` + # This is ours default read-only '.cmdline' file, which is used for `lifseaos-installer iso kargs reset ISO` offsets[0] = file_offset_in_iso(isoinfo, '.cmdline') for i, fn in enumerate(files_with_karg_embed_areas): diff --git a/src/create_disk.sh b/src/create_disk.sh index 1988b746..35dbfbab 100755 --- a/src/create_disk.sh +++ b/src/create_disk.sh @@ -134,7 +134,7 @@ case "$arch" in s390x) # NB: in the bare metal case when targeting ECKD DASD disks, this # partition table is not what actually gets written to disk in the end: - # coreos-installer has code which transforms it into a DASD-compatible + # lifseaos-installer has code which transforms it into a DASD-compatible # partition table and copies each partition individually bitwise. sgdisk -Z $disk \ -U "${uninitialized_gpt_uuid}" \ diff --git a/src/osmet-pack b/src/osmet-pack index b076d289..eba14aaf 100755 --- a/src/osmet-pack +++ b/src/osmet-pack @@ -25,8 +25,8 @@ if [ ! -f /etc/cosa-supermin ]; then set -- "${TMPDIR}/osmet.bin" "${checksum}" "${speed}" if [ -n "${coreinst:-}" ]; then - cp "${coreinst}" "${TMPDIR}/coreos-installer" - set -- "$@" "${TMPDIR}/coreos-installer" + cp "${coreinst}" "${TMPDIR}/lifseaos-installer" + set -- "$@" "${TMPDIR}/lifseaos-installer" fi device_opts= @@ -63,12 +63,12 @@ deploydir=$(find "/sysroot/ostree/deploy/$osname/deploy" -mindepth 1 -maxdepth 1 description=$(. "${deploydir}/etc/os-release" && echo "${PRETTY_NAME}") if [ -z "${coreinst}" ]; then - # if we weren't given a custom coreos-installer, then we want to use the one + # if we weren't given a custom lifseaos-installer, then we want to use the one # from the target system itself; chroot into it to avoid linking issues for mnt in dev proc sys run var tmp; do mount --rbind /$mnt "${deploydir}/$mnt" done - coreinst="chroot ${deploydir} coreos-installer" + coreinst="chroot ${deploydir} lifseaos-installer" fi case "$speed" in diff --git a/src/supermin-init-prelude.sh b/src/supermin-init-prelude.sh index 99567cc8..2cd3ddf6 100644 --- a/src/supermin-init-prelude.sh +++ b/src/supermin-init-prelude.sh @@ -20,7 +20,7 @@ LANG=C /sbin/load_policy -i # need fuse module for rofiles-fuse/bwrap during post scripts run /sbin/modprobe fuse -# we want /dev/disk symlinks for coreos-installer +# we want /dev/disk symlinks for lifseaos-installer /usr/lib/systemd/systemd-udevd --daemon /usr/sbin/udevadm trigger --settle -- Gitee