From patchwork Tue Jul 2 13:38:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3659 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 02 Jul 2024 15:51:53 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f59.google.com (mail-wr1-f59.google.com [209.85.221.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 462Dprqw030566 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 2 Jul 2024 15:51:53 +0200 Received: by mail-wr1-f59.google.com with SMTP id ffacd0b85a97d-3678e523e32sf254352f8f.1 for ; Tue, 02 Jul 2024 06:51:53 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719928308; cv=pass; d=google.com; s=arc-20160816; b=i6HDlwSgvmXpaoLY3aDFIR89xFdNOPYfK9JBeed9Q4+W7v/3i2WAetdI09GREzB1rL FNx/0/XDYPAuvVLZSYBE6sQAiyrzleyfEJ1myiC0eGS4/Fbu32f/d6Oyh9aSUidz6C2j 7VicKAFU8qWQ8r77kSBxNVViGfhT/UlKO3b2Qj8/s8vpW8pBfO2WsSl5Ch23DX5olGzl fy1y64mjEYFv9nYAhLtBGsYw1SHzucd156IAA9kgUxQZfKx+3ctH8+tseoqQ76IPHIho MARvU/MpG4h+b5PvR3nH64LxQ7M5Qdz4/quAi8jcrcvqGps3/gxAh8Pt3P4T0FeYn3ZC wXtg== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tN0RNLCv2ltmXOZ2GCQ9lS9z9HiElzGaz5c176M/xdA=; fh=k4DpMODiYAXSKB6zxaaTkU/PNgZXdnJl8XbQpuTHEO4=; b=i0Kf1mIp8EyUaEpbWPYhUGujV9ODAnJtrO+BWtRnjaokkSlGqGnW47zIshYJ/UAJXD WH2J+3CkbsojS6QRo1QF4v2hzxA5nmUW5xnMYipSnKstyvpqp3/pZjtTJtoAbvGY3HPm d3xogbkn0f9BCrEPLk5t6Wz7L6FwwHEaOYwRWvo5ILuJW85Xh0cCoDhRaNNoplf15DN9 czWDBvU32iVoeC2F+xWY9fVmMQYPMRO6cPwnhHexqW81frf51mRvgCTw04R+09c0IqAC /B5ood+W81kqGLtop3ckDMWRrgmkw/cbDGOzb/pUXpxanyFOtRa6ZcbB6IbF0iUjWOpN SUnA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=aAzhcFrw; spf=pass (google.com: domain of fm-294854-20240702133832bc19c5c422e84213ba-81kgxr@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832bc19c5c422e84213ba-81kgXr@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=1719928308; x=1720533108; 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:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=tN0RNLCv2ltmXOZ2GCQ9lS9z9HiElzGaz5c176M/xdA=; b=NQYwtbhN7NsoR0f7KgF0ZN3RBaeYtuPHysmfDBPEwkOhfws21uFKUfH00iUB1Z7prr C2fycJ7PfZXmNMGL2nHjgck88A8QlO8vtWVYSNHWoV47orn4KHXnPEBKlqZkH8kVCB6W 2cVbmFxJIu15G9wGc1B5yPV4k9g94yAtbTP4HJ5bDO8UfXdyoKoyL24uH93F+kQcSJiO UAdE042XmDSxcTEpQwDPCPNHwgflm7HtJeRbyTPkqdZ6W4kfAfRyquLY29ZjYfyDGMDZ DtvkUpy5OOhNmZSGnQRBGemnHZd1YIgSa+ESjGH6UM4ILCwTUSBrPPJnFJgOdZ2bpNNR tfCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719928308; x=1720533108; 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:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=tN0RNLCv2ltmXOZ2GCQ9lS9z9HiElzGaz5c176M/xdA=; b=rUsm8LBuw2QLUDiqSSs5mZyDU5NJJ1/uUCHW89ORs/S9O84QNLm1GAVetD0rlKDTRB ZpS8VhNRbj12kPVIJA1CccsV77TiGTVszW0TirW6WHLhOfTZFYBnDAs8+Dy9ToLbXJo8 RS65A/n6qBsc/GELhkbFaYJtlZBy3DZ9f0tyeirwc1XzE6+ccEsLjvGTpt9+gGrIQkzq lGAteTsWPuGLzZ2gdnPhalOXUZPrwpEizpd/m5ukc1aOprABMAZKLA6BlB3OEQfHQGUm GMkOx3I+/8szhm0jn8zWSU+qL0IF8+RhbUoVjM0XHpUgH82tvDdTFN5Bd7z6QDuQG/DH xshw== X-Forwarded-Encrypted: i=2; AJvYcCXVvDDQlXHS4vso9J4d/FLeUTweS6h5PzsePzlCGT5Er4GvCjlj23RBsEc9SP2B6ct67RTW/jIV1tfuXtxcoryFc77Thf8= X-Gm-Message-State: AOJu0YzPhXs5LdYOzSEKy3kJFhojaUIT8Tjssw/c2ul/ge1Bu+vMFKvr kcLP86zlwI/LdZTNCzgbbzYFcBzQBoH64+VDUNPyBvVOqJa7L8o4 X-Google-Smtp-Source: AGHT+IE1Vm6KM96LfPbYsJ69sLxngk5jVE/cTf6ss39o4Z7gDZBqJGmb4yFmAnczyPX3yxmb053qLA== X-Received: by 2002:a05:651c:549:b0:2ec:1e6e:13f9 with SMTP id 38308e7fff4ca-2ee5e707c78mr70803301fa.52.1719927515228; Tue, 02 Jul 2024 06:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1d05:b0:423:7d5:b519 with SMTP id 5b1f17b1804b1-4256bafed87ls24337085e9.0.-pod-prod-05-eu; Tue, 02 Jul 2024 06:38:33 -0700 (PDT) X-Received: by 2002:a05:600c:47c7:b0:425:5f73:e2e1 with SMTP id 5b1f17b1804b1-4257a00c088mr75237905e9.22.1719927512947; Tue, 02 Jul 2024 06:38:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719927512; cv=none; d=google.com; s=arc-20160816; b=aMmOaGp7sw3cTN0Lik01I02haxUeU2jqrhJimTOLY0EkhUxRKiJ9vbzlXvTtjw3SWN kXLhdXt7vIiChOirEl/JHC+CstGtWXI6Oz7qmKpczu5y3pvMdQtoBLq7m86xHxsTtn5a QUUqxWcuEYIY0BNQQSzsjOHwiJYiNpcR+pAZJyFcpq96YZgWFGABoCXIcjGbMFD7/v4l mBNzQB/8F1BYUvCkVeiUhUzyrk/HAseSz+BREz5+q3ZqgDum14DIsszhBTU59AKQMMa7 Y447ThYQGB8b0OZ9KQWuMYfSR+d1L2Y0Y78XqH7npU2zQSUuFZhyjT6+ehBRq106ErLL vGPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=VFjNekDTmLYK4Zex6YatbGGInn7rDQtaV/vU4Tb+JcA=; fh=TWGwN84gUgHIe5O4CbyH9KISyeWwGbvUX7cnJPxVD70=; b=zuKS0r/oBANab3dDGGt6RR4/gi1Zo4iKn7oKfKqDbpV+QXm6404TjDatG9maPwobDV r4kRkUfce90/ypNrJV7fJWX7iDJEPz6V7xcM/NrRVfx2dOKu4WCf6p9ljbOYIKIFkbTU AIQHKtRTviAAatJqGj/QR5YRxMxKpkAl5QMRMkMYT9lOeuH7N9aUUzZOEg7uCzQ/vqhK O+9F6USpnDX1lLpx0/YRpy9iZ3w1WE4jSEV4XU8uTES9Rt0ZQ4+sPGRqkn6yTbs20B7f zw4NWlnPW6SPc8s8uHju11vthIRYRhQ0VHI6VCu86SRnBMqa+lBZkjuoA+h4q+5Ada3j zIPQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=aAzhcFrw; spf=pass (google.com: domain of fm-294854-20240702133832bc19c5c422e84213ba-81kgxr@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832bc19c5c422e84213ba-81kgXr@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 5b1f17b1804b1-4256b090706si2040335e9.1.2024.07.02.06.38.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jul 2024 06:38:32 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20240702133832bc19c5c422e84213ba-81kgxr@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 20240702133832bc19c5c422e84213ba for ; Tue, 02 Jul 2024 15:38:32 +0200 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Quirin Gylstorff Subject: [PATCH 04/17] meta-isar: deploy-image: Drop umount attempt after installation Date: Tue, 2 Jul 2024 15:38:18 +0200 Message-ID: <62731074b0405eb110b1c2bdc1543d2769ccdac7.1719927511.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=aAzhcFrw; spf=pass (google.com: domain of fm-294854-20240702133832bc19c5c422e84213ba-81kgxr@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240702133832bc19c5c422e84213ba-81kgXr@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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_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?= From: Jan Kiszka Under systemd, this fails because /install is still busy. In that setup, systemd will take care of properly unmounting this partition anyway on reboot. In other setups, the caller should take care. This also obsoletes the "set -e" because no commands are left that can produce errors and are not checked explicitly. Signed-off-by: Jan Kiszka --- .../recipes-installer/deploy-image/files/deploy-image-wic.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh index 12c1eea2..9a1fa651 100644 --- a/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh +++ b/meta-isar/recipes-installer/deploy-image/files/deploy-image-wic.sh @@ -90,7 +90,6 @@ fi TARGET_DEVICE_SIZE=$(lsblk --nodeps --noheadings -o SIZE /dev/"$TARGET_DEVICE") dialog --msgbox "Start installing '$DISK_IMAGE' to '$TARGET_DEVICE'(Size: '$TARGET_DEVICE_SIZE' )." 7 60 -set -e bmap_options="" if [ -z "$DISK_BMAP" ]; then bmap_options="--nobmap" @@ -100,9 +99,5 @@ if ! bmaptool copy "${bmap_options}" "$DISK_IMAGE" "/dev/${TARGET_DEVICE}"; then exit 1 fi -# we need to umount before reboot to avoid -# data corruption due to the use of vfat. -umount "$installdata" -sync dialog --title "Reboot" --msgbox "Installation is successful. System will be rebooted. Please remove the USB stick." 7 60 exit 0