[Astlinux-commits] SF.net SVN: astlinux:[7503] branches/1.0

[<abe...@us...>]

Revision: 7503
          http://sourceforge.net/p/astlinux/code/7503
Author:   abelbeck
Date:     2016-02-03 14:20:05 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
runnix-iso, generate install-image '.sha1' files and validate them on install

Modified Paths:
--------------
    branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
    branches/1.0/scripts/build-runnix-iso

Modified: branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu	2016-02-03 12:37:17 UTC (rev 7502)
+++ branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu	2016-02-03 14:20:05 UTC (rev 7503)
@@ -75,9 +75,22 @@
     12 60 3 $(menu_disk)
 }
 
+validate_image_file()
+{
+  local image="$1"
+
+  cd "$(dirname "$image")"
+
+  if sha1sum -cs "${image}.sha1" 2>/dev/null; then
+    echo "true"
+  else
+    echo "false"
+  fi
+}
+
 install_disk()
 {
-  local disk="$1" image="$2"
+  local disk="$1" image="$2" valid
 
   if [ ! -e "$disk" ]; then
     display_msg "Disk '$disk' does not exist.\nExiting, no action performed."
@@ -89,16 +102,30 @@
     return 1
   fi
 
-  display_progress "Step 1 of 2: Erasing first 1 GB of '$disk'\nThis may take a long time..."
+  if [ ! -f "${image}.sha1" ]; then
+    display_msg "SHA1 '${image##*/}.sha1' does not exist.\nExiting, no action performed."
+    return 1
+  fi
+
+  display_progress "Step 1 of 3: Validating AstLinux Image..."
   sleep 1
 
+  valid="$(validate_image_file "$image")"
+  if [ "$valid" != "true" ]; then
+    display_msg "Error validating AstLinux Image.\nExiting, no action performed."
+    return 1
+  fi
+
+  display_progress "Step 2 of 3: Erasing first 1 GB of '$disk'\nThis may take a long time..."
+  sleep 1
+
   dd if=/dev/zero of=$disk bs=64k count=16000 >/dev/null 2>/dev/null
   if [ $? -ne 0 ]; then
     display_msg "Error zero'ing first 1 GB.\nInstall failed !"
     return 1
   fi
 
-  display_progress "Step 2 of 2: Writing AstLinux Image to '$disk'\nThis may take a long time..."
+  display_progress "Step 3 of 3: Writing AstLinux Image to '$disk'\nThis may take a long time..."
   sleep 1
 
   zcat "$image" | dd of=$disk bs=64k >/dev/null 2>/dev/null

Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso	2016-02-03 12:37:17 UTC (rev 7502)
+++ branches/1.0/scripts/build-runnix-iso	2016-02-03 14:20:05 UTC (rev 7503)
@@ -3,7 +3,7 @@
 # build-runnix-iso install_image.img.gz|install_image_dir [serial]
 #
 
-REQUIRED_CMDS="which sudo genisoimage"
+REQUIRED_CMDS="which sudo genisoimage sha1sum"
 
 CONFIG="runnix-iso.config"
 
@@ -15,6 +15,20 @@
 
 SYSLINUX_DIR="output/build/syslinux-${SYSLINUX_VERSION// /}"
 
+gen_image_sha1_files()
+{
+  local dir="$1" image images IFS
+  (
+    cd "$dir"
+    images="$(ls -1 *.img.gz 2>/dev/null)"
+
+    IFS=$'\n'
+    for image in $images; do
+      sha1sum "${image}" > "${image}.sha1"
+    done
+  )
+}
+
 make_release_version()
 {
   RUNBASE="1.0"
@@ -55,6 +69,7 @@
   elif [ -n "$ISO_FILE" ]; then
     cp "$ISO_FILE" ${RUNDIR}/os/
   fi
+  gen_image_sha1_files ${RUNDIR}/os
 
   rm -f ${ISO_NAME}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.