From afae3d71f8fb3f7261aefce95d8b19a6e86bba3d Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Thu, 21 Aug 2014 11:37:48 -0400 Subject: chroot: Skip empty fstab lines --- (limited to 'lib') diff --git a/lib/chroot.sh b/lib/chroot.sh index de3b2f5..a4033fb 100644 --- a/lib/chroot.sh +++ b/lib/chroot.sh @@ -36,6 +36,7 @@ chroot_mount() plat="$(cat "${root}/etc/proteanos_plat")" while read fs dir fstype options; do + [ "x${dir}" = 'x' ] && continue mount -t "${fstype}" -o "${options}" "${fs}" "${root}/${dir}" done <<-EOF $(profile_get_fstab "${arch}" "${plat}") @@ -56,6 +57,7 @@ chroot_umount() plat="$(cat "${root}/etc/proteanos_plat")" while read fs dir fstype options; do + [ "x${dir}" = 'x' ] && continue # umount sometimes complains that the /dev file system is busy. # Here's a kludge to try to handle that. We better make sure # bind mounts get unmounted; otherwise, `rm -Rf ${root}` can be -- cgit v0.9.1