--- elwix/build_rootfs.sh	2012/02/10 01:54:03	1.2.4.4
+++ 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.4 2012/02/10 01:54:03 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
@@ -100,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;
@@ -119,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 ..."
@@ -344,8 +350,8 @@ install_rootfs()
 	ln -s $PRG $SBIN/swapinfo
 	ln -s $PRG $SBIN/chgrp
 
-	ln -s $PRG $SBIN/getty
-	ln -s $PRG $SBIN/tftpd
+	ln -s $PRG $LIBEXEC/getty
+	ln -s $PRG $LIBEXEC/tftpd
 
 	chown -hR root:wheel $ROOTFS