--- elwix/config/etc/default/rc.cfg 2017/06/29 09:15:09 1.3.2.10 +++ elwix/config/etc/default/rc.cfg 2017/07/13 08:39:21 1.3.2.12 @@ -2,7 +2,7 @@ # # U-boot cfg nand map load/save management script # -# $Id: rc.cfg,v 1.3.2.10 2017/06/29 09:15:09 misho Exp $ +# $Id: rc.cfg,v 1.3.2.12 2017/07/13 08:39:21 misho Exp $ CFG_NAND_LIST="/etc/cfg.map" CFG_NAND_MAP="/dev/ada0g" @@ -91,8 +91,8 @@ case "$1" in if [ ! -L /elwix/local -a ! -L /elwix/altroot/pkg/db ]; then mkdir -p ${PKG2CF}/db mkdir -p ${PKG2CF}/local - cp -r /elwix/altroot/pkg/db/* ${PKG2CF}/db - cp -r /elwix/local/* ${PKG2CF}/local + cp -r /elwix/altroot/pkg/db/* ${PKG2CF}/db >/dev/null 2>&1 + cp -r /elwix/local/* ${PKG2CF}/local >/dev/null 2>&1 rm -rf /elwix/local /elwix/altroot/pkg/db ln -s ${PKG2CF}/db /elwix/altroot/pkg/db ln -s ${PKG2CF}/local /elwix/local @@ -102,7 +102,7 @@ case "$1" in boot2) echo "ELWIX setup boot from second image" if [ -c $ELWIX2 ]; then - cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" -Ss currdev /boot/loader.conf.local "disk0f:" + cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" -JSs currdev /boot/loader.conf.local "disk0f:" cfexec cp /tmp/loader.conf.local.tmp /boot/loader.conf.local rm -f /tmp/loader.conf.local.tmp else @@ -112,7 +112,7 @@ case "$1" in ;; boot) echo "ELWIX setup boot from main image" - cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" -Ss currdev /boot/loader.conf.local "disk0a:" + cfger -o /tmp/loader.conf.local.tmp -c "Edit by /etc/rc.cfg" -JSs currdev /boot/loader.conf.local "disk0a:" cfexec cp /tmp/loader.conf.local.tmp /boot/loader.conf.local rm -f /tmp/loader.conf.local.tmp echo "ELWIX boot setup complete."