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

Prune empty directories in /usr

Browse Source 
Move argv parsing.
This commit is contained in:
Poul-Henning Kamp 2005-08-13 08:06:18 +00:00
parent 05727a08ae
commit 202cd57290
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
tools/tools/nanobsd/nanobsd.sh
View File

@ -184,6 +184,16 @@ setup_diskless ( ) (
ln -s var/tmp tmp
)
prune_usr() (
# Remove all empty directories in /usr
find ${NANO_WORLDDIR}/usr -type d -depth -print |
while read d
do
rmdir $d > /dev/null 2>&1 || true
done
)
create_i386_diskimage ( ) (
echo $NANO_MEDIA $NANO_IMAGES \
@ -242,7 +252,7 @@ create_i386_diskimage ( ) (
MD=`mdconfig -a -t vnode -f ${IMG} -x ${NANO_SECTS} -y ${NANO_HEADS}`
trap "umount ${MNT} || true ; mdconfig -d -u $MD" 1 2 15 EXIT
trap "df -i ${MNT} ; umount ${MNT} || true ; mdconfig -d -u $MD" 1 2 15 EXIT
fdisk -i -f ${MAKEOBJDIRPREFIX}/_.fdisk ${MD}
# XXX: params
@ -253,6 +263,7 @@ create_i386_diskimage ( ) (
# Create first image
newfs ${NANO_NEWFS} /dev/${MD}s1a
mount /dev/${MD}s1a ${MNT}
df -i ${MNT}
( cd ${NANO_WORLDDIR} && find . -print | cpio -dump ${MNT} )
# XXX: make_fstab
df -i ${MNT}
@ -286,6 +297,31 @@ create_i386_diskimage ( ) (
#
#######################################################################
#######################################################################
# Parse arguments
args=`getopt c: $*`
if [ $? -ne 0 ] ; then
echo "Usage: $0 [-c config file]" 1>&2
exit 2
fi
set -- $args
for i
do
case "$i"
in
-c)
. "$2"
shift;
shift;
;;
--)
shift;
break;
esac
done
#######################################################################
# Internal variables
@ -317,31 +353,6 @@ export NANO_SECTS
export NANO_SRC
export NANO_WORLDDIR
#######################################################################
# Parse arguments
args=`getopt c: $*`
if [ $? -ne 0 ] ; then
echo "Usage: $0 [-c config file]" 1>&2
exit 2
fi
set -- $args
for i
do
case "$i"
in
-c)
. "$2"
shift;
shift;
;;
--)
shift;
break;
esac
done
#######################################################################
# Set up object directory
@ -355,4 +366,5 @@ install_world
install_etc
install_kernel
setup_diskless
prune_usr
create_${NANO_ARCH}_diskimage