Fixed a bug that portsreinstall-chroot failed to mount when some shared directories...

 Changes to be committed:
	modified:   lib/chroot/libfs.sh
	modified:   lib/libcommand_pkgs.sh
	modified:   lib/libmain.sh

diff --git a/lib/chroot/libfs.sh b/lib/chroot/libfs.sh
index 0198b02..8354d0c 100644 (file)
--- a/lib/chroot/libfs.sh
+++ b/lib/chroot/libfs.sh
@@ -187,6 +187,7 @@ fs_build_chroot ()
                                                        if  ! grep -qFx "$mpath" "${TMPDIR}/fs_build_chroot:shared_dirs:added"
                                                        then
                                                                echo "$mpath" >> ${TMPDIR}/fs_build_chroot:shared_dirs:added
+                                                               mkdir -p "/$mpath"
                                                                mp_share=`realpath "/$mpath"`
                                                                printf '%s\t%s\t%s\t%s\n' nullfs "$mp_share" "$mpath" rw >> ${DBDIR}/mount_manifest.tmp
                                                        fi
@@ -223,6 +224,7 @@ fs_build_chroot ()
                done < ${TMPDIR}/fs_build_chroot:directories
                grep -Ev -f "${TMPDIR}/fs_build_chroot:shared_dirs:added" "${DBDIR}/shared_dirs.lst" | while read shared_dir
                do
+                       mkdir -p "$shared_dir"
                        mp_share=`realpath "$shared_dir"`
                        printf '%s\t%s\t%s\t%s\n' nullfs "$mp_share" "/$shared_dir" rw >> ${DBDIR}/mount_manifest.tmp
                done

diff --git a/lib/libcommand_pkgs.sh b/lib/libcommand_pkgs.sh
index 76ba247..e1b0bd4 100644 (file)
--- a/lib/libcommand_pkgs.sh
+++ b/lib/libcommand_pkgs.sh
@@ -346,7 +346,9 @@ command_pkgs_packupgrade_create__manifest_reinst ()
        {
                local PACKAGESDIR
                message_section_title "Creating manifest of (re)installation and package archives..."
-               PACKAGESDIR=`realpath "${PACKAGES}/${PKGREPOSITORYSUBDIR}"`
+               PACKAGESDIR=${PACKAGES}/${PKGREPOSITORYSUBDIR}
+               mkdir -p "${PACKAGESDIR}"
+               PACKAGESDIR=`realpath "${PACKAGESDIR}"`
                program_exec_restartable_loop_operation command_packupgrade_pack
                cp "${DBDIR}/stage.loop_list/ports_to_delete" "${DBDIR}/stage.loop_list/command_packupgrade_delete"
                message_echo

diff --git a/lib/libmain.sh b/lib/libmain.sh
index 75a9d5a..369d113 100644 (file)
--- a/lib/libmain.sh
+++ b/lib/libmain.sh
@@ -12,7 +12,7 @@ main_set_version ()
        MYVERSION=4.1.0
        COMPATIBLE_VERSIONS='^(4\.[1]\.[0-9])$'
        # Template for development versions
-       MYVERSION=4.0.0+toward_4.1.0_20180910122552
+       MYVERSION=4.0.0+toward_4.1.0_20180910125713
        COMPATIBLE_VERSIONS='^(4\.[0-1]\.[0-9]]|4\.[0]\.[0]+(|\+toward_4\.[0-1]\.[0-9]+_[0-9]+))$'
 }