From patchwork Thu Oct 31 16:33:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "alexander.heinisch" X-Patchwork-Id: 3893 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 31 Oct 2024 17:34:23 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f60.google.com (mail-oo1-f60.google.com [209.85.161.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 49VGYLIO021800 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 31 Oct 2024 17:34:22 +0100 Received: by mail-oo1-f60.google.com with SMTP id 006d021491bc7-5ec11ea5490sf807346eaf.1 for ; Thu, 31 Oct 2024 09:34:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1730392456; cv=pass; d=google.com; s=arc-20240605; b=XalpGpcOf4rKteQTYmP0KGVTEYaiJx2F/RPlb7FjbD+/3bufqDEpbXsz5uV5NKypDR f57j93evPfzPc53mg1JKNmnGR45ftkQAeXKFFJBiV+Tc1PkvVanuGs+UFWT+X90qOPPg cRQuKfuDarTvc3ccEAKr5EzrlEeTIRcUD0oN17ziN2mo4GphiEklRzMK62WWEW/NURgE JPU7doGceh3DA7xeNWAQCeRdf3jAbJK3OzEjEk1tZh6bo+8riwe25kBiRtFMYPisHT0q jnDJvIWOJ+YTsRodvTPTDWfARv1f2EVceCBGZvHbwTNU86Br5h2Nkgcr54BKJMmRZY3u AYrQ== 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=KQ2AUU9RfffQxlLdRegjVcDck0TN4cSpx8LCEeDBr+A=; fh=/uC9TwskPUkVjljYGn4oCM/uVGIOaTnC3gC9G7WUuP4=; b=Ho+RguMYJ8gdLH9M6N5v9/F89EzXVEsVT54K/bxNKHKh/IDLgxRIBhFuxIkiOEdmck 8a0qFSogZkGmJMYZQ8apoozFytUiNc8ZB+4en7xctK4u2vBqrsWBN+jO9JUX4eC1tIlF 4s9ifEhj3oAJFaVz3SAMzpnoVIBg7EddUv94Oh9YsYENfLtWH2s+siu0SDuei/UKgYXr Jmn+l2p7H8Gue0xV0cO8CrIAAgUOLcVQ9mNyzfLPgJbkz8BoLg/Th6tSpJ5joVS1SNlO fq6OIQZCG5sR7YB+6HdY2lt8rCWBuhb+D2yJirFiOi4SKpGQmGGZBq0+/6ACVT8l+JDm yh4Q==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=XP8+1JrN; spf=pass (google.com: domain of fm-1326448-20241031163412c7693d0d5a3b6fc0ad-xspkmk@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1326448-20241031163412c7693d0d5a3b6fc0ad-xSPKMK@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=20230601; t=1730392456; x=1730997256; 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=KQ2AUU9RfffQxlLdRegjVcDck0TN4cSpx8LCEeDBr+A=; b=aIt1JTajLM59ty19OEptF43U/PPVYLLQjch+G7ty96JSQrz3uoEj5l5QzFtkSa1093 AFnhRUFGlguliHnfsZUt2FK40kczOdk6LMekAadPb668K2kukSaGMAq3GFUf1IitVMce EyXuUZslShnD+lYRk8FhL4+HOMPf/EIbGmgKKurBTdXWLXkDfw87U3joZ4VuAEFhhP1v 3AbPxNwgcSKJit09uFB5gpMDXsKmmKdagQtD63JhaiIEa3dJ1VOwxDH7Pqh/+HYvNGrf Udt2RTI8bcTophbThFv2D5Umscl2KCexxcbPbQ98+fSbRf74on37ZroFEKeVD6mWhSiy N0dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730392456; x=1730997256; 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=KQ2AUU9RfffQxlLdRegjVcDck0TN4cSpx8LCEeDBr+A=; b=Eb69NCQ+n87siu29qVOwg0Zd/aTvxPMMlFnLOOPY04ZcT5jSCn4pcd/E3w7v+jiXVA LRhHnO+Wjdy9Eg6KM1b6H5XHU5ZPB7A3oEfHBRsUNFd5ZNblcL05zPrPQMUGOiCneOnn uxlFHuhY9j4Alh4jU1MC5GjnySgdi4kQFSkNJ9GZkIfvCreNZZLdtJIHrYqvvHXfOcFg DaFuSYAYfj3d42Bn52gdu5Xa4K3TfFgBKA+AQlbuyokcI1b0MOvMSkb0t+QM8l5qh7ZD svXXNcWLjvHCQOacMMugl5eyIAfZZ7uBQJcoaNtTKshYkKG7yU4sgrWbmznz918rqPdO Q9gQ== X-Forwarded-Encrypted: i=2; AJvYcCUcT56K7Hq/WgQBRPuqH6dsJOFAYcJwfjrxmQGWfxHUfCrjLQXo9cPZX9mIhYUFLlly2ZOj+OQ=@isar-build.org X-Gm-Message-State: AOJu0YwOG5JJ1QhEY2+BKYDAhnnLOPXJpXGjNJ9G2j1CHmUpYmUTVTU9 YFHOXAZphEXlhtLTOgUGjmCxmPb4cVWC+Ws9TuUyGHvcffPB0y9U X-Google-Smtp-Source: AGHT+IEZcxL+NI5cmWp0RjLOnFzRS5fnDYgug0fGH75wCGLLP48H6F+kiPDyMnuBQoB5tKBcGomOwA== X-Received: by 2002:a4a:d750:0:b0:5eb:cff9:d208 with SMTP id 006d021491bc7-5ede5acd87fmr386586eaf.2.1730392455787; Thu, 31 Oct 2024 09:34:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:e04f:0:b0:5eb:64ea:8ec5 with SMTP id 006d021491bc7-5ec6d30c3a5ls342743eaf.2.-pod-prod-00-us; Thu, 31 Oct 2024 09:34:15 -0700 (PDT) X-Received: by 2002:a05:6808:309d:b0:3e6:22ce:d1c4 with SMTP id 5614622812f47-3e74c3aad3bmr422694b6e.12.1730392454908; Thu, 31 Oct 2024 09:34:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1730392454; cv=none; d=google.com; s=arc-20240605; b=eENqU+oKQXWydIvVTjexHbyrAxD6Eptzas+HosAAir5we9M1BND08di4/eVzwKmlY8 7F5Vr5JQsYm8NbZnit8wOhiRF/oQqfcbOCtmavvZ5v4BW96oL4CKf8Y4MePNoBY4NCSM drSO2TDeQbaBp+S8NVjsLKGesVDGwccaVPuJGIjUmDt7/yS590fddXnJATlxGWYjNd/Z lD18D8scjGOe5fczOjkN+xJv9Leut/7mr3igRyeaza8sKpCARhnNm6zDcK/15gomLzh7 OSVksfZWescuKH2ll+pFSdBrsDr8efsg3gbD+sG9SuiVsLnZHwJHF8R4/wuxJqmXYXYa 1c5Q== 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=6tWc+VIMUh3HpbUMxnH8IQu7IKnt56Yq1YYd3mvRfoQ=; fh=PpWIame8u++O2AKYmz4eO2eLtEDNXbj/8l0CiINKMR8=; b=Gbau1rmqWfrlRd97ETZihonHi0qwoe47IfU0zRjKH8+iA6xcynTfU9MxkqYOoAGJeY hJ1TtxxcKWuz4/8H2nBbE8k8OPP4Rj0UQbCamgvoYy3Ep8dlMuWoR9e6Gm2i3HhXG4di dbPMzAg5Yy3/gzCz1cwvSwcuEDmCqGCXevf7sR/kolmEhm5xHrl9pd+0QZa8YjWOH58V yTYnl5ahlNvw6d4zGNB4gUfIEWbijBD7QsQddJ2+gJvBowQuI8CocYnE+9T8VbdYGAb5 16Pyr1O1VGITlI+39MOWxwfCqF/rUH4pZBYwHs3ydIKNIF37FDnTqsw29RWJJpdgrExm fhgA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=XP8+1JrN; spf=pass (google.com: domain of fm-1326448-20241031163412c7693d0d5a3b6fc0ad-xspkmk@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1326448-20241031163412c7693d0d5a3b6fc0ad-xSPKMK@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id 5614622812f47-3e66116deb3si86285b6e.1.2024.10.31.09.34.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Oct 2024 09:34:14 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1326448-20241031163412c7693d0d5a3b6fc0ad-xspkmk@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20241031163412c7693d0d5a3b6fc0ad for ; Thu, 31 Oct 2024 17:34:13 +0100 X-Patchwork-Original-From: "alexander.heinisch via isar-users" From: "alexander.heinisch" To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Alexander Heinisch Subject: [PATCH] Fixing: Handling of unattended installers target overwrite mode. Date: Thu, 31 Oct 2024 17:33:40 +0100 Message-ID: <20241031163340.785408-1-alexander.heinisch@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1326448:519-21489:flowmailer X-Original-Sender: alexander.heinisch@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=XP8+1JrN; spf=pass (google.com: domain of fm-1326448-20241031163412c7693d0d5a3b6fc0ad-xspkmk@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-1326448-20241031163412c7693d0d5a3b6fc0ad-xSPKMK@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: alexander.heinisch@siemens.com Reply-To: alexander.heinisch@siemens.com 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_H3,RCVD_IN_MSPIKE_WL, 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?= From: Alexander Heinisch This bug was introduced in 934fe3ef due to over-motivated search and replace. Signed-off-by: Alexander Heinisch --- .../deploy-image/files/usr/bin/deploy-image-wic.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh index e6ee426d..91c0518b 100755 --- a/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh +++ b/meta-isar/recipes-installer/deploy-image/files/usr/bin/deploy-image-wic.sh @@ -130,9 +130,11 @@ if ! cmp /dev/zero "$installer_target_dev" -n 1M; then --yesno "WARNING: Target device is not empty! Continue anyway?" 5 60; then exit 0 else - if [ "$installer_target_overwrite" != "installer_target_overwrite" ]; then + if [ "$installer_target_overwrite" != "OVERWRITE" ]; then echo "Target device is not empty! -> Abort" - echo "If you want to override existing data set \"installer_target_overwrite=installer_target_overwrite\"" + echo "If you want to override existing data set \"installer.target.overwrite=OVERWRITE\" on your kernel cmdline or edit your \"auto.install\" file accordingly." + + exit 1 fi fi fi