--- elwix/build_romfs.sh	2013/05/07 20:46:47	1.6
+++ elwix/build_romfs.sh	2013/07/29 08:52:16	1.6.2.2
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_romfs.sh,v 1.6 2013/05/07 20:46:47 misho Exp $
+# $Id: build_romfs.sh,v 1.6.2.2 2013/07/29 08:52:16 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -43,41 +43,74 @@ clean_romfs()
 build_romfs()
 {
 	echo "+++ Build ELWIX RomFS directory ..."
-	mkdir -p $ROMFS_USR
+	mkdir -p $ROMFS
 
-	cd $ROMFS_USR
+	cd $ROMFS
 
 	install -d bin;
+	install -d boot;
+	install -d boot/defaults;
+	install -d boot/firmware;
+	install -d boot/kernel;
+	install -d boot/modules;
+	install -d boot/zfs;
+	install -d dev;
+	install -d elwix;
+	install -d elwix/etc;
+	install -d elwix/exports;
+	install -d elwix/home;
+	install -d -m 0750 elwix/root;
+	install -d -m 0750 elwix/root/.ssh;
+	install -d elwix/system;
+	install -d elwix/tftpboot;
+	install -d elwix/var;
+	ln -fs /elwix/etc etc;
+	ln -fs /elwix/exports exports;
+	ln -fs /elwix/home home;
+	ln -fs /elwix/root root;
+	ln -fs /elwix/system system;
+	ln -fs /elwix/tftpboot tftpboot;
+	install -d mnt;
+	install -d -m 0555 proc;
 	install -d sbin;
-	install -d lib;
-	install -d lib/geom;
-	install -d libdata;
-	install -d libexec;
-	install -d local;
-	install -d local/bin;
-	install -d local/lib;
-	install -d local/libexec;
-	install -d local/libdata;
-	install -d local/sbin;
-	install -d share;
-	install -d share/misc;
-	install -d share/skel;
-	install -d share/zoneinfo;
+	install -d -m 1777 tmp;
+	install -d usr;
+	install -d usr/bin;
+	install -d usr/lib;
+	ln -fs /usr/lib lib;
+	install -d usr/lib/engines;
+	install -d usr/lib/geom;
+	install -d usr/lib32;
+	install -d usr/libdata;
+	install -d usr/libexec;
+	ln -fs /usr/libexec libexec;
+	install -d usr/local;
+	install -d usr/local/bin;
+	install -d usr/local/lib;
+	install -d usr/local/libexec;
+	install -d usr/local/libdata;
+	install -d usr/local/sbin;
+	install -d usr/sbin;
+	install -d usr/share;
+	install -d usr/share/misc;
+	install -d usr/share/skel;
+	install -d usr/share/zoneinfo;
+	install -d var;
 
-	ln -s /elwix/pkg pkg;
-
 	chown -hR root:wheel .
 	cd -
 }
 
 install_romfs()
 {
-	LIBS="${ROMFS_USR}/lib"
-	LIBEXEC="${ROMFS_USR}/libexec"
-	LIBDATA="${ROMFS_USR}/libdata"
-	BIN="${ROMFS_USR}/bin"
-	SBIN="${ROMFS_USR}/sbin"
-	SHARE="${ROMFS_USR}/share"
+	LIBS="${ROMFS}/usr/lib"
+	LIBEXEC="${ROMFS}/usr/libexec"
+	LIBDATA="${ROMFS}/usr/libdata"
+	BIN="${ROMFS}/bin"
+	UBIN="${ROMFS}/usr/bin"
+	SBIN="${ROMFS}/sbin"
+	USBIN="${ROMFS}/usr/sbin"
+	SHARE="${ROMFS}/usr/share"
 	SKEL="${SHARE}/skel"
 	MISC="${SHARE}/misc"
 
@@ -100,37 +133,18 @@ install_romfs()
 	find ${WORLD}/lib -type f -name libalias_\*.so -exec install {} $LIBS \;
 	find ${WORLD}/lib/geom -type f -name \*.so -exec install {} $LIBS/geom \;
 	find ${WORLD}/usr/lib -type f -name \*.so.\* -exec install {} $LIBS \;
+	find ${WORLD}/usr/lib/engines -type f -name \*.so -exec install {} $LIBS/engines \;
 
 	InstallList ${ELWIX_ROMFS} ${WORLD} ${ROMFS}
 
-	InstallDir ${WORLD}/usr/local/bin $BIN
-	InstallDir ${WORLD}/usr/local/sbin $SBIN
-	InstallDir ${WORLD}/usr/local/lib $LIBS
+	InstallDir ${WORLD}/usr/local/bin $UBIN
+	InstallDir ${WORLD}/usr/local/sbin $USBIN
+	InstallFiles \*.so\* ${WORLD}/usr/local/lib $LIBS
 	InstallDir ${WORLD}/usr/local/libdata $LIBDATA
 
-	chown -R root:wheel $SBIN $BIN $LIBDATA $LIBEXEC $LIBS
+	chown -R root:wheel $SBIN $BIN $USBIN $UBIN $LIBDATA $LIBEXEC $LIBS
 }
 
-build_image()
-{
-	echo "+++ Build ELWIX Firmware system image ..."
-
-	cd ${ROMFS_USR}
-	pax -w -z -v -f${REL}/${ROMFS_IMG} .
-	cd -
-
-# Stop using uzip fs
-#	makefs -ominfree=0,bsize=8192,fsize=1024,optimization=space -s${ROMFS_SIZE} \
-#		${REL}/${ROMFS_IMG} ${ROMFS_USR}
-
-#	MDDEV=$(mdconfig -a -t vnode -f ${REL}/${ROMFS_IMG});
-#	tunefs -L elwixFirmware /dev/$MDDEV;
-#	mdconfig -d -u $MDDEV;
-
-#	mkuzip -s 8192 -o ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG};
-#	mv ${REL}/${ROMFS_IMG}.uzip ${REL}/${ROMFS_IMG}
-}
-
 build_image2()
 {
 	echo "+++ Build ELWIX Firmware secondary image ..."
@@ -185,7 +199,6 @@ clean_romfs
 build_romfs
 
 install_romfs
-build_image
 
 install_romfs2
 build_image2