projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/pr/259'
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
5277240
..
fafe1bf
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-11,16
+11,16
@@
# shellcheck disable=SC2317 # shellcheck has trouble understanding the code flow in this file
# error_handler {{{
# shellcheck disable=SC2317 # shellcheck has trouble understanding the code flow in this file
# error_handler {{{
-if [ "$REPORT_TRAP_ERR" = "yes" ] || [ "$FAIL_TRAP_ERR" = "yes" ]; then
- set -e
- set -E
- set -o pipefail
- trap "error_handler" ERR
-fi
+set -e
+set -E
+set -o pipefail
+trap "error_handler" ERR
# }}}
# }}}
+bash -n /etc/debootstrap/config
# shellcheck source=config
. /etc/debootstrap/config || exit 1
# shellcheck source=config
. /etc/debootstrap/config || exit 1
+bash -n /etc/debootstrap/variables
# shellcheck source=tests/shellcheck-stub-debootstrap-variables
. /etc/debootstrap/variables || exit 1
# shellcheck source=tests/shellcheck-stub-debootstrap-variables
. /etc/debootstrap/variables || exit 1
@@
-104,8
+104,8
@@
chrootmirror() {
# add security.debian.org:
case "$RELEASE" in
# add security.debian.org:
case "$RELEASE" in
- unstable|sid) ;; # no security pool available
- jessie|
stretch|
buster)
+ unstable|sid
|stretch
) ;; # no security pool available
+ jessie|buster)
echo "Adding security.debian.org to sources.list."
echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
;;
echo "Adding security.debian.org to sources.list."
echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
;;
@@
-479,7
+479,7
@@
EOF
local rootfs_mount_options=""
if [ -z "${FILESYSTEM}" ] ; then
local rootfs_mount_options=""
if [ -z "${FILESYSTEM}" ] ; then
- FILESYSTEM="$(blkid -o value -s TYPE /dev/disk/by-uuid/"${TARGET_UUID}")"
+ FILESYSTEM="$(blkid -o value -s TYPE /dev/disk/by-uuid/"${TARGET_UUID}")"
|| true
fi
case "${FILESYSTEM}" in
fi
case "${FILESYSTEM}" in
@@
-495,8
+495,8
@@
EOF
fi
if [ -n "$EFI" ] ; then
fi
if [ -n "$EFI" ] ; then
- # shellcheck disable=SC2086
- echo "UUID=$
(blkid -o value -s UUID $EFI)
/boot/efi vfat umask=0077 0 1" >> /etc/fstab
+ UUID_EFI="$(blkid -o value -s UUID "$EFI")"
+ echo "UUID=$
UUID_EFI
/boot/efi vfat umask=0077 0 1" >> /etc/fstab
fi
cat >> /etc/fstab << EOF
fi
cat >> /etc/fstab << EOF
@@
-621,7
+621,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
@@
-631,7
+631,7
@@
efi_setup() {
fi
echo "Invoking efibootmgr"
fi
echo "Invoking efibootmgr"
- efibootmgr
|| return 1
+ efibootmgr
}
# grub configuration/installation {{{
}
# grub configuration/installation {{{
@@
-678,7
+678,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
@@
-805,8
+805,9
@@
trap signal_handler HUP INT QUIT TERM
initrd grub_install passwords \
custom_scripts upgrade_system remove_apt_cache services \
remove_chrootmirror; do
initrd grub_install passwords \
custom_scripts upgrade_system remove_apt_cache services \
remove_chrootmirror; do
- if stage $i ; then
- $i && stage $i 'done' || exit 1
+ if stage "$i" ; then
+ "$i"
+ stage "$i" 'done'
fi
done
# always execute the finalize stage:
fi
done
# always execute the finalize stage: