From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 15 Nov 2024 14:58:54 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-yb1-f190.google.com (mail-yb1-f190.google.com [209.85.219.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4AFDwq9I008094 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Nov 2024 14:58:53 +0100 Received: by mail-yb1-f190.google.com with SMTP id 3f1490d57ef6-e38100afa78sf3380826276.0 for ; Fri, 15 Nov 2024 05:58:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1731679127; cv=pass; d=google.com; s=arc-20240605; b=doBnFnRd4TVhGxHARbE4r0hGnmSY+qajEydOqvzgRV/cKMhga5/j87hUFxPrWMUsyK 2mNhAGirzxgAcR3rMQ6gre3HlPfh5CC4pRyp4myn2TY34OLTOGUj3vf0Je9Jh+4ADDaY Po51Xn14HfWnfRJ50rAU4NWzK0kNzgZLagBaO5kw8yeYna+qeFwWBd/DVjXoSrMYV0/f tPsvIfLBEF8iUULG133ppwynEsiC0IvgDupHKxh05PU90TZJTpEwXOQbH4/RX4+6caHo Dh+iBpMGF1ukrR8iZgbh2XY+P27pcQ8YMnaWt3ZMoRid8B+XgGg6PY/OfhBaExo1z9h6 yfVQ== 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=e8ZXvDHfmhmqrCjVKDNPXg0jJR0eDXNxtQec25EuKHw=; fh=z7IzAuNUj4xniQjFLQG6OBNtAb3m6tXphzNuDelSqyw=; b=QiPnr3TWMo9lVvoQXHHxSbH5m7Au32JFiYqcdyNpREjFTto614erBGzfnLECNrT4Mv VeWwbM/TrGy+ehoiOBGRqqtWVtTOixuiFChzgHdRWPeqV1bta+4Jlmjb7zZJAwSWz5VB uy7s9n0DqpIZieoL2iEKBKNep04S1z0566daq156zIQwrRiXcSLxbaoZFN/5pkUN/KCG xHwF5e6ggAhXtyuUf9Nxl4QSB1bojxY7PH6c7P36gKiBvzG/g2n59dEbKiZ33GhTulTW aDXwylADuqkX9CGo5W9b1b9SlJWIX6DzitmLi57xW93oITQUR56uAZ0aoExJAGXN7+hZ zyeQ==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=AwusMjQ3; spf=pass (google.com: domain of fm-1326448-202411151358422c864110c9832f4363-xjooj7@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1326448-202411151358422c864110c9832f4363-xjOOj7@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=1731679127; x=1732283927; darn=ilbers.de; 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=e8ZXvDHfmhmqrCjVKDNPXg0jJR0eDXNxtQec25EuKHw=; b=m8kTX8sQvHXW91QCMazEgrKqGroIHbpqOAxkuqau2zx1wi/KhxsMKEeg4GVmhMZutG 8pHFsg+6S4jVMTNpp8rLZCLm53LgpdEz9GkwilyvOf+n4d7HFtb6lM5xUo2r+MEymHz/ A6XmjcyMjOefw/US4j6R02QmolKj5BOaJoBo0mUR9z1V8/XtOpYpv+uRVnQrta+VUe1A RNGzHQVOCObplMazu1CAXyiR1Hu4I2goVE3RCH+mdvJGIz8PgBQ6rXS0k06MCkRw6ofu 1dFwiJ5/fnEIpTjn3PBvUk8SGOnQwZIXTzMIyd+v1HvksYdY41fywbjAZWl0sKQGAZ9G of8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731679127; x=1732283927; 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=e8ZXvDHfmhmqrCjVKDNPXg0jJR0eDXNxtQec25EuKHw=; b=Hydu6rQUn8XPCVHUiS2OeG60wHcAF70oXHRNWjMxUfjhlPlYCaSG8rRWNJhZ4t2hC9 TxpSnwejdRV8i7tqPZs6QEoSwAnaqK7uFFmN3kXtu/LlNhUuJl6GM/1BNbx3XoX+I730 rtoSkorxRPl+9nEYOzXySxoSycOLA6zSf88G1gjLErc3Dj0FU7Uv6g7oQtwHQQphtiEE 6VlrtIFQ2JNlw8UhKDlnjmBZ5AAUZMTjxFa7xiGYfkoNGRbn6HYCqCEl6GogmRfFkbj9 0KN4NRW1E3WcNc3DGcIv/CtIuqDrbn5aO9KwngctZXH0CKZ1VG/ero5Oob/iOswz2TVh Cr5A== X-Forwarded-Encrypted: i=2; AJvYcCVcYIYttk6450xu5v2L/TU7bTxNUnTYJmtwmMGKOUyCwp7PNsXyUJ38zlNAkYJ3JGFu7C6p@ilbers.de X-Gm-Message-State: AOJu0YwVwwSZD+QOFQUfzUDz9zW7wXybutqyZIbCYrYx45KqHLw7aYjN caGu+ykMmy+Upre6ueOg3U5HzqxbC0UCkaSpZ5m/wFFGOGsRnUIZ X-Google-Smtp-Source: AGHT+IGfGV/UlCTa2SNXfTyEKnzLHMwFbOwbnwtr4wF5rn+3pCxT3FBO0QfIWG6wlk2XNqkxHTCuHQ== X-Received: by 2002:a05:6902:b0d:b0:e35:df0e:980a with SMTP id 3f1490d57ef6-e38263d5a86mr2155921276.41.1731679127133; Fri, 15 Nov 2024 05:58:47 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6902:1812:b0:e30:84f1:9a02 with SMTP id 3f1490d57ef6-e380e3bf7f1ls186011276.0.-pod-prod-08-us; Fri, 15 Nov 2024 05:58:44 -0800 (PST) X-Received: by 2002:a05:6902:1808:b0:e29:41af:c80 with SMTP id 3f1490d57ef6-e38264e707fmr2107129276.48.1731679124628; Fri, 15 Nov 2024 05:58:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731679124; cv=none; d=google.com; s=arc-20240605; b=FrW1E6aQhbPfY8uZiJmQUYJteQmtZ7dPxGwCDNhk5wp7ZqtjnqK6MUnhdBl7sgV+1c 8QsC0psTmI6CY4eO/p9qSrpPglpSy5jiswgvJHASED7TaWHGDq6oGGl+tCw/64Go4w57 GdlZAa/MW6VyL5ciCrNRWKpAuTATCNU42bs9gxUHlGTY/qm2fhSrzKB4VzxMZ5UY4J2W IzFJc3UkkTsZFppFhevhEJgD2euQOq6+UCPciQmDKG2dlCbry95TpqtxYKCVwTULKEXS ex0VTKxTwPJlyLuJJ8CcIRFTjFmqxGq+bcGXJInml5VwuZFu2Az3cbklrfnH/jyLUHoe 0cew== 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=5GZnc9woXRW3N99NPKVAvibRjdd4CXlvf7q3dt16CnI=; fh=p2NZNdSy+UicSjYUSvZGU+QYmFFPVZWXjWkELGSBm8Q=; b=FPLRq2MUcTuF/oGPUiA+qV0CpfU4hfwQZaNeEHfBrpSUKC5VDbWtH07QKxOxY1Q/Kt RDCYIyzdHVv6S25SyOXnHRdD8k8LBtrKDO931kd5iHKBzhv7xz/VDR3W8JjDEJ1e17Y7 dCqR4hUQUJt68L0wPee/E+Lg0qwVlua5o3hkR1oiJnLd4fEpJ7bNf/TYZTLSFkAfWeio WtoGiWit3mTrhY1CeyLqRK+AyYLT7VynoPV+44x6rEDM2TZ1f45k1eTV+c4dz+Cf4LE9 B/KyVkdY/L3eyAs/kkKjzvxx64m08Qz6RvBBctQysEvoJyQlpb1ifK3vWpATqC4PgvSg 7Gng==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=AwusMjQ3; spf=pass (google.com: domain of fm-1326448-202411151358422c864110c9832f4363-xjooj7@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1326448-202411151358422c864110c9832f4363-xjOOj7@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id 3f1490d57ef6-e382e18f4d2si65179276.0.2024.11.15.05.58.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2024 05:58:44 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1326448-202411151358422c864110c9832f4363-xjooj7@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202411151358422c864110c9832f4363 for ; Fri, 15 Nov 2024 14:58:42 +0100 From: "alexander.heinisch via isar-users" To: isar-users@googlegroups.com Cc: Alexander Heinisch Subject: [PATCH] isar-installer: Fixing supervised image deployment in isar-installer when target device is not empty Date: Fri, 15 Nov 2024 14:58:09 +0100 Message-ID: <20241115135809.599705-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=AwusMjQ3; spf=pass (google.com: domain of fm-1326448-202411151358422c864110c9832f4363-xjooj7@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1326448-202411151358422c864110c9832f4363-xjOOj7@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 Content-Type: text/plain; charset="UTF-8" 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-TUID: IJH0Tj6la/HT From: Alexander Heinisch In supervised mode (!unattended) the check to override non empty targets was combined with the check for unattended mode. Thus, resulting in the wrong condition branch when the user accepted an override (closed dialog with 'Yes') In such case the script was assuming similar behaviour like in unattended mode, thus evaluating the installer_target_overwrite check, which in that case is neither set via kernel cmdline nor via auto.install file. Signed-off-by: Alexander Heinisch --- .../deploy-image/files/usr/bin/deploy-image-wic.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 91c0518b..7f552eee 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 @@ -125,10 +125,11 @@ if ! $installer_unattended; then fi if ! cmp /dev/zero "$installer_target_dev" -n 1M; then - if ! $installer_unattended && \ - ! dialog --defaultno \ - --yesno "WARNING: Target device is not empty! Continue anyway?" 5 60; then - exit 0 + if ! $installer_unattended; then + if ! dialog --defaultno \ + --yesno "WARNING: Target device is not empty! Continue anyway?" 5 60; then + exit 0 + fi else if [ "$installer_target_overwrite" != "OVERWRITE" ]; then echo "Target device is not empty! -> Abort" -- 2.43.0 -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/20241115135809.599705-1-alexander.heinisch%40siemens.com.