--- elwix/build_rootfs.sh	2011/10/18 09:02:05	1.2
+++ elwix/build_rootfs.sh	2012/02/10 01:54:03	1.2.4.4
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_rootfs.sh,v 1.2 2011/10/18 09:02:05 misho Exp $
+# $Id: build_rootfs.sh,v 1.2.4.4 2012/02/10 01:54:03 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -65,6 +65,8 @@ LIBS += -L${WORLD}/lib -L${WORLD}/usr/lib
 _EOF
 	cat >$ROOTFS_CONF <<_EOF
 srcdirs ${BSDSRC}/bin ${BSDSRC}/sbin ${BSDSRC}/libexec ${BSDSRC}/cddl/sbin ${BSDSRC}/sbin/ggate
+srcdirs ${BSDSRC}/usr.bin ${BSDSRC}/usr.sbin ${BSDSRC}/usr.sbin/wpa
+
 #buildopts -DRESCUE CRUNCH_CFLAGS=-DRESCUE TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} MAKEOBJDIRPREFIX=${BSDOBJ}
 buildopts TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} MAKEOBJDIRPREFIX=${BSDOBJ}
 _EOF
@@ -117,6 +119,7 @@ install_rootfs()
 	PRG="/sbin/elwix"
 	BIN="${ROOTFS}/bin"
 	SBIN="${ROOTFS}/sbin"
+	LIBEXEC="${ROOTFS}/libexec"
 	ETC="${ROOTFS}/elwix/etc"
 
 	echo "+++ Install ELWIX into RootFS directory ..."
@@ -126,7 +129,7 @@ install_rootfs()
 
 	InstallDir ${ROOTFS_ETC} $ETC
 
-	ln -s /usr/sbin/nologin $SBIN
+#	ln -s /usr/sbin/nologin $SBIN
 
 	ln -s $PRG $BIN/test
 	ln -s $PRG $BIN/\[
@@ -172,6 +175,50 @@ install_rootfs()
 	ln -s $PRG $BIN/sync
 	ln -s $PRG $BIN/uuidgen
 
+	ln -s $PRG $BIN/true
+	ln -s $PRG $BIN/false
+	ln -s $PRG $BIN/basename
+	ln -s $PRG $BIN/tail
+	ln -s $PRG $BIN/nc
+	ln -s $PRG $BIN/w
+	ln -s $PRG $BIN/head
+	ln -s $PRG $BIN/uname
+	ln -s $PRG $BIN/tset
+	ln -s $PRG $BIN/vmstat
+	ln -s $PRG $BIN/systat
+	ln -s $PRG $BIN/tput
+	ln -s $PRG $BIN/grep
+	ln -s $PRG $BIN/awk
+	ln -s $PRG $BIN/less
+	ln -s $PRG $BIN/gzip
+	ln -s $PRG $BIN/cap_mkdb
+	ln -s $PRG $BIN/sed
+	ln -s $PRG $BIN/vi
+	ln -s $PRG $BIN/du
+	ln -s $PRG $BIN/getopt
+	ln -s $PRG $BIN/logger
+	ln -s $PRG $BIN/nice
+	ln -s $PRG $BIN/nohup
+	ln -s $PRG $BIN/seq
+	ln -s $PRG $BIN/sockstat
+	ln -s $PRG $BIN/stat
+	ln -s $PRG $BIN/tee
+	ln -s $PRG $BIN/tftp
+	ln -s $PRG $BIN/touch
+	ln -s $PRG $BIN/wc
+	ln -s $PRG $BIN/xargs
+	ln -s $PRG $BIN/printenv
+	ln -s $PRG $BIN/egrep
+	ln -s $PRG $BIN/fgrep
+	ln -s $PRG $BIN/tar
+	ln -s $PRG $BIN/cpio
+	ln -s $PRG $BIN/nawk
+	ln -s $PRG $BIN/gunzip
+	ln -s $PRG $BIN/more
+	ln -s $PRG $BIN/reset
+	ln -s $PRG $BIN/readlink
+	ln -s $PRG $BIN/uptime
+
 	ln -s $PRG $SBIN/adjkerntz
 	ln -s $PRG $SBIN/atacontrol
 	ln -s $PRG $SBIN/badsect
@@ -237,9 +284,9 @@ install_rootfs()
 	ln -s $PRG $SBIN/nfsiod
 	ln -s $PRG $SBIN/nos-tun
 	ln -s $PRG $SBIN/pfctl
-	ln -s $PRG $SBIN/pflogd
 	ln -s $PRG $SBIN/ping
 	ln -s $PRG $SBIN/ping6
+	ln -s $PRG $SBIN/pflogd
 	ln -s $PRG $SBIN/quotacheck
 	ln -s $PRG $SBIN/reboot
 	ln -s $PRG $SBIN/halt
@@ -250,9 +297,9 @@ install_rootfs()
 	ln -s $PRG $SBIN/rrestore
 	ln -s $PRG $SBIN/route
 	ln -s $PRG $SBIN/rtsol
+	ln -s $PRG $SBIN/shutdown
 	ln -s $PRG $SBIN/savecore
 	ln -s $PRG $SBIN/setkey
-	ln -s $PRG $SBIN/shutdown
 	ln -s $PRG $SBIN/spppcontrol
 	ln -s $PRG $SBIN/swapon
 	ln -s $PRG $SBIN/swapoff
@@ -263,7 +310,48 @@ install_rootfs()
 	ln -s $PRG $SBIN/zfs
 	ln -s $PRG $SBIN/zpool
 
+	ln -s $PRG $SBIN/traceroute
+	ln -s $PRG $SBIN/traceroute6
+	ln -s $PRG $SBIN/chown
+	ln -s $PRG $SBIN/pwd_mkdb
+	ln -s $PRG $SBIN/arp
+	ln -s $PRG $SBIN/gpioctl
+	ln -s $PRG $SBIN/hostapd
+	ln -s $PRG $SBIN/hostapd_cli
+	ln -s $PRG $SBIN/wpa_supplicant
+	ln -s $PRG $SBIN/wpa_cli
+	ln -s $PRG $SBIN/wpa_passphrase
+	ln -s $PRG $SBIN/wake
+	ln -s $PRG $SBIN/watchdog
+	ln -s $PRG $SBIN/watchdogd
+	ln -s $PRG $SBIN/inetd
+	ln -s $PRG $SBIN/wlandebug
+	ln -s $PRG $SBIN/chroot
+	ln -s $PRG $SBIN/i2c
+	ln -s $PRG $SBIN/iostat
+	ln -s $PRG $SBIN/jail
+	ln -s $PRG $SBIN/jexec
+	ln -s $PRG $SBIN/jls
+	ln -s $PRG $SBIN/ndp
+	ln -s $PRG $SBIN/newsyslog
+	ln -s $PRG $SBIN/nologin
+	ln -s $PRG $SBIN/pstat
+	ln -s $PRG $SBIN/rtadvctl
+	ln -s $PRG $SBIN/rtadvd
+	ln -s $PRG $SBIN/rtsold
+	ln -s $PRG $SBIN/syslogd
+	ln -s $PRG $SBIN/setfib
+	ln -s $PRG $SBIN/swapinfo
+	ln -s $PRG $SBIN/chgrp
+
+	ln -s $PRG $SBIN/getty
+	ln -s $PRG $SBIN/tftpd
+
 	chown -hR root:wheel $ROOTFS
+
+	echo "+++ ELWIX clean CVS tags ..."
+	CleanCVS $ETC
+	CleanCVS $ETC/etc
 }
 
 build_image()
@@ -297,8 +385,7 @@ if SnitVer ${WORLD}/elwix.ver; then
 	build_rootdir
 	install_rootfs
 
-	build_image
-	install_image
+	build_image && install_image
 else
 	echo "Skipped ELWIX RootFS build ..."
 fi