Skip to content

Commit 11b6b04

Browse files
committed
feat: Use product name for boot loader
1 parent 3062a78 commit 11b6b04

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

‎updater/perform_update.sh‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ fi
1919
IMAGE="${2}"
2020
IMAGE_DIGEST="${3:-""}"
2121

22+
PRODUCT_NAME="CuOS"
23+
if [[ -f "${CONFIG_PATH}" ]]; then
24+
PRODUCT_NAME="$(jq -r '.product_name // empty' "${CONFIG_PATH}")"
25+
if [[ -z "${PRODUCT_NAME}" ]]; then
26+
if jq -r '.init_image' "${CONFIG_PATH}" | grep -q 'cuos-iac'; then
27+
PRODUCT_NAME="CuOS IaC"
28+
else
29+
PRODUCT_NAME="CuOS"
30+
fi
31+
fi
32+
fi
33+
2234

2335
if [[ "${INSTALLIMAGE}" != "true" ]]; then
2436
# Only perform update if available space in TARGET_ROOT is >2GB
@@ -139,8 +151,8 @@ EOF
139151
docker cp /etc/fstab "${CONTAINER_NAME}:/etc/fstab"
140152

141153
if [[ "${INSTALLIMAGE}" = "true" ]]; then
142-
if [[ -f "/output/system.json" ]]; then
143-
cp "/output/system.json" "${TARGET_BOOT}/system.json" \
154+
if [[ -f "${CONFIG_PATH}" ]]; then
155+
cp "${CONFIG_PATH}" "${TARGET_BOOT}/system.json" \
144156
|| raise "Failed to copy system.json from dir"
145157
else
146158
docker cp "${CONTAINER_NAME}:/usr/local/cuos/system-default.json" "${TARGET_BOOT}/system.json" \
@@ -196,8 +208,9 @@ EOF
196208

197209
else
198210
# Generate GRUB entry
211+
SLOT_NAME="${PRODUCT_NAME} Slot ${PARTITION} - Linux $version"
199212
( cat <<EOF > "${TARGET_BOOT}/${PARTITION}_grub.cfg"
200-
menuentry 'CuOS Partition ${PARTITION} - Linux $version' --unrestricted {
213+
menuentry '${SLOT_NAME}' --unrestricted {
201214
insmod gzio
202215
insmod part_gpt
203216
insmod fat
@@ -227,7 +240,7 @@ set superusers="root"
227240
EOF
228241
cat "${TARGET_BOOT}"/{A,B}_grub.cfg 2>/dev/null
229242

230-
echo "set default=\"CuOS Partition ${PARTITION} - Linux $version\""
243+
echo "set default='${SLOT_NAME}'"
231244
} > "${TARGET_BOOT}/grub/grub.cfg"
232245
) || raise "Failed to configure grub"
233246

0 commit comments

Comments
 (0)