From patchwork Wed Apr 29 06:43:53 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Badrikesh Prusty X-Patchwork-Id: 5054 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 29 Apr 2026 08:44:52 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-yw1-f189.google.com (mail-yw1-f189.google.com [209.85.128.189]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 63T6ipV9014909 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 29 Apr 2026 08:44:51 +0200 Received: by mail-yw1-f189.google.com with SMTP id 00721157ae682-7a3715e9e69sf16575717b3.0 for ; Tue, 28 Apr 2026 23:44:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1777445085; cv=pass; d=google.com; s=arc-20240605; b=PlzICBEjLGILCw+o0uY4Kd2UvNHyEJktxtG77u0j2BpLfQoY/Rh+QWz4mXzrORfDXT Q5fxH8+E9+xXZaebZX4n9ELgkUjDKBREMAu9W7SQRybFyTznixJ1tiuzHofv6vEZnP/x VNdf/8DAyfypXgl7Duqrhzy6+9d38UVR/R9tqw4UW611m3ZCMExrBzvtM6GpfTHXaThv L9cbT6n38SIbSKtCtBK3KWis4iXdM9TcOu4xYYYuqzhv65HMmhc6VhUVDRof3pp8KWlZ xrT1GTtjTvVmNUXE6NSrr6PzN2v1GBw4R+HLjCUIkApVxIRsfApoR7dMlffQaNYzf4SM nFXQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=C68uAo36mBLYVPNzyvajnaI8wZn1lbt+woufgGRt6ak=; fh=s4pVPXkSHXMTOPfrsgEN7Q0SCippEzg9dPEXIAZY+8g=; b=WP6CuGej3pW0rYK1OB93U/b8YTrfD09R0fAKXEZIYtMKLL3S8qMzH/V02DIHKBOh2t gPGRAHOqs+izqDNSvx1FXPLAhbvu8+I1zM1IgNzDVdZkZ1QrnHbe7Is2RkNW21UfkiqU mN4sn367lq+KJnlzTtl7+W4c9QVc5JbxBshr6dJeh/V4Z8TjfL99DXI4CVbKUdM3m4Ny i905QPlGUHp+H+PiDfKNauMQDmL4csb1+jASmhi0bBRjBqMYkKJXHPUujB4DYcjznXT3 /iZSVEsaQ6F/OHrUXfIsTXps7khB3AWwf6QQRC2P9NOu1GECgw9SYC+uJ2zjr7XbLv+K zz1g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IUO3fICG; spf=pass (google.com: domain of fm-1328765-202604290644423302c3d73a00020738-jp0iiv@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328765-202604290644423302c3d73a00020738-jP0IiV@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1777445085; x=1778049885; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=C68uAo36mBLYVPNzyvajnaI8wZn1lbt+woufgGRt6ak=; b=IRWcuvJPhj2ovrwLnci3BuRy6cNDQ2LSAHnyZX33CvdgvgWHd3+2R8CkpixSgSRHPM yb51Q1oLVFcpCrfEuQBFSujULeZNmrj9Ur/hfTOfEshGsvcAw0WXMR6kOd+9LJQEpEo+ uexx0FmzNwVpk05QPVMd2ozlEhZWkAnJHxJZJTkp3H5yv5yyAIJdylWcpV96HtGJCVYb tSJp6gmE/lQD1pur2ANbq/v4G88xwoab6vGtKi9Qloln8ny6y1eLaOVsIBPqnyev/YWj 6QPoWquWhGBCw/rfZpcy4qYaDuo72xRNHxhUZzjfP3jRkyXlZfRUu3qCy/66vnwb+DBY yemQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777445085; x=1778049885; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=C68uAo36mBLYVPNzyvajnaI8wZn1lbt+woufgGRt6ak=; b=TCw7dxX3ugyvwEU/yUSRDvaGFog864+IUVAXXofR1zjeXqgYe27QwAHVRQa+o9iO+d xPPp6zbVekNja4Y6upEvRJsQ4PS29tZK6f2YHhLPLf0bop2qQ+MwRdS7HpZqV2h5u+Gu W6Cc6zvFGC79hkJJMzgR6pdTKJaw9/wRMEwVjKlWadHfzdnyESNCWeE1T+fqUIUclStR HF0R4IalcJcIWaNSbLbe/Kq0JNTIONLWEbg3976a5tblOtRszhTz2zrV4YnBrnHsSnnN PHxV97STPDaoxfK/yYaXElxbgoHYLrx+7Clp6LyydJ4uA/Gh+p/IeSBJc9MzaIj4scYi 5FCw== X-Forwarded-Encrypted: i=2; AFNElJ8X+hCEemeclzYd05X7PKK7dOV3ieQJ+dRMAJcZUixEH/Ne6DhyONr6HQ2bvE2NEeh7DJi9C58=@isar-build.org X-Gm-Message-State: AOJu0Yz56UaEh5i7Dft8v7VhnXYYWXd8ybDSUrmnGtr4z3M25XiH7Iab aS99bvvIv/2emKUcuMEdWHgZkvmQiI+q8vwJlVffUIEp2/7znNUmI+tu X-Received: by 2002:a05:690e:4196:b0:654:3fdc:7b3d with SMTP id 956f58d0204a3-65bff40e8b6mr1072695d50.29.1777445085353; Tue, 28 Apr 2026 23:44:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AUV6zMMXKrxFPUFzf/GS4aV9GFh2jY15waBy96+icOR+uO67hg==" Received: by 2002:a53:db07:0:b0:640:dd37:3062 with SMTP id 956f58d0204a3-65bfcd6b139ls280162d50.1.-pod-prod-00-us-canary; Tue, 28 Apr 2026 23:44:44 -0700 (PDT) X-Received: by 2002:a05:690e:1186:b0:64c:9bf0:3055 with SMTP id 956f58d0204a3-65bfe4d725emr1527734d50.6.1777445084346; Tue, 28 Apr 2026 23:44:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1777445084; cv=none; d=google.com; s=arc-20240605; b=GzvlR0LEhEMEx8ws1Qg0HlChfL1sZ79SLi4EyLtCrf26E6QOl9XA0YNzgQbvnryy4B pFgbiijBsez4t4Z9AtomQNOhvWJR8Aop8lICYqqNAE0GDCAeESIfrNN33okWL5QLOQaz 0YKEv2elYQfQ9pYBs6Ii3zeaGc6kbwNwngo4O0/hsXxw6E9M+yNG1NRvjNL+JHecfRpb IJpab+Ng52slVzxRkJaS03OjgllHirCfh7QhawDSahn78Xll7hPWwZ+tEc/HTlE0QL0e eStCFN2Tb1oCLELpAsjSzuwL5esIyW14UR0F3mb8wW8Q7/3cxjy+Gheu1J6YzrmWw5xS PTJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=HmYyLmpRMu89j8yF4xu5qfGWT3rB2Eim7hOsKlqYMeo=; fh=J4Y2O5ZviXjANVi0NyFDskbPgOCoMOxQZxrtp4qiiQc=; b=JFBqtgXcvxc/SKdOy5jpUEAPl9A4bhN60PGmlwA3nGqg+rJIo4XJLaa3/wRrh7emxy zgDXeTIPbz8PKuGViBiaticpShbjHqqwb6VFD3FBApsLSqsyu+SfzI7+uQFstna2hTpP UzmADkFqF9MHv3tCkU5PJA5VBL0DoR5Xh2YnJx7+Gemm5eO22OSbU8EpWbUuPSBt1C4w 1NCcnF+eFvTVMBHZmgqkHpd/t9xSuNrYFHlKeeFbWRw7V2jypjcxNJqcPZtGvgWXK0P5 6OmMI9t0tfIASZNxrdjor9UQanbeUlSaeHgO7H8BS6zMNSw0HHbqIojNGUhoiyzhFPsm NT1Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IUO3fICG; spf=pass (google.com: domain of fm-1328765-202604290644423302c3d73a00020738-jp0iiv@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328765-202604290644423302c3d73a00020738-jP0IiV@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 956f58d0204a3-65bff4ebdcdsi46588d50.2.2026.04.28.23.44.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2026 23:44:44 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1328765-202604290644423302c3d73a00020738-jp0iiv@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202604290644423302c3d73a00020738 for ; Wed, 29 Apr 2026 08:44:42 +0200 X-Patchwork-Original-From: "'Badrikesh Prusty' via isar-users" From: Badrikesh Prusty To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, jan.kiszka@siemens.com, gokhan.cetin@siemens.com, alexander.heinisch@siemens.com, Badrikesh Prusty Subject: [PATCH v5] image-postproc: gate systemd preset-all on masked unit state Date: Wed, 29 Apr 2026 02:43:53 -0400 Message-ID: <20260429064353.1372987-1-badrikesh.prusty@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1328765:519-21489:flowmailer X-Original-Sender: badrikesh.prusty@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IUO3fICG; spf=pass (google.com: domain of fm-1328765-202604290644423302c3d73a00020738-jp0iiv@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1328765-202604290644423302c3d73a00020738-jP0IiV@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Badrikesh Prusty Reply-To: Badrikesh Prusty 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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Skip systemd preset-all during image postprocessing if masked unit files are detected, to avoid non-fatal failures when presetting units that are already masked. Fixes: 72b88a12 ("classes/image-postproc: Enable systemd units based on systemd presets") Signed-off-by: Badrikesh Prusty --- meta/classes-recipe/rootfs.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.47.3 diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass index 8b502a50..ca847b30 100644 --- a/meta/classes-recipe/rootfs.bbclass +++ b/meta/classes-recipe/rootfs.bbclass @@ -574,7 +574,9 @@ image_postprocess_populate_systemd_preset() { --show systemd || echo "" ) if (test "$SYSTEMD_INSTALLED" = "installed"); then - sudo chroot '${ROOTFSDIR}' systemctl preset-all --preset-mode="enable-only" + # Skip preset-all if any masked units exist + sudo chroot '${ROOTFSDIR}' systemctl list-unit-files --state=masked --no-legend | grep -q '^' \ + || sudo chroot '${ROOTFSDIR}' systemctl preset-all --preset-mode="enable-only" fi }