From 84394142976608d93d858a1343c19a4530e760f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jake=20Buchholz=20G=C3=B6kt=C3=BCrk?= <tomalok@gmail.com>
Date: Mon, 18 May 2026 22:42:21 +0000
Subject: [PATCH] fix cloud-config user existence check & update CHANGELOG

---
 CHANGELOG.md                          | 15 +++++++++++++--
 lib/tiny-cloud/user-data/cloud-config |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df7b1e5..4b17721 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # CHANGELOG
 
-## XXXX-XX-XX - Tiny Cloud v3.3.X
+## 2026-05-XX - Tiny Cloud v3.3.0
 
 #### GOOGLE CLOUD BEHAVIOR CHANGE
 * ***NOTE***: Google Cloud SSH keys are installed for per specified logins,
@@ -8,7 +8,18 @@
   This matches `cloud-init`'s behavior and Google's intentions.  Resolves
   [#73](https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud/-/issues/73).
 
-* `man` pages!
+* `man` pages!  Thanks @ncopa!
+  [!149](https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud/-/merge_requests/149)
+
+* Support for configuring custom IMDS endpoint IP and API version, thanks to
+  @larena!
+  [!147](https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud/-/merge_requests/147)
+
+* Support for root partitions on LVM, also thanks to @larena!
+  [!146](https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud/-/merge_requests/147)
+
+* Fix [#84](https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud/-/work_items/84)
+  cloud-config user existence check.
 
 ## 2025-12-07 - Tiny Cloud v3.2.3
 
diff --git a/lib/tiny-cloud/user-data/cloud-config b/lib/tiny-cloud/user-data/cloud-config
index c389b90..2ae3a6a 100644
--- a/lib/tiny-cloud/user-data/cloud-config
+++ b/lib/tiny-cloud/user-data/cloud-config
@@ -274,8 +274,8 @@ init__userdata_users() {
 			no_create_home="$(get_userdata users/$i/no_create_home)"
 		fi
 
-		if getent passwd "$user" >/dev/null; then
-			log -i -t "$phase" info "$ACTION: user $user already exists"
+		if getent passwd "$name" >/dev/null; then
+			log -i -t "$phase" info "$ACTION: user $name already exists"
 		else
 			if [ "$system" != "true" ]; then
 				unset system