From: Patrick Schleizer <adrelanos@whonix.org>
Date: Wed, 25 Oct 2023 16:32:47 +0000 (-0400)
Subject: remove obsolete `|| return 1`
X-Git-Tag: v0.106~7^2~16
X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=commitdiff_plain;h=53ed3b4e9a30baacaba084299f6dd5d05e1272d2

remove obsolete `|| return 1`

because these are now covered by the new error handling method
---

diff --git a/chroot-script b/chroot-script
index 71335a5..95f3ef6 100755
--- a/chroot-script
+++ b/chroot-script
@@ -619,7 +619,7 @@ efi_setup() {
 
   mkdir -p /boot/efi
   echo "Mounting $EFI on /boot/efi"
-  mount "$EFI" /boot/efi || return 1
+  mount "$EFI" /boot/efi
 
   # if efivarfs kernel module is loaded, but efivars isn't,
   # then we need to mount efivarfs for efibootmgr usage
@@ -629,7 +629,7 @@ efi_setup() {
   fi
 
   echo "Invoking efibootmgr"
-  efibootmgr || return 1
+  efibootmgr
 }
 
 # grub configuration/installation {{{
@@ -676,7 +676,7 @@ grub_install() {
     return 0
   fi
 
-  efi_setup || return 1
+  efi_setup
 
   if [ -n "$EFI" ] ; then
     GRUB_PACKAGE=grub-efi-amd64