From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7387032429685374976 X-Received: by 2002:a05:600c:181b:b0:424:c837:f54b with SMTP id 5b1f17b1804b1-4257a0270f4mr66586165e9.38.1719927515356; 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-Google-Smtp-Source: AGHT+IHzto1Q0LWrtLTvKhJNsMoJo3HZ186qdF8BpKWhXqdj0xam2U0Izy3xZvtfi5kRMj9GXbnj 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 Return-Path: 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; 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 Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20240702133832bc19c5c422e84213ba for ; Tue, 02 Jul 2024 15:38:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=VFjNekDTmLYK4Zex6YatbGGInn7rDQtaV/vU4Tb+JcA=; b=aAzhcFrwVKskzLn5/bA5YWMYuWmH3+w9X7j2hXOGMHRqQrSE17PfTMmn4O7+J9KJk/6WEc a1ye/LIZwLLdb8PWo/0p3kSF4PZIanSYBGV1N9piykFW0eljZt9zPHReoXJVuEWshR4KOLkg sF72YCYiF8rrxilwjTNHMsMGMOy6Q=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: 1l7oYXPygp1w 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 -- 2.43.0