--- elwix/build_fs.sh 2014/07/14 22:42:36 1.9.4.2 +++ elwix/build_fs.sh 2016/12/20 14:40:20 1.10.2.3 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_fs.sh,v 1.9.4.2 2014/07/14 22:42:36 misho Exp $ +# $Id: build_fs.sh,v 1.10.2.3 2016/12/20 14:40:20 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -32,13 +32,14 @@ fi clean_fsdir() { - echo "+++ Clean ELWIX FS ..." + echo "+++ Clean ELWIX FS ... $1" + chflags -Rf nosunlink $1 rm -rf $1 $2 } build_fsdir() { - echo "+++ Build ELWIX FS directory ..." + echo "+++ Build ELWIX FS directory ... $1" mkdir -p $1 cd $1 @@ -73,6 +74,14 @@ build_fsdir() install -d boot; # cf install -d cf; + case ${TARGET} in + i386) + ln -fs /dev/ada0g cf/map.cfg + ;; + mips) + ln -fs /dev/map/cfg cf/map.cfg + ;; + esac # etc install -d etc; install -d -o 883 -g 883 etc/mqtt; @@ -99,15 +108,19 @@ create_etc_fstab() # Automatic generated fstab for ELWIX $2 at ${BUILD_DATE} # /dev/ufs/elwix /elwix ufs ro 0 1 -md3 /tmp mfs rw,-s8m,-oasync,-S 0 0 -md4 /var mfs rw,-s16m,-S 0 0 -/var/db /elwix/etc unionfs rw,noauto,-onoatime 0 0 +md3 /tmp mfs rw,-s8m,-oasync,-S,-n 0 0 +md4 /var mfs rw,-s16m,-S,-n 0 0 _EOF } +update_etc_cfexec() +{ + echo "mount = \"/elwix\"" >> $1/etc/cfexec.conf +} + install_fsdir() { - echo "+++ Install ELWIX FS $1 in bundle OS install file ..." + echo "+++ Install ELWIX RootFS $1 in bundle OS install file ..." OSZ="" install -v ${REL}/${ROOTFS_KERN} $1/boot/kernel/kernel.gz @@ -147,6 +160,8 @@ install_fsdir() cd $1 tar -czvf $OSZ . + + echo "+++ Completed ELWIX RootFS $1 --> $OSZ" } ### main() @@ -177,6 +192,9 @@ MakeFS_etc ${FS_EXT} ${FS_EXT_ETC} ext || exit 1 create_etc_fstab ${FS} || exit 1 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 @@ -186,5 +204,5 @@ MakeFS_boot ${FS_EXT} || exit 1 install_fsdir ${FS} || exit 1 install_fsdir ${FS_EXT} ext || exit 1 -echo "+++ Complete build ELWIX FS" -echo "ELWIX finish version ${VERSION}, Good luck!" +echo "+++ Complete build ELWIX RootFS system" +echo "ELWIX RootFS finish version ${VERSION}, Good luck!"