From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id B4D5B162AE; Tue, 09 Dec 2025 10:57:43 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id A0E4716297; Tue, 09 Dec 2025 10:57:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DMARC_MISSING,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 Received: from fhigh-a7-smtp.messagingengine.com (fhigh-a7-smtp.messagingengine.com [103.168.172.158]) by atuin.qyliss.net (Postfix) with ESMTPS id A8AC616295 for ; Tue, 09 Dec 2025 10:57:40 +0000 (UTC) Received: from phl-compute-05.internal (phl-compute-05.internal [10.202.2.45]) by mailfhigh.phl.internal (Postfix) with ESMTP id 8B65E14001CD; Tue, 9 Dec 2025 05:57:38 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Tue, 09 Dec 2025 05:57:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h=cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm3; t=1765277858; x=1765364258; bh=Js6Kx4bn+C PI309iwyz3H2C6C5ShDN4/HPBlWxEW118=; b=VN7010qkvRXI+GDOkWnLAp8plU qB2fICba98uYIv/UBvlzc9z3EWP9Fdmq74eDoaOAEU6Op4cYIEO1ZnR8NetCcZEE 7h+B0+T44+vHOad13ggIdh2f88K1F2OWJKRGURPSNqvEhn4GPmhwtl4jocZFQ9Gk JJoiEmLLDSurFsx51MSqhjyofoApaZ5YY1zFerKBFSMqfYKWCvTqh4+gCNSVv+HC Fwewj44A0QYjEicS9KseYRHgZOtVOsHHiljQV2WQwXzZUtBIWh7NMO+V35SShJtu g+TPlfu0flxXmMRUl9vHEApnm5iZJH1ATlds/T8w5GOOTfCfNEtScbuTCGfQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:subject:subject:to :to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t= 1765277858; x=1765364258; bh=Js6Kx4bn+CPI309iwyz3H2C6C5ShDN4/HPB lWxEW118=; b=ofpPgR9EYSrZ2e6dcvlbG4OrifNonIErY255GGfun2vu9EVS4Sw Z8DiQWDQKDIn5diuoFBQ9wczZcyw4PhaFrcbl1wQCi1CRztHnCeFDZBJH8cG9fNT a7LyBqDH095YPANtq37qfE0AcDY9WKPn32ImruGHve/Bd/AmbE3UBZTvtbQR8Dh7 Wb2WtZzsNEpYRK0Rpbkv4q4gZgADSu3B/6sNwv7z9Oif9h5QTILzZT875UnGFKqY l299/pVVJ5nRxcKKlUR6Fz5m5tzlYbKA/+gIUNRP8Op/fO2524yO2Yrtl89M6k7J rLbb79cGdCIJWG1CwmmtEu6xAdgTn5t45bw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefgedrtddtgdduleefkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefhvffujghffffkgggtsehgtderredttddtnecuhfhrohhmpeetlhihshhsrgcutfho shhsuceohhhisegrlhihshhsrgdrihhsqeenucggtffrrghtthgvrhhnpedvuedviedvhe fhieektddvvdehgfehffelveeuiefggfdtffffueejudejjeekjeenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehhihesrghlhihsshgrrdhish dpnhgspghrtghpthhtohepvddpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepuggv mhhiohgsvghnohhurhesghhmrghilhdrtghomhdprhgtphhtthhopeguvghvvghlsehsph gvtghtrhhumhdqohhsrdhorhhg X-ME-Proxy: Feedback-ID: i12284293:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 9 Dec 2025 05:57:38 -0500 (EST) Received: by fw12.qyliss.net (Postfix, from userid 1000) id 3EF4E5FCE9ED; Tue, 09 Dec 2025 11:57:27 +0100 (CET) From: Alyssa Ross To: Demi Marie Obenour , devel@spectrum-os.org Subject: Re: [PATCH 1/5] host/rootfs: make passwd and group links into /run In-Reply-To: <9ad7c8c7-4bca-4586-bb20-0891ff4c4d53@gmail.com> References: <20251209085628.603316-1-hi@alyssa.is> <9ad7c8c7-4bca-4586-bb20-0891ff4c4d53@gmail.com> Date: Tue, 09 Dec 2025 11:57:24 +0100 Message-ID: <87wm2vkjmz.fsf@alyssa.is> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Message-ID-Hash: KXAHGQWQQFSCDC3S73USS57RM2E7YPVE X-Message-ID-Hash: KXAHGQWQQFSCDC3S73USS57RM2E7YPVE X-MailFrom: hi@alyssa.is X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Demi Marie Obenour writes: > On 12/9/25 03:56, Alyssa Ross wrote: >> This will allow us to give shadow's useradd /run as a prefix, and have >> it be able to add users at runtime. >>=20 >> Signed-off-by: Alyssa Ross >> --- >> host/rootfs/file-list.mk | 6 ++++-- >> host/rootfs/image/etc/group | 16 +--------------- >> host/rootfs/image/etc/passwd | 2 +- >> .../etc/{ =3D> s6-linux-init/run-image/etc}/group | 0 >> .../run-image/etc}/group.license | 0 >> .../etc/{ =3D> s6-linux-init/run-image/etc}/passwd | 0 >> .../run-image/etc}/passwd.license | 0 > > Is git somehow generating wrong diffstats? It just generates extremely confusing output when you replace a file with a symlink. >> 7 files changed, 6 insertions(+), 18 deletions(-) >> mode change 100644 =3D> 120000 host/rootfs/image/etc/group >> mode change 100644 =3D> 120000 host/rootfs/image/etc/passwd >> copy host/rootfs/image/etc/{ =3D> s6-linux-init/run-image/etc}/group (1= 00%) >> rename host/rootfs/image/etc/{ =3D> s6-linux-init/run-image/etc}/group.= license (100%) >> copy host/rootfs/image/etc/{ =3D> s6-linux-init/run-image/etc}/passwd (= 100%) >> rename host/rootfs/image/etc/{ =3D> s6-linux-init/run-image/etc}/passwd= .license (100%) >>=20 >> diff --git a/host/rootfs/file-list.mk b/host/rootfs/file-list.mk >> index df22bce..6ab78e6 100644 >> --- a/host/rootfs/file-list.mk >> +++ b/host/rootfs/file-list.mk >> @@ -4,13 +4,13 @@ >> FILES =3D \ >> image/etc/fonts/fonts.conf \ >> image/etc/fstab \ >> - image/etc/group \ >> image/etc/init \ >> image/etc/login \ >> image/etc/parse-devname \ >> - image/etc/passwd \ >> image/etc/s6-linux-init/env/WAYLAND_DISPLAY \ >> image/etc/s6-linux-init/env/XDG_RUNTIME_DIR \ >> + image/etc/s6-linux-init/run-image/etc/group \ >> + image/etc/s6-linux-init/run-image/etc/passwd \ >> image/etc/s6-linux-init/run-image/service/getty-tty1/run \ >> image/etc/s6-linux-init/run-image/service/getty-tty2/run \ >> image/etc/s6-linux-init/run-image/service/getty-tty3/run \ >> @@ -68,6 +68,8 @@ FILES =3D \ >>=20=20 >> LINKS =3D \ >> image/bin \ >> + image/etc/group \ >> + image/etc/passwd \ >> image/etc/s6-linux-init/run-image/opengl-driver \ >> image/etc/s6-linux-init/run-image/service/vmm/template/run \ >> image/lib \ >> diff --git a/host/rootfs/image/etc/group b/host/rootfs/image/etc/group >> deleted file mode 100644 >> index e3ade46..0000000 >> --- a/host/rootfs/image/etc/group >> +++ /dev/null >> @@ -1,15 +0,0 @@ >> -root:x:0:root >> -clock:x:1: >> -dialout:x:2: >> -kmem:x:3: >> -input:x:4: >> -tty:x:5: >> -video:x:6: >> -render:x:7: >> -sgx:x:8: >> -audio:x:9: >> -lp:x:10: >> -disk:x:11: >> -cdrom:x:12: >> -tape:x:13: >> -kvm:x:14: > > Why is this file deleted and not renamed? git considers it a copy (see below) followed by a deletion and replacement with symlink. It is, effectively, renamed. >> diff --git a/host/rootfs/image/etc/group b/host/rootfs/image/etc/group >> new file mode 120000 >> index 0000000..a9b248e >> --- /dev/null >> +++ b/host/rootfs/image/etc/group >> @@ -0,0 +1 @@ >> +/run/etc/group > > ../run/etc/group? Okay, makes sense. >> \ No newline at end of file >> diff --git a/host/rootfs/image/etc/passwd b/host/rootfs/image/etc/passwd >> deleted file mode 100644 >> index 29f3b25..0000000 >> --- a/host/rootfs/image/etc/passwd >> +++ /dev/null >> @@ -1 +0,0 @@ >> -root:x:0:0:System administrator:/:/bin/sh >> diff --git a/host/rootfs/image/etc/passwd b/host/rootfs/image/etc/passwd >> new file mode 120000 >> index 0000000..889bb76 >> --- /dev/null >> +++ b/host/rootfs/image/etc/passwd >> @@ -0,0 +1 @@ >> +/run/etc/passwd > > ../run/etc/passwd? > >> \ No newline at end of file >> diff --git a/host/rootfs/image/etc/group b/host/rootfs/image/etc/s6-linu= x-init/run-image/etc/group >> similarity index 100% >> copy from host/rootfs/image/etc/group >> copy to host/rootfs/image/etc/s6-linux-init/run-image/etc/group >> diff --git a/host/rootfs/image/etc/group.license b/host/rootfs/image/etc= /s6-linux-init/run-image/etc/group.license >> similarity index 100% >> rename from host/rootfs/image/etc/group.license >> rename to host/rootfs/image/etc/s6-linux-init/run-image/etc/group.license >> diff --git a/host/rootfs/image/etc/passwd b/host/rootfs/image/etc/s6-lin= ux-init/run-image/etc/passwd >> similarity index 100% >> copy from host/rootfs/image/etc/passwd >> copy to host/rootfs/image/etc/s6-linux-init/run-image/etc/passwd >> diff --git a/host/rootfs/image/etc/passwd.license b/host/rootfs/image/et= c/s6-linux-init/run-image/etc/passwd.license >> similarity index 100% >> rename from host/rootfs/image/etc/passwd.license >> rename to host/rootfs/image/etc/s6-linux-init/run-image/etc/passwd.licen= se >>=20 >> base-commit: d0efa283216ebc503b4b715c051518ae7dbd8409 > > > --=20 > Sincerely, > Demi Marie Obenour (she/her/hers) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYKAB0WIQQGoGac7QfI+H5ZtFCZddwkt31pFQUCaTgAlAAKCRCZddwkt31p FcwDAP4sxbkcLtPuUiiIUtNqWBnfD5EVwFzXsn+hd05u9n+IpAEA3kLMcDkZD4c+ M3h+GB1b7DZQ+P8/JpqK+WGpXrTeLQo= =4z3M -----END PGP SIGNATURE----- --=-=-=--