From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7026325955122561024 X-Received: by 2002:a5d:5850:: with SMTP id i16mr30563871wrf.197.1635943994566; Wed, 03 Nov 2021 05:53:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2983:: with SMTP id p125ls2714879wmp.2.canary-gmail; Wed, 03 Nov 2021 05:53:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzisJskS+II4mgILOZ3RWqnUPNSvdFOYoT8AzNMICQbEZp091UbyYo2W2IXGTnLkChnLeZD X-Received: by 2002:a1c:f405:: with SMTP id z5mr15000293wma.72.1635943993585; Wed, 03 Nov 2021 05:53:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635943993; cv=none; d=google.com; s=arc-20160816; b=fVehw/Meg3FTipg1TSh81c2pBk4xBD5vxgSDf477JMMk6lE0mTOnYQ7qWI7gV6Zfu6 OspRJP8jkXy+iRLohX9BEaN+H9oBVIW/3Rfqs1CTzmwK0dPW0s3LWkCbC7LQaW7g/n3R shapHEbUeZgvL28hXo+NNqWf/Q91F0nsvnZolU3ZMiNwKShBIDogHui78y5zJEA/zdo3 fyODoCGkPgYlsoufMgzWJeh5aeUy9iSfGzfw1S32/TwgrdoIkUqI3LIGHA6v9W6wX5i1 NyWHp6/PFl8hSOBOuasEo9grKkRZlomkeOhCu6ge9X0RXHScVEPIs86AN6LiDsUUFBW7 nuUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=Fq1TdY6puxQ06h4QpMat/1rYstD6uU5iWqAg4rRL7no=; b=u0XHe7EhUTjOgtfWbiuzOkaSbi92uJflGjXt/9rA592Zah3ttgK/FcY03gUnQtysya WkBAsz8ovMCVMLmeK5a9wQPEgtTNILI9maicvLPGWF6SIU/YevY37Vz/+zsB+T/Bbl92 T027g8JkMA4qFpS5idCipKu+JiHJaygHZ+a/YltIFEI/y5SVjfaq1OcYYJ/ehEQVEPSs 4hqAM8YrZr6PnaLSpsqKAhqv9UjPTnb+Ofe2V9+ajrrcGuseiLr06iIuJkIT+eCX62dD NQDL2rrcGJdUJEu4o0f4bPYSrTQpM7PaSjm6ww7nPDPQ6U60d+rSg+zwR5JnaROWyOuW DLWA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id g130si146089wmg.0.2021.11.03.05.53.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Nov 2021 05:53:13 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of felix.moessbauer@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 1A3CrD8t022664 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 3 Nov 2021 13:53:13 +0100 Received: from MD1T0KAC-VM.ad001.siemens.net (md1t0kac.ad001.siemens.net [139.25.68.224]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1A3CrCRt025363; Wed, 3 Nov 2021 13:53:12 +0100 From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH v1 1/1] Fix permissions when splitting rootfs folders across partitions. Date: Wed, 3 Nov 2021 13:53:05 +0100 Message-Id: <20211103125305.3021016-1-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: vTbZ9w4VFEKM This patches ensures that the file database containing the file and folder usernames and permissions is always located relative to the source and not to the appended rootfs-dir. Prior to this patch, the database was not found when using -rootfs-dir in the WIC script, leading to erronous file permissions and ownership. Signed-off-by: Felix Moessbauer --- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 96d940a..5ab771e 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -95,7 +95,7 @@ class RootfsPlugin(SourcePlugin): part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab")) - pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo") + pseudo_dir = os.path.join(krootfs_dir['ROOTFS_DIR'], "../pseudo") if not os.path.lexists(pseudo_dir): logger.warn("%s folder does not exist. " "Usernames and permissions will be invalid " % pseudo_dir) -- 2.30.2