From patchwork Wed May 8 14:38:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3536 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 08 May 2024 16:38:25 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f188.google.com (mail-lj1-f188.google.com [209.85.208.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 448EcNhr032761 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 May 2024 16:38:23 +0200 Received: by mail-lj1-f188.google.com with SMTP id 38308e7fff4ca-2e1c0468503sf32021111fa.1 for ; Wed, 08 May 2024 07:38:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715179098; cv=pass; d=google.com; s=arc-20160816; b=FnbMwt9v6AtEQzlWTisrRmHTXume9Wlqs3WCmBGigWD/MPvQtSQp7C3Kfp0u9vuaVM h6efe0ChSIGE8SORBqyAd0ev8kaRdwCj0VH3cTPzWov9QBx26JulJeHRAn7Fwrp0+g46 XJAjGaRBxUfvVi5ObNvEcHWyENAf9BISwfXj17e8k5FTIh78f9Wl8SkAjG/oliye9+gH uethkYx3rzskH9pYltipKxAvUjfagcD1dVGcsc/BXe5xy3OSkG4Jw0EYU+JO2qEBBVcK TDiFqRsmOtFd2BvbGGRypAoJ+tgr2X0XNFN3a2Opi+bQaZ+ERoCZsgtOvQa9VFRmpzB/ WrwQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=IKpOBZKC/1E0YO8kd+PcyUJTAkXutJQYPYfbA2Hnr3A=; fh=XIPFwPjC+P/pnJS8j2oXuRCG9GK0gjyAcyto/FSevPw=; b=sZFzc4ZP5kUECzJK7QyzarPf67NSY+ZdivZkEbxeLjnxQAhMuhmARcc/uh9WWrHjPn EFAKd5cDPVqrjrUKviruckFjqpBSodCNW+mihO8S3w2cmCBrJqns+t+AnqESGChJNusa SZJus7n2z2W2IQb5cdtbCPvS4TCIyMS2Cg1pm89ugxrqwSHu3e8OYorp9Yfk2NkAMdNk RkG1+vOiPGLFI82b3j6RgVcuBclCHcwGHTsVbQR0ADs6GRRu5WjJqsMRU8px5AGRqKP5 k3W7EsP06Bu/4O6gC8ybIAIVZDF6mDFSLMlOyh6IwVHJSKZmFL14dn+Nzuy9GPUlXxEr EA3A==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1715179098; x=1715783898; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=IKpOBZKC/1E0YO8kd+PcyUJTAkXutJQYPYfbA2Hnr3A=; b=wHiWL7eJRUVZUV5x+lnsIYkeY1tBiG/ATv5ESvN28+ihg9lvYrdXTNNg3Nb4QLMdiO ZdQHye32mI9/ZZaL6AIsNc8Xy8f99tT6H2jlqbV1qQawJC+/3r7nKjtvXiw1abGgGfqd FMSkwtGCB2Un9BAsiWxuGruu7a+3be77Ab3Sgj/+5ajpPocA2bMR2NRJ6C+PwzjV0oVm pcCAimv2UU7QBWBiU5OMbkXitzmEBMoYQFnwD0YmNK6zcPRm5rn2IY/p6ZrfcsRfKHxV YnTOuWlYzbNDO6aMuafxA+DSksA20ZN1JhAS8LQZhaf3pGm+lgfsaW98oLvu62PrPg+d LOQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715179098; x=1715783898; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=IKpOBZKC/1E0YO8kd+PcyUJTAkXutJQYPYfbA2Hnr3A=; b=HqKbs2/pSotkOyRNj24tfU9qDyfT9bnK/dp8JZIslUfdn+nc55HJjlea6h/33AtOWy Z7NheegS9m7HaH3RlYSGmXBKa19oyg/SRyBW7sCjqtuuaLeTIvS0lzd+q7ZwnbTEnBZF BAdY1YmBXHwj8KVQZ1qlWj3XxYqqpNZpXMTpWuS/VqFZIM2TEdhmyG6aDKXGm8PPUCq0 euwgolUwpba0x+nRl9eiRoSQIRzfxSxuOGhBzkVSj+1MuJLm8Ht4/dBHXYxSAu79i+SI udDfyvel5Rz9jJ4Vs0YTdmBikhv9qOcnHnLyWyi9hpoqPGX4Nl6uWZCVsHRXaVZNXGm0 xrgA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXH55VjyuZBKDk4gDWiXP2/8ojWf7m58+UA7G45NMa+Y8hH5Y+UjnH/Yt/PFmI4hDnb+83hjvMKEqT8QbroFaTkkdY5bk8= X-Gm-Message-State: AOJu0YxzK/BViAzs3H2lttND5RfPwL9Tg2pJIv7G7Z76ZiPfrhFLWvOg F3/40IUz9fF333hqRyUCs+fC4F/MLkT0pofFzMga4NiieY0RyEoE X-Google-Smtp-Source: AGHT+IHLtUwbe/A/iYdRxwbfXomLRgdEBGM2bMND6GPz3ZwQCck9mT2jbYLu6DcIRM0a3bSu0oHtrw== X-Received: by 2002:a2e:8547:0:b0:2d8:be29:4ca9 with SMTP id 38308e7fff4ca-2e447699ad8mr18652591fa.39.1715179097066; Wed, 08 May 2024 07:38:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7007:0:b0:2e2:5160:d851 with SMTP id 38308e7fff4ca-2e25160da36ls16008611fa.1.-pod-prod-04-eu; Wed, 08 May 2024 07:38:15 -0700 (PDT) X-Received: by 2002:a19:640c:0:b0:513:1a9c:ae77 with SMTP id 2adb3069b0e04-5217cc4555bmr1398159e87.52.1715179094862; Wed, 08 May 2024 07:38:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715179094; cv=none; d=google.com; s=arc-20160816; b=dHAoBeOMvZlMZAlyMHon/5EQHLOBntVUY+VEByykP9eXZD2jhVIu/nTm0bAcC24WpA lEPlkBT1dRszlwE1qAe3j3ItncizmTaddpfb3DrYLpQOh95JG4wdK9sYBStYURxPEdKf +7+POFNuga4Pv5pDIHrjFWCZMREiVZQRxoyXKqiu4hq7dMdSR3e+IZ+PLWSqBXeyzsGo /jU6pTSN8cPhnRQTxnABeCiRUTEmyW247w05kQwCLtuU7ssfORet7UVCJ+m+csew6OVX Hf4Uh+ja8RhdIO752EUvHIypn67fFgsm7G9io4psiDfBPbMCts17Y46ptPGWjWIIhOce PKXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=SybdrTZ50uM2KEYWSfu38h00qbLPcVM4NsmKwndNs1s=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=AjMB/jttssJIvmXnzwBBaaQwWCIFqlbHMBEKwe3vpGmq6RFAQvGyAz4vcWWwC8HRqc Z5UaRpWcZgQllvvVDVDX7KzWpfnRroXpOLQsjcpZUNWCqVj80QcvRNJltcWFq+eVEhyY OGEjx78SU+O34jfYwwrPv3okn5AnBpkC8louEP97zVQl4B9zIAacD6XVe85wQuCcAgUa OjLoa/hWc07mrAWF0dp5Q9H+GYHOGvInsPJa+pGsominUsTT4RrTn7BRKkoHQF8cDz5g y3ZloIafTrAA7SD51OC68mHKIwppM1tMPgyVDxiZTqRT3Agjjw3u5VBbKF4BAHEmGO4W jevQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-41f4d07447csi3401305e9.1.2024.05.08.07.38.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 May 2024 07:38:14 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 448EcAtm032711 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 May 2024 16:38:14 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 3/4] Revert "Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs"" Date: Wed, 8 May 2024 17:38:00 +0300 Message-Id: <20240508143801.557383-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240508143801.557383-1-amikan@ilbers.de> References: <20240508143801.557383-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Commit a4237f08 was reverted in oe-core, but still needs in Isar. Revert it back until other implementation will be done. This reverts commit 045e0da5ef147d3e9e0dc4ea8db95c0746984efa. --- scripts/lib/wic/plugins/imager/direct.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index a1d15265..33a869ec 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -117,7 +117,7 @@ class DirectPlugin(ImagerPlugin): updated = False for part in self.parts: if not part.realnum or not part.mountpoint \ - or part.mountpoint == "/" or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"): + or not (part.mountpoint.startswith('/') or part.mountpoint == "swap"): continue if part.use_uuid: