--- elwix/install2img.sh 2013/08/01 15:02:06 1.6.2.2 +++ elwix/install2img.sh 2013/08/05 09:12:38 1.6.2.4 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: install2img.sh,v 1.6.2.2 2013/08/01 15:02:06 misho Exp $ +# $Id: install2img.sh,v 1.6.2.4 2013/08/05 09:12:38 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -129,21 +129,26 @@ gencksum() ### main() -if [ ! -r ${REL}/${BASE_OS} ]; then +if [ -z "$1" -o ! -r "$1" ]; then echo - echo "Error:: ELWIX OS file not found!" + echo "Error:: ELWIX OS tar file not found!" echo exit 2 +else + IMGNAME=$(basename $1 | sed -e "s/.tar.gz//") + MD5CHK="${REL}/${IMGNAME}.md5" + SHA1CHK="${REL}/${IMGNAME}.sha1" + IMG="${REL}/${IMGNAME}.img" fi -mkdevice $IMG ${1:-"${IMG_SIZE}"} +mkdevice $IMG ${2:-"${IMG_SIZE}"} initdev $DEV mountdev $DEV -install2 ${REL}/${BASE_OS} +install2 $1 umountdev #enablejfs $DEV boot2dev $DEV cleandev $DEV gencksum $IMG $MD5CHK $SHA1CHK -echo "ELWIX OS image complete." +echo "ELWIX OS image $IMGNAME complete."