summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2014-04-08 21:58:04 +0000
committerimp <imp@FreeBSD.org>2014-04-08 21:58:04 +0000
commit6b0e19f387ccfabe44576294cc67992b5aa0748c (patch)
tree41b376a4e7e2ca142c5f20259a1016de7ac83105
parenta31581c714ba3ebda348f2164bcaec09212892b0 (diff)
downloadFreeBSD-src-6b0e19f387ccfabe44576294cc67992b5aa0748c.zip
FreeBSD-src-6b0e19f387ccfabe44576294cc67992b5aa0748c.tar.gz
Also ignore files from Murcirial (.hg) and git (.git) when copying
file trees.
-rw-r--r--tools/tools/nanobsd/nanobsd.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 4135fcc..df09138 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -436,7 +436,7 @@ populate_slice ( ) (
if [ -n "${dir}" -a -d "${dir}" ]; then
echo "Populating ${lbl} from ${dir}"
cd ${dir}
- find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt}
+ find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)' | cpio -dumpv ${mnt}
fi
df -i ${mnt}
umount ${mnt}
@@ -705,7 +705,7 @@ cust_allow_ssh_root () (
cust_install_files () (
cd ${NANO_TOOLS}/Files
- find . -print | grep -Ev '/(CVS|\.svn)' | cpio -Ldumpv ${NANO_WORLDDIR}
+ find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)' | cpio -Ldumpv ${NANO_WORLDDIR}
)
#######################################################################
OpenPOWER on IntegriCloud