From patchwork Wed May 8 14:37:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3534 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:22 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f62.google.com (mail-lf1-f62.google.com [209.85.167.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 448EcLib032750 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 May 2024 16:38:22 +0200 Received: by mail-lf1-f62.google.com with SMTP id 2adb3069b0e04-51f843d9194sf4052890e87.2 for ; Wed, 08 May 2024 07:38:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715179096; cv=pass; d=google.com; s=arc-20160816; b=G7YERFbeUYhQyc9SarO/32czTlx6Iy08GHGwktoeb5TGUk3+RrcF2xF64kVuD49k1O IrGXNyqeFaSXuSCnnJJaDPV1rpWxtoJuZgHuSBPDCiJVQFA3ykRpOppykNmnTBQX9S4T tYHLfPAsV1OFdBaLTNq+nf3OabHTsrxYlJlj/wtCFZrBHkJv9F+aQV1vYNlU06dK26sK u7aXFmbsrtxhqpuz/UsMogizqIlr2VVQI07F3a8didaJmxDp7ZjR77Qj3Zg7Ahzf5MpS cTfKNoPFAIlLVdxnuAqJlLQYZohhPyklZP4p5ko/uSD/Bry5cLSjP1yfWyNpkoB0tTft 33hA== 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=GPdkZJruUagROUTuzsPRa3AW1GlYG2vnUnGxiAJVLIU=; fh=QFTdkpZX2YvNdEplHilX8D0BXS6Dj6C7Y19xfMDdO+w=; b=bjsZpBb+WPSiw15qNmzqkvQ0XbY+4yjXnwNHsPPmvYAiNgCXFq4bziBMHQmstfiDYT 1I75F2GX0g3BLjIcqrEh6qPcRMscNH7uL7N+EAGDhjrs1w89aWrn8a90++jEdWOHWpA5 TF3z2DjbR7xWVJRimWgOdvX7jQ8TYsc0WDMz9uHyRyQXoth9Ms4yhxDAYFlfwdLGP0ng o7/NmNHi0cWEpgEorKgdxKlkCrn42V1auz9eeD6aHJ/4bxVJZ9gXSuocXwFvYc9Rc0Wv vVGodKHbdwsp0Mpd95jXmHJAa46dfgeqiayNsFE2b1SxyjTSR1sxD/G1eMmP6JM+juy8 cmXA==; 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=1715179096; x=1715783896; 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=GPdkZJruUagROUTuzsPRa3AW1GlYG2vnUnGxiAJVLIU=; b=j8Dxl//Y7EZ2oIyAWFlUB9ZxfmtGvszTHupe1YDeXWa/1IWsSegbEriN26WGQKprJ4 9aVwFglkICyHCL1+Vrtq5rNR7owSW4djDxJ/1WPZ4C1tg/9YEGMvV8Jk/oOrm2/VQ+aj XBVRvjtJsSh08IG0WxESTD5BA5knKZ5H9lQ6c0cSG9hKtHeKb1EHUTYnVV+N//uceUo2 we2mlUgxYULrgYTsTAu/MMzHcd0RfG3saFP6DANb2fjjBdxbFktdhM83zT9tPSem455z oHRXLXYUy0Al5SPQZphvObJ+/kGuBofDrXUKDvfTVjz8m4ur8sMtFXxBv9jj9xazPQTT XXRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715179096; x=1715783896; 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=GPdkZJruUagROUTuzsPRa3AW1GlYG2vnUnGxiAJVLIU=; b=m7R93A8wzUtgl7RCheWwtMhMSTvDIpiq9JDy7u+HVKuF9KRmqEW+o6Whf0hhJL1fHe 526lszxnj+gcu9qB+gEGXT7ig1LW8Z5hWl8SInWsp5YjQrJvBAMkR2s3rDAzOxUv2ZW1 gmqNipxA8ey9ODxLGG7cwRWjU3kt/+veMzUEXumvoufDMkvHCW0ayI08o/jOfh1jjOcQ KBH76Ez/5QxT6607QYk+TWP7SIvKUUqWWBnN/9pV/D9PLGLAc4W8tYvbIZ7yLCICueht m8JmLSevBAAwZx22f9itzWIYECF/CeqK97aBX18tEmmzIpYoaBnWFhzLcmAdA5ctvXa4 JVWA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCUm3eQCgsoUbnedx1gzpJOoXN3y0V0ME81CvmqFGZXAqRkQiIj9o9VGW1Vl88DdKU4lLIBpM4sqTMhr+eyeTABx/dZVW7g= X-Gm-Message-State: AOJu0Yw5IDvl4GRe4yIFH8Y5eIzK5vE8iLo6setPMfytMDP1r0qFet+I Y94J69IsAfpsEIKDkjgAlmVoFLfG3MNCIT2ksvislT3KfMmgvKS5 X-Google-Smtp-Source: AGHT+IF5y0JWOAa5S7s80/gu9YLP9l3SNbwzMkSWtGYeZDIWIha0EVnqA++EdEO5u8ONJXmA29hk0A== X-Received: by 2002:a05:6512:3448:b0:518:9b42:b846 with SMTP id 2adb3069b0e04-5217c469018mr1842423e87.21.1715179095106; Wed, 08 May 2024 07:38:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3085:b0:520:3a2b:d89f with SMTP id 2adb3069b0e04-5203a2bdbc5ls663126e87.1.-pod-prod-07-eu; Wed, 08 May 2024 07:38:13 -0700 (PDT) X-Received: by 2002:ac2:51a4:0:b0:51e:12e2:2a1b with SMTP id 2adb3069b0e04-5217c856262mr1952080e87.41.1715179092980; Wed, 08 May 2024 07:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715179092; cv=none; d=google.com; s=arc-20160816; b=RZ7tWJQSFTo1IjSAkbjlKyRwGTpEP0t79PgW8bXUipvUB9SjToqCYV6NDNGeLhMrso 3yw2mTqIV22UdVt2Sy1zkDIJoVa6Q7BNpTlJehZOL2HRAJKiKyDBmaVeMeyGyOEY+jUQ B4/peiUxgSfOF94Rb8o8DPjrZ1Er/qE+wwl9I8q6PmLs/vNUcTKIr78ydy3cNPW4O0Sn oeycvbKjIJAFNPLjAzOhmB2V32087KoQKdcHDt4+E7J+pO+/RbVYCQL4mcJ51dtswAfD cjAMl7NpwrUSvQGMlg1tTDLQyUugqw5JLXLM8VdAHJcwqtGL8JEKsyltZvXyNuBDRBp5 +YPQ== 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=Yv3nG+2+crOwys/PEg+Zk/oIEOhBG97UP9DDFol5IGs=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=BSPd3SDY4YFgMkOYq6++wShLpyMO7eJ+jjqt3y2hi0YN+zD/H8hNuKHJqqOo3fq0cq Y8zE19SG8qLUGzX9oDyHo6NSch64pLX1fKZbJOCB9XsVjqoTrYA09mUwDI9CqJN6wRA7 4iA0OOsjE9HXWSFy/5DnSuWmFLvYERHYQNzHWfQ4DQiQLhfUi1Vq/knMnvSBPS7XbyKT o42mcWZU+EFH8es/CNQ4Ii0speKp2zrNI9NTYENzF0Va9PrfFT+eauaCAQ0aMypJ8HA4 Bjao36ld5Q70rjsejWhTSuErhSF2dUxBLrTfRtpcNrdHHsMw4awK+FNkclbbAPf5aHH0 cS6A==; 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 k11-20020ac24f0b000000b0051b29095060si438530lfr.12.2024.05.08.07.38.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 May 2024 07:38:12 -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 448EcAtk032711 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 8 May 2024 16:38:12 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 1/4] Revert "wic/plugins/images/direct: Allow changes in fstab on rootfs" Date: Wed, 8 May 2024 17:37:58 +0300 Message-Id: <20240508143801.557383-2-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?= This reverts commit a4237f08e67ad677e26d47a64d68e32417545a14. --- 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 c44159b2..da483dae 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 not part.mountpoint.startswith('/'): + or part.mountpoint == "/" or not part.mountpoint.startswith('/'): continue if part.use_uuid: