--- elwix/build_rootfs.sh	2012/02/09 01:36:21	1.2.4.3
+++ elwix/build_rootfs.sh	2012/02/16 10:05:34	1.2.4.5
@@ -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.4.3 2012/02/09 01:36:21 misho Exp $
+# $Id: build_rootfs.sh,v 1.2.4.5 2012/02/16 10:05:34 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -65,7 +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}/crypto/openssh
+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
@@ -99,6 +100,10 @@ build_rootdir()
 	install -d system;
 	install -d -m 1777 tmp;
 	install -d usr;
+	install -d usr/bin;
+	install -d usr/lib;
+	install -d usr/libexec;
+	install -d usr/sbin;
 	install -d var;
 
 	ln -fs /usr/lib lib;
@@ -118,7 +123,9 @@ install_rootfs()
 	PRG="/sbin/elwix"
 	BIN="${ROOTFS}/bin"
 	SBIN="${ROOTFS}/sbin"
-	LIBEXEC="${ROOTFS}/libexec"
+	UBIN="${ROOTFS}/usr/bin"
+	LIBEXEC="${ROOTFS}/usr/libexec"
+	USBIN="${ROOTFS}/usr/sbin"
 	ETC="${ROOTFS}/elwix/etc"
 
 	echo "+++ Install ELWIX into RootFS directory ..."
@@ -174,13 +181,6 @@ install_rootfs()
 	ln -s $PRG $BIN/sync
 	ln -s $PRG $BIN/uuidgen
 
-	ln $PRG $BIN/su
-	chmod u+s $BIN/su
-	ln $PRG $BIN/login
-	chmod u+s $BIN/login
-	ln $PRG $BIN/netstat
-	chmod g+s $BIN/netstat
-
 	ln -s $PRG $BIN/true
 	ln -s $PRG $BIN/false
 	ln -s $PRG $BIN/basename
@@ -192,21 +192,16 @@ install_rootfs()
 	ln -s $PRG $BIN/tset
 	ln -s $PRG $BIN/vmstat
 	ln -s $PRG $BIN/systat
-	ln -s $PRG $BIN/bsdtar
-	ln -s $PRG $BIN/bsdcpio
 	ln -s $PRG $BIN/tput
-	ln -s $PRG $BIN/bsdgrep
 	ln -s $PRG $BIN/grep
 	ln -s $PRG $BIN/awk
 	ln -s $PRG $BIN/less
-	ln -s $PRG $BIN/passwd
 	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/cu
 	ln -s $PRG $BIN/logger
 	ln -s $PRG $BIN/nice
 	ln -s $PRG $BIN/nohup
@@ -218,12 +213,7 @@ install_rootfs()
 	ln -s $PRG $BIN/touch
 	ln -s $PRG $BIN/wc
 	ln -s $PRG $BIN/xargs
-	ln -s $PRG $BIN/ssh
-	ln -s $PRG $BIN/scp
-	ln -s $PRG $BIN/sftp
-	ln -s $PRG $BIN/ssh-keygen
 	ln -s $PRG $BIN/printenv
-	ln -s $PRG $BIN/slogin
 	ln -s $PRG $BIN/egrep
 	ln -s $PRG $BIN/fgrep
 	ln -s $PRG $BIN/tar
@@ -234,16 +224,7 @@ install_rootfs()
 	ln -s $PRG $BIN/reset
 	ln -s $PRG $BIN/readlink
 	ln -s $PRG $BIN/uptime
-	ln -s $PRG $BIN/tip
 
-
-	ln $PRG $SBIN/ping
-	chmod u+s $SBIN/ping
-	ln $PRG $SBIN/ping6
-	chmod u+s $SBIN/ping6
-	ln $PRG $SBIN/shutdown
-	chmod u+s $SBIN/shutdown
-
 	ln -s $PRG $SBIN/adjkerntz
 	ln -s $PRG $SBIN/atacontrol
 	ln -s $PRG $SBIN/badsect
@@ -309,6 +290,8 @@ install_rootfs()
 	ln -s $PRG $SBIN/nfsiod
 	ln -s $PRG $SBIN/nos-tun
 	ln -s $PRG $SBIN/pfctl
+	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
@@ -320,6 +303,7 @@ 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/spppcontrol
@@ -332,11 +316,8 @@ install_rootfs()
 	ln -s $PRG $SBIN/zfs
 	ln -s $PRG $SBIN/zpool
 
-	ln $PRG $SBIN/traceroute
-	chmod u+s $SBIN/traceroute
-	ln $PRG $SBIN/traceroute6
-	chmod u+s $SBIN/traceroute6
-
+	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
@@ -347,14 +328,11 @@ install_rootfs()
 	ln -s $PRG $SBIN/wpa_cli
 	ln -s $PRG $SBIN/wpa_passphrase
 	ln -s $PRG $SBIN/wake
-	ln -s $PRG $SBIN/sshd
 	ln -s $PRG $SBIN/watchdog
 	ln -s $PRG $SBIN/watchdogd
 	ln -s $PRG $SBIN/inetd
 	ln -s $PRG $SBIN/wlandebug
-	ln -s $PRG $SBIN/tcpdump
 	ln -s $PRG $SBIN/chroot
-	ln -s $PRG $SBIN/cron
 	ln -s $PRG $SBIN/i2c
 	ln -s $PRG $SBIN/iostat
 	ln -s $PRG $SBIN/jail
@@ -363,7 +341,6 @@ install_rootfs()
 	ln -s $PRG $SBIN/ndp
 	ln -s $PRG $SBIN/newsyslog
 	ln -s $PRG $SBIN/nologin
-	ln -s $PRG $SBIN/ntpdate
 	ln -s $PRG $SBIN/pstat
 	ln -s $PRG $SBIN/rtadvctl
 	ln -s $PRG $SBIN/rtadvd
@@ -373,14 +350,10 @@ install_rootfs()
 	ln -s $PRG $SBIN/swapinfo
 	ln -s $PRG $SBIN/chgrp
 
+	ln -s $PRG $LIBEXEC/getty
+	ln -s $PRG $LIBEXEC/tftpd
 
-	ln $PRG $SBIN/getty
-
-	ln -s $PRG $SBIN/tftpd
-	ln -s $PRG $SBIN/sftp-server
-
 	chown -hR root:wheel $ROOTFS
-	chgrp kmem $BIN/netstat
 
 	echo "+++ ELWIX clean CVS tags ..."
 	CleanCVS $ETC
@@ -418,8 +391,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