• R/O
  • HTTP
  • SSH
  • HTTPS

current: コミット

This is for active development.
New funtionalities are to be added actively.


コミットメタ情報

リビジョン717d2038525ad27c73fcb10df9e336c92a3d18cd (tree)
日時2018-07-18 00:23:42
作者Mamoru Sakaue / MwGhennndo <glmwghennndo@user...>
コミッターMamoru Sakaue / MwGhennndo

ログメッセージ

Fixed a problem that portsreinstall-chroot aborted by error when unmount/clean command is executed after unmounting once.

Changes to be committed:

modified: lib/chroot/libfs.sh
modified: lib/libmain.sh

変更サマリ

差分

--- a/lib/chroot/libfs.sh
+++ b/lib/chroot/libfs.sh
@@ -343,7 +343,8 @@ fs_unmount ()
343343 [ -e "${DBDIR}/mount_manifest" ] || return 0
344344 message_echo "Unmounting the file systems for builder chroot."
345345 fs_gen_fstab
346- if ! umount -F "${DBDIR}/fstab" -af || ! fs_chk_unmount "$systembase"
346+ umount -F "${DBDIR}/fstab" -af 2> /dev/null || :
347+ if ! fs_chk_unmount "$systembase"
347348 then
348349 message_echo "WARNING: Failed to unmount the file systems. Some of them remain mounted." >&2
349350 return 1
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
1212 MYVERSION=4.0.1
1313 COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1])$'
1414 # Template for development versions
15- MYVERSION=4.0.0+toward_4.0.1_20180717230443
15+ MYVERSION=4.0.0+toward_4.0.1_20180717232318
1616 COMPATIBLE_VERSIONS='^(4\.[0]\.[0-1]]|4\.[0]\.[0]+(|\+toward_4\.[0]\.[1]+_[0-9]+))$'
1717 }
1818
旧リポジトリブラウザで表示