--- elwix/install2img.sh 2013/08/05 09:06:14 1.6.2.3 +++ elwix/install2img.sh 2013/08/05 13:10:16 1.7 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: install2img.sh,v 1.6.2.3 2013/08/05 09:06:14 misho Exp $ +# $Id: install2img.sh,v 1.7 2013/08/05 13:10:16 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -131,14 +131,17 @@ gencksum() if [ -z "$1" -o ! -r "$1" ]; then echo - echo "Error:: ELWIX OS tar file not found!" + echo "Error:: ELWIX OS tar file '$1' not found!" echo exit 2 else - IMGNAME=$(basename $1 | sed -e "s/.tar.gz/.img/") + IMGNAME=$(basename $1 | sed -e "s/.tar.gz//") + MD5CHK="${REL}/${IMGNAME}.md5" + SHA1CHK="${REL}/${IMGNAME}.sha1" + IMG="${REL}/${IMGNAME}.img" fi -mkdevice $IMGNAME ${2:-"${IMG_SIZE}"} +mkdevice $IMG ${2:-"${IMG_SIZE}"} initdev $DEV mountdev $DEV install2 $1 @@ -146,6 +149,6 @@ umountdev #enablejfs $DEV boot2dev $DEV cleandev $DEV -gencksum $IMGNAME $MD5CHK $SHA1CHK +gencksum $IMG $MD5CHK $SHA1CHK echo "ELWIX OS image $IMGNAME complete."