|
19 | 19 | IMAGE="${2}" |
20 | 20 | IMAGE_DIGEST="${3:-""}" |
21 | 21 |
|
| 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 | + |
22 | 34 |
|
23 | 35 | if [[ "${INSTALLIMAGE}" != "true" ]]; then |
24 | 36 | # Only perform update if available space in TARGET_ROOT is >2GB |
|
139 | 151 | docker cp /etc/fstab "${CONTAINER_NAME}:/etc/fstab" |
140 | 152 |
|
141 | 153 | 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" \ |
144 | 156 | || raise "Failed to copy system.json from dir" |
145 | 157 | else |
146 | 158 | docker cp "${CONTAINER_NAME}:/usr/local/cuos/system-default.json" "${TARGET_BOOT}/system.json" \ |
|
196 | 208 |
|
197 | 209 | else |
198 | 210 | # Generate GRUB entry |
| 211 | + SLOT_NAME="${PRODUCT_NAME} Slot ${PARTITION} - Linux $version" |
199 | 212 | ( cat <<EOF > "${TARGET_BOOT}/${PARTITION}_grub.cfg" |
200 | | -menuentry 'CuOS Partition ${PARTITION} - Linux $version' --unrestricted { |
| 213 | +menuentry '${SLOT_NAME}' --unrestricted { |
201 | 214 | insmod gzio |
202 | 215 | insmod part_gpt |
203 | 216 | insmod fat |
@@ -227,7 +240,7 @@ set superusers="root" |
227 | 240 | EOF |
228 | 241 | cat "${TARGET_BOOT}"/{A,B}_grub.cfg 2>/dev/null |
229 | 242 |
|
230 | | - echo "set default=\"CuOS Partition ${PARTITION} - Linux $version\"" |
| 243 | + echo "set default='${SLOT_NAME}'" |
231 | 244 | } > "${TARGET_BOOT}/grub/grub.cfg" |
232 | 245 | ) || raise "Failed to configure grub" |
233 | 246 |
|
|
0 commit comments