--- elwix/config/rc.subr 2017/06/19 20:26:48 1.10.2.5 +++ elwix/config/rc.subr 2017/06/28 08:58:51 1.10.2.8 @@ -4,7 +4,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: rc.subr,v 1.10.2.5 2017/06/19 20:26:48 misho Exp $ +# $Id: rc.subr,v 1.10.2.8 2017/06/28 08:58:51 misho Exp $ # ### Dont edit this file !!! @@ -111,7 +111,7 @@ MakeFS_var() touch altroot/var/log/ppp.log chgrp 69 altroot/var/log/ppp.log - install -v $2/resolv.safe altroot/var/run/resolv.conf +# install -v $2/resolv.safe altroot/var/run/resolv.conf install -v ${WORLD}/usr/share/keys/pkg/trusted/* altroot/pkg/keys/trusted cd - @@ -145,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; @@ -157,7 +154,7 @@ MakeFS_etc() ln -sf /usr/share/zoneinfo/${TIMEZONE} $1/etc/localtime; ln -sf /usr/share/misc/termcap $1/etc/termcap; - ln -sf /var/run/resolv.conf $1/etc/resolv.conf; +# ln -sf /var/run/resolv.conf $1/etc/resolv.conf; # ln -sf /elwix/pkg/etc/mk.conf $1/etc/mk.conf; @@ -183,18 +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 - tar -czf altroot/backup/.etc.tgz etc - - cd altroot - tar -czf backup/.var.tgz var -} - # $1 = fs MakeFS_boot() { @@ -216,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; }