d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doing a cpio from /var/empty if dir was not specified or non-existent

Browse Source 
copies its mode to the destination. This is not desirable.
Rephrase this code to be more sensible.

PR:		173483
MFC after:	1 week
This commit is contained in:
n_hibma 2013-04-28 21:44:44 +00:00
parent a5bbb03f95
commit c4709342cd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/tools/nanobsd/nanobsd.sh
View File

@ -413,12 +413,13 @@ populate_slice ( ) (
dir=$2
mnt=$3
lbl=$4
test -z $2 && dir=${NANO_WORLDDIR}/var/empty
test -d $dir || dir=${NANO_WORLDDIR}/var/empty
echo "Creating ${dev} with ${dir} (mounting on ${mnt})"
newfs_part $dev $mnt $lbl
cd ${dir}
find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt}
echo "Creating ${dev} (mounting on ${mnt})"
newfs_part ${dev} ${mnt} ${lbl}
if [ -n "${dir}" -a -d "${dir}" ]; then
echo "Populating ${lbl} from ${dir}"
cd ${dir}
find . -print | grep -Ev '/(CVS|\.svn)' | cpio -dumpv ${mnt}
fi
df -i ${mnt}
umount ${mnt}
)