projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove obsolete `|| return 1`
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
71335a5
..
95f3ef6
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-619,7
+619,7
@@
efi_setup() {
mkdir -p /boot/efi
echo "Mounting $EFI on /boot/efi"
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
# 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"
fi
echo "Invoking efibootmgr"
- efibootmgr
|| return 1
+ efibootmgr
}
# grub configuration/installation {{{
}
# grub configuration/installation {{{
@@
-676,7
+676,7
@@
grub_install() {
return 0
fi
return 0
fi
- efi_setup
|| return 1
+ efi_setup
if [ -n "$EFI" ] ; then
GRUB_PACKAGE=grub-efi-amd64
if [ -n "$EFI" ] ; then
GRUB_PACKAGE=grub-efi-amd64