diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-07-28 01:59:58 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-07-28 01:59:58 +0000 |
| commit | 9c3163dca44c7fbd280df3677b909387e5b64e1e (patch) | |
| tree | 5f4f4923a427e4245a7aa3f4d43a13b199b7f130 /tools | |
| parent | fca4113109841b1f7c1a21384313b855ba3d546f (diff) | |
| download | src-9c3163dca44c7fbd280df3677b909387e5b64e1e.tar.gz src-9c3163dca44c7fbd280df3677b909387e5b64e1e.zip | |
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
Notes
Notes:
svn path=/head/; revision=321637
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/tools/nanobsd/defaults.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh index 3be8dd98458e..56224c60f1ef 100755 --- a/tools/tools/nanobsd/defaults.sh +++ b/tools/tools/nanobsd/defaults.sh @@ -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} |