--- elwix/build_uboot.sh	2014/01/21 16:33:40	1.1.2.4
+++ elwix/build_uboot.sh	2014/09/17 22:05:50	1.2.2.1
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_uboot.sh,v 1.1.2.4 2014/01/21 16:33:40 misho Exp $
+# $Id: build_uboot.sh,v 1.2.2.1 2014/09/17 22:05:50 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -53,6 +53,14 @@ build_ubfs()
 	install -d elwix/altroot;
 	install -d elwix/altroot/var;
 	install -d elwix/cf;
+	case ${TARGET} in
+		i386)
+			ln -fs /dev/ada0g elwix/cf/map.cfg
+			;;
+		mips)
+			ln -fs /dev/map/cfg elwix/cf/map.cfg
+			;;
+	esac
 	install -d elwix/etc;
 	install -d -o 883 -g 883 elwix/etc/mqtt;
 	install -d elwix/exports;
@@ -77,6 +85,7 @@ build_ubfs()
 	install -d usr/lib/geom;
 	install -d usr/libdata;
 	install -d usr/libexec;
+	install -d usr/libexec/casper;
 	ln -fs /usr/libexec libexec;
 	install -d usr/local;
 	install -d usr/local/bin;
@@ -125,20 +134,9 @@ install_ubfs()
 
 	find ${WORLD}/libexec -type f -name ld-elf.so\* -exec install {} $LIBEXEC \;
 
-#	find ${WORLD}/lib -type f -name \*.so.\* -exec install {} $LIBS \;
-#	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_UBFS} ${WORLD} ${UBFS}
-
-	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
-
 	InstallLibs ${WORLD} ${UBFS}
+	InstallDir ${WORLD}/libexec/casper $LIBEXEC/casper
 
 	chown -R root:wheel $SBIN $BIN $USBIN $UBIN $LIBDATA $LIBEXEC $LIBS
 }
@@ -160,25 +158,19 @@ create_etc_fstab()
 	cat >$1/etc/fstab <<_EOF
 # Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
 #
-/dev/map/rootfs		/	ufs	ro			0	0
-md0			/tmp	mfs	rw,-s8m,-oasync,-S	0	0
-md1			/var	mfs	rw,-s16m,-S		0       0
+/dev/map/rootfs.uncompress	/		ufs	ro			0	0
+md0				/tmp		mfs	rw,-s1m,-oasync,-S	0	0
+md1				/var		mfs	rw,-s2m,-S		0       0
+/var/db			/elwix/etc	unionfs	rw,noauto,-onoatime	0	0
 _EOF
 }
 
 install_fs()
 {
-	echo "+++ Install ELWIX u-boot $1 in bundle OS install file ..."
-	OSZ=""
-
-	case "$2" in
-		*)
-			OSZ=${REL}/${UBOOT_OS}
-			;;
-	esac
-
 	cd $1
-	tar -czvf $OSZ .
+	echo "+++ Install ELWIX u-boot $1 in bundle OS install file ..."
+	tar -czvf ${REL}/${UBOOT_OS} .
+	cd -
 }
 
 ### main()
@@ -193,7 +185,6 @@ MakeFS_home ${UBOOT_FS}/elwix
 MakeFS_var ${UBOOT_FS}/elwix ${UBOOT_ETC}
 MakeFS_etc ${UBOOT_FS}/elwix ${UBOOT_ETC} uboot
 create_etc_fstab ${UBOOT_FS}/elwix uboot
-MakeFS_backup ${UBOOT_FS}/elwix
-#install_fs ${UBOOT_FS}
+install_fs ${UBOOT_FS}
 
 echo "+++ Complete build ELWIX u-boot"