Author: imp
Date: Fri Jul 28 01:59:58 2017
New Revision: 321637
URL: https://svnweb.freebsd.org/changeset/base/321637
Log:
Ensure that ordinary files that happen to start with .git, .hg and
.cvs into the image.
This makes .gitignore files in the working tree appear in the final
tree...
PR: 192178
Submitted by: Jason Unovitch
Sponsored by: Netflix
MFC After: 3 days
Modified:
head/tools/tools/nanobsd/defaults.sh
Modified: head/tools/tools/nanobsd/defaults.sh
==============================================================================
--- head/tools/tools/nanobsd/defaults.sh Fri Jul 28 01:59:53 2017
(r321636)
+++ head/tools/tools/nanobsd/defaults.sh Fri Jul 28 01:59:58 2017
(r321637)
@@ -634,7 +634,7 @@ populate_slice ( ) (
if [ -n "${dir}" -a -d "${dir}" ]; then
echo "Populating ${lbl} from ${dir}"
cd "${dir}"
- find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)' | cpio
-dumpv ${mnt}
+ find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)/' | cpio
-dumpv ${mnt}
fi
df -i ${mnt}
nano_umount ${mnt}
@@ -742,7 +742,7 @@ cust_allow_ssh_root ( ) (
cust_install_files ( ) (
cd "${NANO_TOOLS}/Files"
- find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)' | cpio -Ldumpv
${NANO_WORLDDIR}
+ find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)/' | cpio -Ldumpv
${NANO_WORLDDIR}
if [ -n "${NANO_CUST_FILES_MTREE}" -a -f ${NANO_CUST_FILES_MTREE} ];
then
CR "mtree -eiU -p /" <${NANO_CUST_FILES_MTREE}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
