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; Thu, 21 Nov 2024 07:50:33 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4AL6oWDf011075 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 21 Nov 2024 07:50:32 +0100 Received: by mail-wm1-f59.google.com with SMTP id 5b1f17b1804b1-4317391101asf4185585e9.2 for ; Wed, 20 Nov 2024 22:50:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1732171827; cv=pass; d=google.com; s=arc-20240605; b=AKymXHEPakjWTiAlldKXSkE+EsBRml3Rq4HqXC2xT6ahmtaPnKEA5+CPk/9jqAXsUE FEOq/+T6Zz1Tw7e3snOWrN7RUFqRen0XrN4BOHX/ooKgwB0bmQxFzc/2Uuj/vcS6x/7w V6MPrcZyo+lAUjSK/j53doT8dngDeuuAWqVdSgibBQOzXaqFtjoz8pRea+19Udcw7cz+ HQICkWXGlFH04Ww7YgRDksOBFs6RS/P6SlCrwAN2MK5V+tP1GA9XyYlRs1f3wxe0/9cE i3Bg2xjfcML8ONa5gxjsNLWoYdOn74xt/4xsF1EEyLWLr4qUdLgWge14A1LMczHA2nvA kj1Q== 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:mime-version:user-agent :content-transfer-encoding:references:in-reply-to:date:to:from :subject:message-id:sender:dkim-signature; bh=PIaWi/kI8URH9zfvWIYxMv7SJFDEJ28ntCtx9Nj2M2M=; fh=a99vL27SKg6op3GPwCQpXKm/OsGCnh/SLZa2IUXa5gM=; b=D0ea5d5azr2sK7foypDvK5sML9FCPK2MrKJTE4rNhUx5tsa87jCfyRUauvsYIhR3wm TpI1Abb3xpwJ0ZXc+DGoXCUGFi6HShMX50363527AfKxVUSOA7fuMsJJjdy7rDFI+NHw JMrIlyFJmcBGw5S3IKILAhKyuSPMmpm1NCgsSMSt4ei0Bg6jDaPEnqCnU2NE5GSwqNEB g8Me61vPScmYMKYGBXcHYYC5WWuq3kaVZHDYtAhs2P6PU5KvRY1ku5vMV+Agoeu4eoVt rzfWPGWCG9cGFgYqGcgku/SwUMqZuAq/0NibWQySUTPU74J9TiaC0e07rp234FlZV8LW Cmtg==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1732171827; x=1732776627; darn=ilbers.de; 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:user-agent:content-transfer-encoding :references:in-reply-to:date:to:from:subject:message-id:sender:from :to:cc:subject:date:message-id:reply-to; bh=PIaWi/kI8URH9zfvWIYxMv7SJFDEJ28ntCtx9Nj2M2M=; b=t2F1EUOhiEvcRlfTbU6206aSv0XErmmqCcLHLfeaquQsIDVmRAVZM2OtYGOpL1Y05Y 96+QgeKaqdUqp0pOSBU9md18yBoJXekQJa9qVZHckGC6PJVfLB97Qx+Oq6ljP83BuZdH Ng6XsWdCoisM+FYotZjhPwFPF7zFyXN7jskSM7+OybX0DBMbYtPswJBhvW6HL85i4n19 Nwc7p77noQqqPVIsLwreYo18pht/Cy5bSUQw72N3WKBRwmlojwgrKmq13ca56MMHMPxK WgFPqsAd0XoHSnChgwfGB/mBoFmHlXU38OniHIKDYlsB43KIQp/jxwE7VQDPypn0nV1N APSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732171827; x=1732776627; 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 :user-agent:content-transfer-encoding:references:in-reply-to:date:to :from:subject:message-id:x-beenthere:x-gm-message-state:sender:from :to:cc:subject:date:message-id:reply-to; bh=PIaWi/kI8URH9zfvWIYxMv7SJFDEJ28ntCtx9Nj2M2M=; b=awSbwXLiXJQnURfLIWN0QWfa2t4HnHYkCQpDWidWkxxTi3oHR7xwTyJZRK2C7RkDdV 4mpZbpHbik794vP+6h5O4wGnTZqBO2Vp2OF0QU280veOGlNvinFkbXyqJpBmx/8AYlHL EGm8HB2en5+2hbDANvO+ciIjnZx82TM7RDoSWYHflUwyYCdFGSzuYLTFyyEgK/OQHep0 lHiSlOV3NG2kSa8S/N0JlNjvqKr74E3UaN76J8ob6Ak/b9l3co5KqOnXYEMEQn+AULM8 hd7yJ4noTekC4cokVVWmQQ0j2mqEmLBi97ISLowUSpkOmpyyDENIW3dy/f1mvW2kc1ZE /eKA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWrYzVRbqReSETbnleL6HOJTfWKr731LoRTKgJqQKpEtWMhY5p5Aqnun2Tnhe3zz1PZV7ly@ilbers.de X-Gm-Message-State: AOJu0YwGThGEplNVq+1RrHlxscllf0moQ7lRxYDaaIlK5+RrxZKoIonQ bU0H78fnQP2KXf0tElIheDo9Vd5aRFd0EQStGR2ceRsXSI2DFMUS X-Google-Smtp-Source: AGHT+IFlHbky4b2o7Ih9UXkTFaqNskNm4GWhLOZFHUNTTfq1neiHBcIcX2iLToA8xR1Xvs3j7APT9Q== X-Received: by 2002:a7b:cde1:0:b0:431:5ba1:a513 with SMTP id 5b1f17b1804b1-433c546c747mr26156675e9.10.1732171826420; Wed, 20 Nov 2024 22:50:26 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:310c:b0:431:1413:6f32 with SMTP id 5b1f17b1804b1-433c5df6f2els2836485e9.1.-pod-prod-04-eu; Wed, 20 Nov 2024 22:50:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVI22rtzKl3tEBBP326E7D4amWxVcMyRXGHjisnxAiSIbQJRX9ijkmr8pRRC47n0FGzyU21++Fkzzuv@googlegroups.com X-Received: by 2002:a05:6000:184e:b0:37d:46fa:d1d3 with SMTP id ffacd0b85a97d-38254b00e93mr4409869f8f.34.1732171824207; Wed, 20 Nov 2024 22:50:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732171824; cv=none; d=google.com; s=arc-20240605; b=kBJVWCsxmVmhzH/KNxw5yTbfBhE22WLHzPmVZS1dG3rYpJWfA/ca3vCFMgaym3BwhH FSBExddTeVY5+DtM6QOL6tMcSWYgIJD+iY+ZKGr3o5mlDqL043cny5b+Ruyh3D41cqEh r2qeKzbTvKpYnyGjIM4J44ajm2DDOM/sHfBRB8aKYJQRoBLpRFHJYQ/4jB0plvUwqlnk CtcSLhvz0IK+nIGfxKDLiWQ6CBH0s+hbhNGS6SuO3Vh35Rtv1l4I5pXJArkwbIwsuFQK UY4Vj2035A1S6i+4okLJWHJ0nKoorMq6i8MD4qxmelwgGJiFzaZm5CHSbGtDCHLZi9K2 xdUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id; bh=8Z4PBtAM2aBTraT1I7tG/FOG2tscv5sQ0X1Q7N497Ho=; fh=BSPqGArB6tTDqZiGP6bWbwR/OT+7QmHvthjvMivxaWQ=; b=BV8EfHhBrVgAFEIPyfBZGGYiFzdo5wmtAvU8u35LaO9mYkDxWe6ivV9Em1NZyworbv Re3iBQrikokwujgqTznL437cKb9Tyjsh+hI5JOvZ+Aqfr7cjZYlK13Gbbs3STMwSGJsu IGvcfp0B4i9y7bfNpbrnXXbiSRgz9yBOelCE7A5wP+LtqVWi9mgLUd1GRfvO3VIYvoUV 2bS3ZOZIaIVJz+mGKv3DWwjcdDbNuk0ZT4edEb8awQrDEUrVJTyyW+uxdaIcHi2eF3I1 jaEGJ/SLirx6QezVMRHpMMbva3a2rpTlgw4nNr2qNQgzR6CXP1soNWLgB5pzXTvvBySb W2xw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id ffacd0b85a97d-3825493e450si63098f8f.6.2024.11.20.22.50.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Nov 2024 22:50:24 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 4AL6oLMS011062 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 21 Nov 2024 07:50:23 +0100 Message-ID: <09cf697b726d18420efbc67ad667e7ae84ec0aaf.camel@ilbers.de> Subject: Re: [PATCH] isar-installer: Fixing supervised image deployment in isar-installer when target device is not empty From: Uladzimir Bely To: alexander.heinisch@siemens.com, isar-users@googlegroups.com Date: Thu, 21 Nov 2024 09:50:21 +0300 In-Reply-To: <20241115135809.599705-1-alexander.heinisch@siemens.com> References: <20241115135809.599705-1-alexander.heinisch@siemens.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.54.1 (by Flathub.org) MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, 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-Original-Sender: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@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-TUID: iCMYkCBD9Ah/ On Fri, 2024-11-15 at 14:58 +0100, alexander.heinisch via isar-users wrote: > From: Alexander Heinisch >=20 > 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=C2=A0 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. >=20 > Signed-off-by: Alexander Heinisch > --- > =C2=A0.../deploy-image/files/usr/bin/deploy-image-wic.sh=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 | 9 +++++-- > -- > =C2=A01 file changed, 5 insertions(+), 4 deletions(-) >=20 > 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 > =C2=A0fi > =C2=A0 > =C2=A0if ! cmp /dev/zero "$installer_target_dev" -n 1M; then > -=C2=A0=C2=A0=C2=A0 if ! $installer_unattended && \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ! dialog --defaultno \ > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 --yesno "WARNING: Target device is not empty! > Continue anyway?" 5 60; then > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 exit 0 > +=C2=A0=C2=A0=C2=A0 if ! $installer_unattended; then > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if ! dialog --defaultno \ > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --yesno "WARNING: Target device = is not empty! > Continue anyway?" 5 60; then > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 exit = 0 > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi > =C2=A0=C2=A0=C2=A0=C2=A0 else > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if [ "$installer_target_= overwrite" !=3D "OVERWRITE" ]; then > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = echo "Target device is not empty! -> Abort" > --=20 > 2.43.0 >=20 Applied to next, thanks. --=20 Best regards, Uladzimir. --=20 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 e= mail to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/= 09cf697b726d18420efbc67ad667e7ae84ec0aaf.camel%40ilbers.de.