From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Tue, 02 May 2023 09:07:28 +0200
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1ptk6j-0026ys-B0
	for lore@lore.pengutronix.de; Tue, 02 May 2023 09:07:28 +0200
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1ptk6h-0005vp-KD; Tue, 02 May 2023 09:07:27 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1ptk5T-0002WH-Ua; Tue, 02 May 2023 09:06:11 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1ptk5T-000WpJ-D0; Tue, 02 May 2023 09:06:11 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1ptk5S-001KNz-Al; Tue, 02 May 2023 09:06:10 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Tue,  2 May 2023 09:06:10 +0200
Message-Id: <20230502070610.316684-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230428080219.2971043-1-r.schwebel@pengutronix.de>
References: <20230428080219.2971043-1-r.schwebel@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] qemu / 9p: store metadata for / in correct
 file
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Robert Schwebel <r.schwebel@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as 94b4846fbe5b18327baca493b181a94a7d610fb2.

Michael

[sent from post-receive hook]

On Tue, 02 May 2023 09:06:10 +0200, Robert Schwebel <r.schwebel@pengutronix.de> wrote:
> Since qemu commit 81ffbf5ab1458e357a761f1272105a55829b351e the metadata
> for / is not stored in platform-<nnn>/.virtfs_metadata/root but instead
> in platform-<nnn>/root/.virtfs_metadata_root. For nfsroot, we also leave
> the file in the current position.
> 
> Without this patch, / belongs to the user+group of the ptxdist user on
> 9p, not to root+root.
> 
> Inspired-by: Michael Olbrich <m.olbrich@pengutronix.de>
> Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
> Message-Id: <20230428080219.2971043-1-r.schwebel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh
> index 1a1af0c1995b..a2fa7b99ac7e 100644
> --- a/scripts/lib/ptxd_make_xpkg_pkg.sh
> +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh
> @@ -296,6 +296,10 @@ ptxd_install_virtfs() {
>  	virtfs.gid=${grp}
>  	virtfs.mode=${mod_virtfs}
>  	EOF
> +	if [ -z "${dst}" ]; then
> +		mkdir_p "${d%/*}/root" &&
> +		cp $file "${d%/*}/root/.virtfs_metadata_root"
> +	fi &&
>  	if [ -n "${major}" -a -n "${minor}" ]; then
>  	    local rdev=$[ ${major} << 8 | ${minor} ] &&
>  	    echo "virtfs.rdev=${rdev}" >> "${file}"