--- elwix/build_uboot.sh	2014/01/20 13:25:07	1.1.2.2
+++ elwix/build_uboot.sh	2014/01/21 09:21:55	1.1.2.3
@@ -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.2 2014/01/20 13:25:07 misho Exp $
+# $Id: build_uboot.sh,v 1.1.2.3 2014/01/21 09:21:55 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -59,13 +59,11 @@ build_ubfs()
 	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;
 	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;
@@ -77,15 +75,13 @@ build_ubfs()
 	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/libexec;
 	install -d usr/local/sbin;
 	install -d usr/sbin;
 	install -d usr/share;
@@ -100,14 +96,14 @@ build_ubfs()
 
 install_ubfs()
 {
-	LIBS="${BASEFS}/usr/lib"
-	LIBEXEC="${BASEFS}/usr/libexec"
-	LIBDATA="${BASEFS}/usr/libdata"
-	BIN="${BASEFS}/bin"
-	UBIN="${BASEFS}/usr/bin"
-	SBIN="${BASEFS}/sbin"
-	USBIN="${BASEFS}/usr/sbin"
-	SHARE="${BASEFS}/usr/share"
+	LIBS="${UBFS}/usr/lib"
+	LIBEXEC="${UBFS}/usr/libexec"
+	LIBDATA="${UBFS}/usr/libdata"
+	BIN="${UBFS}/bin"
+	UBIN="${UBFS}/usr/bin"
+	SBIN="${UBFS}/sbin"
+	USBIN="${UBFS}/usr/sbin"
+	SHARE="${UBFS}/usr/share"
 	SKEL="${SHARE}/skel"
 	MISC="${SHARE}/misc"
 
@@ -128,13 +124,13 @@ 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 \;
+#	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_UBOOTFS} ${WORLD} ${UBFS}
+	InstallList ${ELWIX_UBFS} ${WORLD} ${UBFS}
 
 	InstallDir ${WORLD}/usr/local/bin $UBIN
 	InstallDir ${WORLD}/usr/local/sbin $USBIN
@@ -161,7 +157,7 @@ create_etc_fstab()
 	cat >$1/etc/fstab <<_EOF
 # Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
 #
-/dev/map/rootfs		/	ufs	ro			0	1
+/dev/map/rootfs		/	ufs	ro			0	0
 md0			/tmp	mfs	rw,-s8m,-oasync,-S	0	0
 md1			/var	mfs	rw,-s16m,-S		0       0
 _EOF
@@ -183,10 +179,10 @@ install_fs()
 }
 
 ### main()
-clean_basefs
-build_basefs
+clean_ubfs
+build_ubfs
 
-install_basefs
+install_ubfs
 
 # build fs
 prepare_fs ${UBOOT_FS}
@@ -194,6 +190,7 @@ 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
-install_fs ${UBOOT_FS}
+MakeFS_backup ${UBOOT_FS}/elwix
+#install_fs ${UBOOT_FS}
 
 echo "+++ Complete build ELWIX u-boot"