--- elwix/build_base.sh 2017/06/15 23:18:37 1.4.2.6 +++ elwix/build_base.sh 2017/10/08 00:05:36 1.4.2.12 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_base.sh,v 1.4.2.6 2017/06/15 23:18:37 misho Exp $ +# $Id: build_base.sh,v 1.4.2.12 2017/10/08 00:05:36 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -56,14 +56,6 @@ build_basefs() 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; @@ -73,7 +65,7 @@ build_basefs() install -d elwix/tftpboot; install -d elwix/pkg; install -d elwix/local; - ln -fs /elwix/etc etc; + install -d etc; ln -fs /elwix/exports exports; ln -fs /elwix/home home; ln -fs /elwix/root root; @@ -178,9 +170,8 @@ create_etc_fstab() cat >$1/etc/fstab <<_EOF # Automatic generated fstab for ELWIX $2 at ${BUILD_DATE} # -/dev/ufs/elwix / ufs ro 0 1 tmpfs /tmp tmpfs rw 0 0 -md1 /var mfs rw,-s16m,-S,-n 0 0 +md2 /var mfs rw,-s16m,-S,-n 0 0 _EOF } @@ -222,10 +213,9 @@ install_basefs prepare_fs ${BASE_FS} MakeFS_home ${BASE_FS}/elwix MakeFS_var ${BASE_FS}/elwix ${BASE_ETC} -MakeFS_etc ${BASE_FS}/elwix ${BASE_ETC} base -create_etc_fstab ${BASE_FS}/elwix base -update_etc_cfexec ${BASE_FS}/elwix -MakeFS_backup ${BASE_FS}/elwix +MakeFS_etc ${BASE_FS} ${BASE_ETC} base +create_etc_fstab ${BASE_FS} base +update_etc_cfexec ${BASE_FS} MakeFS_boot ${BASE_FS} install_fs ${BASE_FS}