Changeset 10407 in hybrid for branches

Timestamp:

Apr 9, 2012, 10:34:31 AM (13 years ago)

Author:

rick

Message:

Nice hack to publish the /var/db/pkg into /usr/local/var/db/pkg. Allowing it to store on permanent location.

Related-To: nodefactory#109

Location:

branches/releng-9.0/nanobsd

Files:

• cfg/nanobsd.wleiden (modified) (2 diffs)
• files/etc/csh.cshrc (deleted)
• files/etc/profile (deleted)
• files/usr/local/tmp (deleted)
• files/usr/local/var (deleted)
• tools (modified) (1 prop)
• tools/image-build.sh (modified) (1 diff)

branches/releng-9.0/nanobsd/cfg/nanobsd.wleiden

@@ -258 +258 @@
 
 
+# pkgdb should live on persistent storage only
+cust_alternate_pkg_db () (
+        mkdir -p ${NANO_WORLDDIR}/usr/local/var/db/pkg ${NANO_WORLDDIR}/usr/local/tmp
+        touch ${NANO_WORLDDIR}/usr/local/tmp/.hack-to-avoid-pruning-directory
+        # sh profile
+        ( echo 'PKG_DBDIR=/usr/local/var/db/pkg; export PKG_DBDIR'; \
+        echo 'PKG_TMPDIR=/usr/local/tmp; export PKG_TMPDIR' ) >> ${NANO_WORLDDIR}/etc/profile
+        # csh profile
+        ( echo 'setenv PKG_DBDIR /usr/local/var/db/pkg'; \
+        echo 'setenv PKG_TMPDIR /usr/local/tmp' ) >> ${NANO_WORLDDIR}/etc/csh.cshrc
+)
+
+# Directly stolen from /usr/src/tools/tools/nanobsd/nanobsd.sh, and make sure
+# to source /etc/profile in chroot to get PKG_* included, for alternate installs
+cust_pkg () (
+
+        # If the package directory doesn't exist, we're done.
+        if [ ! -d ${NANO_PACKAGE_DIR} ]; then
+                echo "DONE 0 packages"
+                return 0
+        fi
+
+        # Copy packages into chroot
+        mkdir -p ${NANO_WORLDDIR}/Pkg
+        (
+                cd ${NANO_PACKAGE_DIR}
+                find ${NANO_PACKAGE_LIST} -print |
+                    cpio -Ldumpv ${NANO_WORLDDIR}/Pkg
+        )
+
+        # Count & report how many we have to install
+        todo=`ls ${NANO_WORLDDIR}/Pkg | wc -l`
+        echo "=== TODO: $todo"
+        ls ${NANO_WORLDDIR}/Pkg
+        echo "==="
+        NANO_PKG_DBDIR=${NANO_WORLDDIR}/`chroot ${NANO_WORLDDIR} sh -c '. /etc/profile; echo ${PKG_DBDIR:-/var/db/pkg}'`
+        while true
+        do
+                # Record how many we have now
+                have=`ls ${NANO_PKG_DBDIR} | wc -l`
+
+                # Attempt to install more packages
+                # ...but no more than 200 at a time due to pkg_add's internal
+                # limitations.
+                chroot ${NANO_WORLDDIR} sh -c \
+                        '. /etc/profile; ls Pkg/*tbz | xargs -n 200 pkg_add -F' || true
+
+                # See what that got us
+                now=`ls ${NANO_PKG_DBDIR} | wc -l`
+                echo "=== NOW $now"
+                ls ${NANO_PKG_DBDIR}
+                echo "==="
+
+
+                if [ $now -eq $todo ] ; then
+                        echo "DONE $now packages"
+                        break
+                elif [ $now -eq $have ] ; then
+                        echo "FAILED: Nothing happened on this pass"
+                        exit 2
+                fi
+        done
+        rm -rf ${NANO_WORLDDIR}/Pkg
+)
+
 
 # Prune no needed directories of image
@@ -325 +390 @@
 # XXX: Determine size before installing all find of additions to see how much
 # base we are actually using ## du -h -d 0
+customize_cmd cust_alternate_pkg_db
 customize_cmd cust_pkg
 customize_cmd cust_install_files

branches/releng-9.0/nanobsd/tools/image-build.sh

@@ -74 +74 @@
 fi  
 if [ $RETVAL -ne 0 ]; then
-  p_err Errors in building NanoBSD Image
+  p_err "Errors in building NanoBSD Image ($RETVAL)"
 fi
 p_info End time: `date`