Skip to content

Commit 0542708

Browse files
committed
refact: all
1 parent 82a4ecb commit 0542708

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎create-lxc-image.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dockerlogin
4747
UPDATE_REGISTRY="$(jq -r '.update_registry' "${CONFIG_PATH}")"
4848
OS_IMAGE="$(jq -r '.os_image_lxc' "${CONFIG_PATH}")"
4949
OS_VERSION="$(jq -r '.os_image_lxc_version // "latest"' "${CONFIG_PATH}")"
50-
OS_DIGEST="$(jq -r '.os_image_lxc_digest // empty' "${CONFIG_PATH}")"
50+
OS_IMAGE_DIGEST="$(jq -r '.os_image_lxc_digest // empty' "${CONFIG_PATH}")"
5151

5252
IMAGE_VERSION="${UPDATE_REGISTRY}${OS_IMAGE}:${OS_VERSION}"
5353

‎system/cuos/init.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,8 @@ create_swap_and_resize_fs() {
354354
mkswap "$SWAPFILE"
355355

356356
fi
357+
elif [[ -n "${REINIT:-}" ]]; then
358+
return
357359
fi
358360
if [[ -f "${SWAPFILE}" ]]; then
359361
swapon "$SWAPFILE"

‎system/cuos/install.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
44

5-
cd /etc/systemd/system/ || exit 127
6-
ln -sf "${SCRIPT_DIR}"/cuos-init.service || exit 1
7-
ln -sf "${SCRIPT_DIR}"/cuos-api.service || exit 1
8-
ln -sf "${SCRIPT_DIR}"/cuos-api.socket || exit 1
9-
ln -sf "${SCRIPT_DIR}"/cuos-app.service || exit 1
5+
ln -sf "${SCRIPT_DIR}"/cuos-init.service /etc/systemd/system/ || exit 1
6+
ln -sf "${SCRIPT_DIR}"/cuos-api.service /etc/systemd/system/ || exit 1
7+
ln -sf "${SCRIPT_DIR}"/cuos-api.socket /etc/systemd/system/ || exit 1
8+
ln -sf "${SCRIPT_DIR}"/cuos-app.service /etc/systemd/system/ || exit 1
109

1110
ln -sf "${SCRIPT_DIR}"/api.sh /usr/bin/cuos || exit 1
1211

‎system/cuos/system-schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"properties": {
77
"update_registry": {
88
"type": "string",
9-
"description": "URL of the registry used for system updates (e.g., https://update.triovega.com/v2)"
9+
"description": "URL of the registry used for system updates (e.g., https://update.example.com/v2)"
1010
},
1111
"update_registry_user": {
1212
"type": "string",

0 commit comments

Comments
 (0)