Skip to content

Commit 91d975f

Browse files
authored
minor cleanup
1 parent d39656a commit 91d975f

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

systemvm/debian/opt/cloud/bin/setup/postinit.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ do
131131
systemctl disable --now --no-block $svc
132132
done
133133

134-
# Execute cloud-init if user data is present
135134
run_cloud_init
136135

137136
date > /var/cache/cloud/boot_up_done

tools/appliance/systemvmtemplate/scripts/configure_systemvm_services.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ function configure_services() {
132132
# Disable container services
133133
systemctl disable containerd
134134

135-
# Cloud-init services will be managed by dependency ordering to run after CloudStack networking
136135

137136
cat <<EOF > /etc/cloud/cloud.cfg.d/cloudstack.cfg
138137
#cloud-config
@@ -167,7 +166,7 @@ cloud_final_modules:
167166
- power-state-change
168167
EOF
169168

170-
# Disable automatic cloud-init services since we run it manually in postinit.sh
169+
# Disable cloud-init services since we run it manually in postinit.sh if user data is available
171170
touch /etc/cloud/cloud-init.disabled
172171
systemctl stop cloud-init
173172
systemctl disable cloud-init

0 commit comments

Comments
 (0)