From 385a59c4a26923721fd65fa023c48ca1c803d092 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 18 Nov 2011 14:59:53 -0600
Subject: [PATCH] the diff between setup_sdcard.sh is getting to big, lets
 merge alot of code, therefore this script now has to be run as root/sudo

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 8786503..72deacc 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -63,6 +63,19 @@ SQUEEZE_MD5SUM="b0caf7d86e9dc37e8d5b8c39d47c4884"
 DIR=$PWD
 TEMPDIR=$(mktemp -d)
 
+function check_root {
+
+if [[ $UID -ne 0 ]]; then
+ echo "$0 must be run as sudo user or root"
+ exit
+fi
+
+}
+
+function find_issue {
+
+check_root
+
 #Software Qwerks
 #fdisk 2.18.x/2.19.x, dos no longer default
 unset FDISK_DOS
@@ -83,6 +96,8 @@ if sudo parted -v | grep parted | grep 2.[1-3] >/dev/null ; then
  PARTED_ALIGN="--align cylinder"
 fi
 
+}
+
 function detect_software {
 
 echo "This script needs:"
@@ -1141,6 +1156,8 @@ function checkparm {
     fi
 }
 
+IN_VALID_UBOOT=1
+
 # parse commandline options
 while [ ! -z "$1" ]; do
     case $1 in
@@ -1150,7 +1167,7 @@ while [ ! -z "$1" ]; do
             ;;
         --probe-mmc)
             MMC="/dev/idontknow"
-            detect_software
+            check_root
             check_mmc
             ;;
         --mmc)
@@ -1160,7 +1177,7 @@ while [ ! -z "$1" ]; do
             then
 	        PARTITION_PREFIX="p"
             fi
-            detect_software
+            find_issue
             check_mmc 
             ;;
         --uboot)
@@ -1218,6 +1235,9 @@ if [ "$IN_VALID_UBOOT" ] ; then
     usage
 fi
 
+ find_issue
+ detect_software
+
  boot_files_template
  set_defaults
  dl_xload_uboot