--- elwix/build_base.sh 2017/06/15 23:18:37 1.4.2.6 +++ elwix/build_base.sh 2021/07/16 18:35:50 1.6 @@ -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.6 2021/07/16 18:35:50 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -49,6 +49,7 @@ build_basefs() install -d boot/defaults; install -d boot/firmware; install -d boot/kernel; + install -d boot/lua; install -d boot/modules; install -d boot/zfs; install -d dev; @@ -56,14 +57,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 +66,8 @@ build_basefs() install -d elwix/tftpboot; install -d elwix/pkg; install -d elwix/local; - ln -fs /elwix/etc etc; + install -d elwix/local/lib; + install -d etc; ln -fs /elwix/exports exports; ln -fs /elwix/home home; ln -fs /elwix/root root; @@ -101,6 +95,7 @@ build_basefs() ln -fs /elwix/local usr/local; ln -fs /elwix/pkg usr/pkg; install -d usr/sbin; + ln -fs /usr/pkg/sbin/mini_sendmail usr/sbin/sendmail install -d usr/share; install -d usr/share/misc; install -d usr/share/skel; @@ -125,9 +120,9 @@ install_basefs() MISC="${SHARE}/misc" echo "+++ Install ELWIX BaseFS software ... $BASEFS" - if [ -r ${BSDSRC}/release/picobsd/mfs_tree/etc/termcap ]; then - install -v -m 644 ${BSDSRC}/release/picobsd/mfs_tree/etc/termcap $MISC; - install -v -m 644 ${BSDSRC}/release/picobsd/mfs_tree/etc/services $MISC; + if [ -r files/etc/termcap ]; then + install -v -m 644 files/etc/termcap $MISC; + install -v -m 644 files/etc/services $MISC; else install -v -m 644 ${BSDSRC}/etc/termcap.small $MISC/termcap; install -v -m 644 ${BSDSRC}/etc/services $MISC; @@ -180,7 +175,7 @@ create_etc_fstab() # /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 +217,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}