From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 519BB1A9F97 for ; Sat, 18 Oct 2025 02:31:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760754719; cv=none; b=OCimQ/wUx+Ekl77RPQJT2GoBlnZvVelZyhqINMuZhzuFy66kRkamoM0RjH/SftBZ5lk5Nxe8uv1Tizeqa4tTcywemxfdSlpPjC8YXIUiI2dU9ejStACs25bZez+uOkjFROQCbJ+o1NQ5FYEQn5RwYe2wYUwCHAxmHe+Bkehro5w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760754719; c=relaxed/simple; bh=SQIP/A6zOvKO3rVkF4LscpZAsDp3d/3gJrS1PcGJhLM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZI2ZqqIfhE1tC282xAt6cSjWmA3Iebm6NpKccELpG8eEawcw2/VgLuns9qs2Kzl9UBk2BT0sQy/PZFb5l6o9jZKDSXG5u/jQMWebI70C8TmPdPnykALFEg7Uq5kY9G1P6jW6+8i3Klp7raSiCmOYQ3yMs5TGhF/qs4YFTmnjQtE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=e6wVS5fE; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="e6wVS5fE" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=Ubmip+v9mJFUQ+y69x2Pt4ZTXmJJ/W/NoyzrZzk2Am8=; b=e6wVS5fEQu99cP8G8vNCiDz5Ym c3QjWmsXRagsV2yvR7WyuiDr3WX1tn7Fa6O0YMchmsz/WXMTvU8rlCS4JhftLmzUeFE/9eIxJQ0zK +VOl0NruusfUZXPbTZw9K5Im/Uw3Ruz92rZ1XshuULjYUWkOavDnNZ1cU+K83TPvCzzfVkI1Hpr5M 83+wq58mnXYSXkl30ZQL9j6xCGd3Vm+Hr0yddnn7gD5rGIeGBjSX0NQ4ikQrvmJaWXEi9l1ZI3QMi ygqaN5nvfPqGoHaR7ja5CP+4otePBbVCBpLJB60Jm2Ow3l0bn5QehvGhjnWfcqzp6+MOnAimhj3qx B+5lLT5w==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1v9wjc-00000009OeY-4BqN; Sat, 18 Oct 2025 02:31:56 +0000 From: Luis Chamberlain To: Chuck Lever , Daniel Gomez , kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 4/8] base_image: put a guard check before adding kdevops user Date: Fri, 17 Oct 2025 19:31:49 -0700 Message-ID: <20251018023154.2239688-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251018023154.2239688-1-mcgrof@kernel.org> References: <20251018023154.2239688-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain Use getent to check for the kdevop user before trying to add it. This will be useful for cloud image instances, which may already have some customizations on it. Signed-off-by: Luis Chamberlain --- playbooks/roles/base_image/templates/virt-builder.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/base_image/templates/virt-builder.j2 b/playbooks/roles/base_image/templates/virt-builder.j2 index 5e3e4cd8..c56eefae 100644 --- a/playbooks/roles/base_image/templates/virt-builder.j2 +++ b/playbooks/roles/base_image/templates/virt-builder.j2 @@ -21,7 +21,7 @@ delete /boot/*rescue* delete /boot/loader/entries/*rescue* {% endif %} -run-command useradd {{ kdevops_uid }} -s /bin/bash -m kdevops +run-command getent passwd kdevops || useradd {{ kdevops_uid }} -s /bin/bash -m kdevops append-line /etc/sudoers.d/kdevops:kdevops ALL=(ALL) NOPASSWD: ALL edit /etc/default/grub:s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0"/ run-command {{ update_grub_cmd }} -- 2.51.0