From patchwork Fri May 17 11:44:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3564 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 17 May 2024 13:44:56 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f60.google.com (mail-ed1-f60.google.com [209.85.208.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 44HBisHB015244 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 17 May 2024 13:44:55 +0200 Received: by mail-ed1-f60.google.com with SMTP id 4fb4d7f45d1cf-574f70ca409sf2399922a12.1 for ; Fri, 17 May 2024 04:44:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715946289; cv=pass; d=google.com; s=arc-20160816; b=zs5Ub18I1KCVv6Cnd1lpNX9qbarWKzBEA/9eYnBescHpBXEHT1j7GTEWeqP+pJN8T0 WyIN9cCtaXMJB1KjRzoZrRvLCQHKi5+t1cDw/DqThNN2LFszriDo8GdoREKhSGfoM6sY w62WP1lEDeiD/y0SFL4TtkI9BMhesNnAViFy9ezaRvreRS5Fm73TLUSFz/veFRpDhC3/ wy11+tV6xgcd/xMYOMYQHf8gf+h/Gw3mWgarTtXfdd4tI9B/lQeVSgnjcq3JdnYxw0gP 9X+Y/to9MDu+b4H3Pvhv3a1ajuwgF6dxnM7jnNw57WwK+96EBOigoai/tFYOaB5ybeVy 1gGg== 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=/O9FO7+qdHhLo5Q3roj+C3eHu1707JAMvk5mKTxPk/k=; fh=/RmOecdCL4go75i3cXI7tQtKubYoLWa7B8ROShq0C9I=; b=G9aY+lZRcONVf/xQaQ3FZoLbROce7PzW+u+92t4SLGuynRh2vzZViTxPvCpkp46fJ7 ResTCTEJKQPonrT38NqHrbDAJqgC++lW0pqRh2D5edHcjCz2jCqesFWxK1SWwhZJlJk/ tUpzThVvmbLsLnHxssckrp9rfhz9qVQtZX6PeTN0E3/gnuOLRP60yf4yZSvXC8G8yU2+ xwV4E3VSK6KjaRBq8FR6GDxcb0YGmI2FvPAjmzOiboB7rD49Ll4kXm4YRF+6CZH8PnmO ys/Hv4P1cJRhnMqNkH84yDwpLIjL+wsLFm6spyK/gfRTFJjN3W7m0buYf+UVNJaV9j6S C2xw==; 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=1715946289; x=1716551089; 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=/O9FO7+qdHhLo5Q3roj+C3eHu1707JAMvk5mKTxPk/k=; b=T+GYGyAsmTevGIWMJmFeDDAC6tMsICpE1GZ6aBFtg+/tQj6sIdvA1gLdM5q55RbTjD Os/GVohXtU8NijODYAUpDVGGaLG7V5x3dz9KzIAQAvPjgpBrN7UHSjbReEl6g1Xqt8Rg 7nFQlFvZJ1iwTlIPJJgqk+6ut1J7ND38c4AEtpKqw4u1LayzwuQoCaO7HiAEOvQEjkvs OiU7EK/4AJW707vcOfenkVB1mOGKmnlriC5GZTVPDNRIvwJkftOamV/drJzNLfcSgJWS cXeCABExI7c2wzKVL9lD6BEnW4u3tPYiN4xJJu7iyWenfSyizLuWuGGrRQ83luakApvi BcOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715946289; x=1716551089; 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=/O9FO7+qdHhLo5Q3roj+C3eHu1707JAMvk5mKTxPk/k=; b=V7PDvO+qEuMJqJL0COsTQkY3oEMKmsUAPXZKZuyn9IJcnlweQz3rhgn5+UcwRr2cRX GKgaBWedRyTyGdC5K7IuVCyrUFypCeq7G1IAmYkAy9DRf4oA0zUR/I1c9wfopxjuF20h +7aEeq3NqptTLWih9QaznZiC1Z7EyEBWw8Ve91JBt+4+5ZGORHXKAd1h62WqDs7+nGBD FZekBpIqyqz0urx/6HsZl5pEx8pQi2zVqbAPYmCn2t9AZo+9hjtaEM7kWe7GqeH6Ib4f KCaNOxLSv4zrDoTOeVe4dI9xrvtxTHGWaPO7kJb11NMdel9QhwkcPpWinU2OBublhnas dhow== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUmGfCH8T+kW2rg7u1GWuv/qn+/ye7DUBRYeRBEKl2eRbUsf5fUd/3+g2AkYA02VLney28yH0L8Df834hZujBKr0mCcDYY= X-Gm-Message-State: AOJu0YzNmZro2wNh4QRamiGWPkEZIl4MuFBUxmND3OrqvtnWTVYhfLmk 4g6wYmGmXmrpviXTv8wv7RM3mFNSJhBysPZ7zSm4nGYS/sp0LBQg X-Google-Smtp-Source: AGHT+IHHsdUJs4MGhb7U6HWnN9M+lfFKPnSAI5HlnHQw0xdThqiRaV9CHwkIY50n7Q7hCFeFdWpQJg== X-Received: by 2002:a50:ab02:0:b0:572:a06e:e406 with SMTP id 4fb4d7f45d1cf-5734d6f6e3cmr15231885a12.33.1715946289495; Fri, 17 May 2024 04:44:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:4018:b0:572:5cf0:969d with SMTP id 4fb4d7f45d1cf-5733331e54els810373a12.1.-pod-prod-06-eu; Fri, 17 May 2024 04:44:47 -0700 (PDT) X-Received: by 2002:a50:d69b:0:b0:572:7280:89db with SMTP id 4fb4d7f45d1cf-5734d6edcc1mr13519111a12.30.1715946287602; Fri, 17 May 2024 04:44:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715946287; cv=none; d=google.com; s=arc-20160816; b=XQJsPRhPNoWrzJUwllhMZ+UlHV+rHEI4WmnxVKzHa0DSXmaVRjIrqvVjQvXPLWpJnT RHfvufLHBnVG2hrzEapNrSQ4vWj107qWjdV7oSrsAy1QgB/4I2yI4ij2VIHMefrTp9dZ Pmy3+EkOdLGES+eRCoVxTnDfgz4sDvxcVXfIT3z4J+5s1jNLl/YSfQn6QxcmkzKSOQM/ Vksgv0CkqaULvO+OUahx7ZNyiEHpWn3MDkmB40yfO8HS6+FScD42YLcmbfCkA1aKmoIv tXbjddz8omUbOWHXcEhLTsD71iFyUrg1atRVReY9s0fwLf2LfX/f4cLNSdntETt3y1SL H6+Q== 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=8fSe3V2DXghz0qYtIv78ANashg0adky6TGQXIAKkDls=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=XdGJBYxZ7JYdtFiZnk0NhAlZDJUgaPhtEGA28p8tD+TYb6g7H1v3krVKIoFuDGfeN6 a/bU/M1SkLCiLjwWIKKGhxly22u7Z6P6iIpZgs02cBs5rtrzGg8nqqTP/ZjxSpdkh2LV ANwulWx5WufaKlzIMukX9aLxkElzD3aEypkwBr4JHAwlnDmI60J85cI2EVrpvMEqERgH MQUOwJh4EBo57lorP7n82iM9eWMHYOi1HW2LBZPGoGmjinn2XU93diVYwYi2IiDFEehV RhvF86aZTEZAve2M9tvBFfUfgvKvUMJapuqQ6Rc502WHUeNWNa7h/CZrW0F8ftSLKTYs LHqw==; 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 4fb4d7f45d1cf-5733be9586dsi947521a12.1.2024.05.17.04.44.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 17 May 2024 04:44:47 -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 44HBigme015192 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 17 May 2024 13:44:46 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 3/4] Revert "Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs"" Date: Fri, 17 May 2024 14:44:33 +0300 Message-Id: <20240517114434.778656-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240517114434.778656-1-amikan@ilbers.de> References: <20240517114434.778656-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. Signed-off-by: Anton Mikanovich --- 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: