Diff for /elwix/install2img.sh between versions 1.8.4.2 and 1.8.4.3

version 1.8.4.2, 2017/06/21 13:00:48 version 1.8.4.3, 2017/06/21 14:42:31
Line 159  mkbak2() Line 159  mkbak2()
                         echo "Failed!"                          echo "Failed!"
                         exit 8                          exit 8
                 fi                  fi
           else
                   echo "+++ Make ELWIX OS system image partion for upgrade into ${REL}/sys4up_${IMGNAME}.bin ..."
                   if dd if=/dev/${1}a of=${REL}/sys4up_${IMGNAME}.bin; then
                           echo "OK"
                   else
                           echo "Failed!"
                           exit 9
                   fi
         fi          fi
   
        echo "+++ Make ELWIX OS system image partion for upgrade into ${REL}/sys4up_${IMGNAME}.bin ..."        if [ ! -f ${REL}/sys4up_${IMGNAME}.bin ]; then
        if dd if=/dev/${1}a of=${REL}/sys4up_${IMGNAME}.bin; then                echo "+++ Make ELWIX OS system image partion for upgrade into ${REL}/sys4up_${IMGNAME}.bin ..."
                echo "OK"                if dd if=/dev/${1}a of=${REL}/sys4up_${IMGNAME}.bin; then
        else                        echo "OK"
                echo "Failed!"                else
                exit 9                        echo "Failed!"
                         exit 9
                 fi
         fi          fi
 }  }
   
Line 193  if [ -z "$1" -o ! -r "$1" ]; then Line 203  if [ -z "$1" -o ! -r "$1" ]; then
         exit 2          exit 2
 else  else
         IMGNAME=$(basename $1 | sed -e "s/.tar.gz//")          IMGNAME=$(basename $1 | sed -e "s/.tar.gz//")
        MD5CHK="${REL}/${IMGNAME}.md5"        MD5CHK="${REL}/${IMGNAME}${3:+"_2nd"}.md5"
        SHA1CHK="${REL}/${IMGNAME}.sha1"        SHA1CHK="${REL}/${IMGNAME}${3:+"_2nd"}.sha1"
        IMG="${REL}/${IMGNAME}.img"        IMG="${REL}/${IMGNAME}${3:+"_2nd"}.img"
 fi  fi
   
 mkdevice $IMG ${2:-"${IMG_SIZE}"}  mkdevice $IMG ${2:-"${IMG_SIZE}"}
Line 210  cleandev $DEV Line 220  cleandev $DEV
 gencksum $IMG $MD5CHK $SHA1CHK  gencksum $IMG $MD5CHK $SHA1CHK
 gencksum ${REL}/sys4up_${IMGNAME}.bin ${REL}/sys4up_${IMGNAME}.md5 ${REL}/sys4up_${IMGNAME}.sha1  gencksum ${REL}/sys4up_${IMGNAME}.bin ${REL}/sys4up_${IMGNAME}.md5 ${REL}/sys4up_${IMGNAME}.sha1
   
echo "ELWIX OS image $IMGNAME complete."echo "ELWIX OS image ${IMGNAME}${3:+"_2nd"} complete."

Removed from v.1.8.4.2  
changed lines
  Added in v.1.8.4.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>