fix: enabling waagent root password removal logic again for Ubuntu (#7780)r

djsly · web-flow · commit 9de06d343226 · 2026-02-04T07:36:29.000-05:00
diff --git a/parts/linux/cloud-init/artifacts/cis.sh b/parts/linux/cloud-init/artifacts/cis.sh
@@ -299,6 +299,7 @@ configureLimits() {
 EOF
 }
 
+# Configure waagent to not delete root password on first boot
 configureAzureAgent() {
     sed -i -e 's/\(Provisioning.DeleteRootPassword\).*/\1=n/' /etc/waagent.conf
 }
@@ -321,7 +322,8 @@ applyCIS() {
     configureSudo
     configureRootPath
     configureLimits
-    configureAzureAgent
+    # configureAzureAgent -- Disabling this for now, until we sync with waagent team on desired behavior.
+
     # Apply system configuration to running system
     sysctl --write --system
 }

Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,7 @@ configureLimits() {`
`299`	`299`	`EOF`
`300`	`300`	`}`
`301`	`301`
	`302`	`+# Configure waagent to not delete root password on first boot`
`302`	`303`	`configureAzureAgent() {`
`303`	`304`	`sed -i -e 's/\(Provisioning.DeleteRootPassword\).*/\1=n/' /etc/waagent.conf`
`304`	`305`	`}`
`@@ -321,7 +322,8 @@ applyCIS() {`
`321`	`322`	`configureSudo`
`322`	`323`	`configureRootPath`
`323`	`324`	`configureLimits`
`324`		`- configureAzureAgent`
	`325`	`+ # configureAzureAgent -- Disabling this for now, until we sync with waagent team on desired behavior.`
	`326`	`+`
`325`	`327`	`# Apply system configuration to running system`
`326`	`328`	`sysctl --write --system`
`327`	`329`	`}`