--- elwix/build_fs.sh	2017/06/15 22:34:29	1.11.2.1
+++ elwix/build_fs.sh	2017/06/28 11:59:10	1.11.2.6
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: build_fs.sh,v 1.11.2.1 2017/06/15 22:34:29 misho Exp $
+# $Id: build_fs.sh,v 1.11.2.6 2017/06/28 11:59:10 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -39,6 +39,9 @@ clean_fsdir()
 
 build_fsdir()
 {
+	#
+	# Structure of ELWIX CF Drive mount on /elwix
+	#
 	echo "+++ Build ELWIX FS directory ... $1"
 	mkdir -p $1
 
@@ -48,7 +51,7 @@ build_fsdir()
 # cf
 	install -d cf;
 	case ${TARGET} in
-		i386)
+		i386|amd64)
 			ln -fs /dev/ada0g cf/map.cfg
 			;;
 		mips)
@@ -57,7 +60,6 @@ build_fsdir()
 	esac
 # etc
 	install -d etc;
-	install -d -o 883 -g 883 etc/mqtt;
 # exports
 	install -d exports;
 # home
@@ -80,7 +82,7 @@ create_etc_fstab()
 	cat >$1/etc/fstab <<_EOF
 # Automatic generated fstab for ELWIX $2 at ${BUILD_DATE}
 #
-/dev/ufs/elwix		/elwix	ufs	ro			0	1
+/dev/ufs/elwix		/elwix	ufs	ro,noauto		0	1
 _EOF
 }
 
@@ -103,8 +105,8 @@ install_fsdir()
 			pax -r -z -pe -f ${REL}/${ROMFS_IMG}
 			cd -
 
-			install -d $1/usr/local
-			cd $1/usr/local
+			install -d $1/pkg
+			cd $1/pkg
 			pax -r -z -pe -f ${REL}/${ROMFS_IMG2}
 			cd -
 
@@ -165,9 +167,6 @@ create_etc_fstab ${FS_EXT} ext || exit 1
 
 update_etc_cfexec ${FS} || exit 1
 update_etc_cfexec ${FS_EXT} ext || exit 1
-
-MakeFS_backup ${FS} || exit 1
-MakeFS_backup ${FS_EXT} || exit 1
 
 MakeFS_boot ${FS} || exit 1
 MakeFS_boot ${FS_EXT} || exit 1