--- elwix/config/rc.subr 2017/06/14 23:16:12 1.10.2.3 +++ elwix/config/rc.subr 2017/06/21 14:11:29 1.10.2.7 @@ -4,7 +4,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: rc.subr,v 1.10.2.3 2017/06/14 23:16:12 misho Exp $ +# $Id: rc.subr,v 1.10.2.7 2017/06/21 14:11:29 misho Exp $ # ### Dont edit this file !!! @@ -64,11 +64,10 @@ MakeFS_var() install -d altroot/var/at/jobs; install -d altroot/var/at/spool; install -d -g 63 -m 0770 altroot/var/authpf; + install -d altroot/var/backups; install -d -m 0750 altroot/var/cron; install -d -m 0700 altroot/var/cron/tabs; install -d altroot/var/db; - install -d altroot/var/db/etc; - install -d altroot/var/db/keys; install -d altroot/var/db/pkg; install -d -m 0555 altroot/var/empty; install -d altroot/var/log; @@ -146,9 +145,6 @@ MakeFS_etc() chmod 0440 $1/etc/sudoers; -# chgrp 80 $1/etc/config.xml; -# chmod 0660 $1/etc/config.xml; - mkdir -p $1/etc/mqtt; chgrp -R 883 $1/etc/mqtt; chown -R 883 $1/etc/mqtt; @@ -184,19 +180,6 @@ MakeFS_home() install -v ${CFGDIR}/root.skel/vimrc $1/root/.vimrc; } -# $1 = fs/elwix -MakeFS_backup() -{ - mkdir -p $1/altroot/backup - - cd $1 -# cp -p etc/config.xml altroot/backup - tar -czf altroot/backup/.etc.tgz etc - - cd altroot - tar -czf backup/.var.tgz var -} - # $1 = fs MakeFS_boot() { @@ -218,6 +201,7 @@ MakeFS_boot() if [ -r ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf ]; then install -m 644 ${CFGDIR}/boot/loader_${TARGET_ARCH}.conf $1/boot/loader.conf; + install -m 644 ${CFGDIR}/boot/loader.conf.local $1/boot/loader.conf.local; fi; }