--- elwix/build_fs.sh 2013/08/06 07:33:37 1.8.2.1 +++ elwix/build_fs.sh 2017/06/20 08:49:03 1.11.2.5 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_fs.sh,v 1.8.2.1 2013/08/06 07:33:37 misho Exp $ +# $Id: build_fs.sh,v 1.11.2.5 2017/06/20 08:49:03 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -32,60 +32,44 @@ 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 ..." + # + # Structure of ELWIX CF Drive mount on /elwix + # + echo "+++ Build ELWIX FS directory ... $1" mkdir -p $1 cd $1 - -# altroot - install -d altroot; - # altroot/var - install -d altroot/var; - install -d altroot/var/account; - install -d altroot/var/at; - install -d altroot/var/at/jobs; - install -d altroot/var/at/spool; - install -d -g 63 -m 0770 altroot/var/authpf; - install -d -m 0750 altroot/var/cron; - install -d -m 0700 altroot/var/cron/tabs; - install -d altroot/var/db; - install -d -m 0555 altroot/var/empty; - install -d altroot/var/log; - install -d -o 101 -g 101 altroot/var/log/quagga; - install -d -o 883 -g 883 altroot/var/mqtt; - install -d altroot/var/named; - install -d altroot/var/run; - install -d altroot/var/sys; - install -d -o 53 -g 53 altroot/var/run/named; - install -d -o 101 -g 101 altroot/var/run/quagga; - install -d altroot/var/spool; - install -d -o 66 -g 68 -m 0775 altroot/var/spool/lock; - install -d -g 1 altroot/var/spool/lpd; - install -d -g 1 altroot/var/spool/output; - install -d -g 1 altroot/var/spool/output/lpd; # boot install -d boot; # cf install -d cf; + case ${TARGET} in + i386|amd64) + 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; # exports install -d exports; # home install -d home; +# local + install -d local; # root install -d -m 0750 root; # pkg install -d pkg; - install -d pkg/db; - install -d pkg/lib; # tftpboot install -d tftpboot; @@ -99,14 +83,17 @@ 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 _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 @@ -118,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 - @@ -146,6 +133,8 @@ install_fsdir() cd $1 tar -czvf $OSZ . + + echo "+++ Completed ELWIX RootFS $1 --> $OSZ" } ### main() @@ -158,32 +147,32 @@ if [ ! -r ${REL}/${ROOTFS_KERN} -o ! -r ${REL}/${ROMFS exit 1 fi -clean_fsdir ${FS} ${REL}/${OS} -clean_fsdir ${FS_EXT} ${REL}/${OS_EXT} +clean_fsdir ${FS} ${REL}/${OS} || exit 1 +clean_fsdir ${FS_EXT} ${REL}/${OS_EXT} || exit 1 -build_fsdir ${FS} -build_fsdir ${FS_EXT} +build_fsdir ${FS} || exit 1 +build_fsdir ${FS_EXT} || exit 1 -MakeFS_home ${FS} -MakeFS_home ${FS_EXT} +MakeFS_home ${FS} || exit 1 +MakeFS_home ${FS_EXT} || exit 1 -MakeFS_var ${FS} ${FS_ETC} -MakeFS_var ${FS_EXT} ${FS_EXT_ETC} +MakeFS_var ${FS} ${FS_ETC} || exit 1 +MakeFS_var ${FS_EXT} ${FS_EXT_ETC} || exit 1 -MakeFS_etc ${FS} ${FS_ETC} -MakeFS_etc ${FS_EXT} ${FS_EXT_ETC} ext +MakeFS_etc ${FS} ${FS_ETC} || exit 1 +MakeFS_etc ${FS_EXT} ${FS_EXT_ETC} ext || exit 1 -create_etc_fstab ${FS} -create_etc_fstab ${FS_EXT} ext +create_etc_fstab ${FS} || exit 1 +create_etc_fstab ${FS_EXT} ext || exit 1 -MakeFS_backup ${FS} -MakeFS_backup ${FS_EXT} +update_etc_cfexec ${FS} || exit 1 +update_etc_cfexec ${FS_EXT} ext || exit 1 -MakeFS_boot ${FS} -MakeFS_boot ${FS_EXT} +MakeFS_boot ${FS} || exit 1 +MakeFS_boot ${FS_EXT} || exit 1 -install_fsdir ${FS} -install_fsdir ${FS_EXT} ext +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!"