From ea7a39d706a2ea33cb9659f53787db1d9c890938 Mon Sep 17 00:00:00 2001 From: Mamoru Sakaue / MwGhennndo Date: Sat, 14 Jul 2018 22:50:32 +0800 Subject: [PATCH] Fixed the previous wrong modification. Changes to be committed: modified: lib/chroot/libfs.sh modified: lib/libmain.sh --- lib/chroot/libfs.sh | 4 ++-- lib/libmain.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/chroot/libfs.sh b/lib/chroot/libfs.sh index 8ebadba..87ad379 100644 --- a/lib/chroot/libfs.sh +++ b/lib/chroot/libfs.sh @@ -263,7 +263,7 @@ fs_mount () systembase=$1 message_echo "Mounting the file systems for builder chroot environment." fs_gen_fstab - if ! mount -F "${DBDIR}/mount_manifest" -a || ! fs_chk_mount "$systembase" + if ! mount -F "${DBDIR}/fstab" -a || ! fs_chk_mount "$systembase" then message_echo "Error: Failed to mount the file systems. Some of them remain unmounted." >&2 exit 1 @@ -343,7 +343,7 @@ fs_unmount () [ -e "${DBDIR}/mount_manifest" ] || return 0 message_echo "Unmounting the file systems for builder chroot." fs_gen_fstab - if ! umount -F "${DBDIR}/mount_manifest" -af || ! fs_chk_unmount "$systembase" + if ! umount -F "${DBDIR}/fstab" -af || ! fs_chk_unmount "$systembase" then message_echo "WARNING: Failed to unmount the file systems. Some of them remain mounted." >&2 return 1 diff --git a/lib/libmain.sh b/lib/libmain.sh index e74db23..19140ae 100644 --- a/lib/libmain.sh +++ b/lib/libmain.sh @@ -12,7 +12,7 @@ main_set_version () MYVERSION=4.0.1 COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1])$' # Template for development versions - MYVERSION=4.0.0+toward_4.0.1_20180714215631 + MYVERSION=4.0.0+toward_4.0.1_20180714225009 COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1]]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$' } -- 2.11.0