--- elwix/config/etc/default/rc.cfg 2017/10/09 23:48:00 1.3.2.22 +++ elwix/config/etc/default/rc.cfg 2017/10/11 21:41:56 1.3.2.23 @@ -2,7 +2,7 @@ # # U-boot cfg nand map load/save management script # -# $Id: rc.cfg,v 1.3.2.22 2017/10/09 23:48:00 misho Exp $ +# $Id: rc.cfg,v 1.3.2.23 2017/10/11 21:41:56 misho Exp $ CFG_NAND_LIST="/etc/cfg.map" CFG_NAND_MAP="/dev/ada0g" @@ -24,14 +24,14 @@ cd ${2:-/etc} case "$1" in load) - CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'` + CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("/dev/%s", $3); }'` CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $2 * 512); }'` imgupd -gs ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} | \ gunzip 2>&- | cpio -iud 2>&- || die "ERROR:: config load" ;; save) - CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'` + CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("/dev/%s", $3); }'` CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $2 * 512); }'` if [ ! -r ${CFG_NAND_LIST} ]; then @@ -47,14 +47,14 @@ case "$1" in imgupd -is ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} || die "ERROR:: config save" ;; erase) - CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'` + CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("/dev/%s", $3); }'` CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $2 * 512); }'` imgupd -is ${CFG_NAND_SIZE} -f ${CFG_NAND_MAP} /dev/zero || die "ERROR:: config erase" echo "Config NAND was erased!" ;; restore) - CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'` + CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("/dev/%s", $3); }'` CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $2 * 512); }'` ELWIX_REMOTE_HOST=`cat /etc/myelwix` @@ -71,7 +71,7 @@ case "$1" in echo "ELWIX restore process complete. Now rebooting system ..." ;; backup) - CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $3); }'` + CFG_NAND_MAP=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("/dev/%s", $3); }'` CFG_NAND_SIZE=`gpart show -p | awk '(NR == 1) { disk = $4; } ($3 == disk"g") { printf("%s", $2 * 512); }'` ELWIX_REMOTE_HOST="/tmp/${ELWIX_CFG_BACKUP_NAME}"