From 5c6898f143bf461abb709df21829ceca2e6cfa75 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 31 Jul 2020 09:53:52 +0300 Subject: [PATCH] kiss-chroot: Allow some things to fail. --- contrib/kiss-chroot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/kiss-chroot b/contrib/kiss-chroot index fef7fbe..0f2d2e3 100755 --- a/contrib/kiss-chroot +++ b/contrib/kiss-chroot @@ -45,16 +45,16 @@ mounted() { trap 'clean "$1"' EXIT INT log Mounting /dev, /proc and /sys from host; { - mounted "$1/dev" || mount -o bind /dev "$1/dev" - mounted "$1/proc" || mount -t proc proc "$1/proc" - mounted "$1/sys" || mount -t sysfs sys "$1/sys" + mounted "$1/dev" || mount -o bind /dev "$1/dev" ||: + mounted "$1/proc" || mount -t proc proc "$1/proc" ||: + mounted "$1/sys" || mount -t sysfs sys "$1/sys" ||: mounted "$1/sys/firmware/efi/efivars" || mount -t efivarfs efivarfs "$1/sys/firmware/efi/efivars" 2>/dev/null ||: } log Copying /etc/resolv.conf from host; { - cp -f /etc/resolv.conf "$1/etc" + cp -f /etc/resolv.conf "$1/etc" ||: } log Entering chroot; {