From b97ce22691e1ffb34f2bc3638ea44a69baa052e4 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 12 Mar 2010 08:12:04 -0800
Subject: Run partition editor with script flag to avoid prompting user

Bug 5443
When running on HyperV, install-system appeared to hang because
although hda existed, it had no information so parted was prompting
for retry.  Use the -s flag (never prompt) at all the places
in install-system/install-image where we don't want to have
user interaction.
---
 scripts/install/install-functions | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'scripts/install/install-functions')

diff --git a/scripts/install/install-functions b/scripts/install/install-functions
index 07f385fa..ff4d6f48 100755
--- a/scripts/install/install-functions
+++ b/scripts/install/install-functions
@@ -132,16 +132,16 @@ get_drive_size () {
   ldrive=$1
 
   # Make sure you can print disk info using parted
-  parted /dev/$ldrive p >/dev/null 2>&1
+  parted --script /dev/$ldrive p >/dev/null 2>&1
 
   # If unable to read disk, it's likely it needs a disklabel
   if [  "$?" != "0" ]; then
     lecho "Creating a new disklabel on $ldrive"
     lecho "parted /dev/$ldrive mklabel msdos"
-    output=$(parted /dev/$ldrive mklabel msdos)
+    output=$(parted -s /dev/$ldrive mklabel msdos)
 
     # Get the drive size from parted
-    lsize=$(parted /dev/$ldrive p | grep "^Disk" | awk '{ print $3 }')
+    lsize=$(parted -s /dev/$ldrive p | grep "^Disk" | awk '{ print $3 }')
 
     if [ $(echo $lsize | grep error) ]; then
       echo "Unable to read disk label.  Exiting."
@@ -150,7 +150,7 @@ get_drive_size () {
   fi
 
   # Get the drive size from parted
-  lsize=$(parted /dev/$ldrive p | grep "^Disk" | awk '{ print $3 }')
+  lsize=$(parted -s /dev/$ldrive p | grep "^Disk" | awk '{ print $3 }')
   # Get the reported units (mB, GB, kB)
   lmodifier=$(echo $lsize | sed 's/[0-9\.]//g')
   # remove the modifier
@@ -177,7 +177,7 @@ probe_drives () {
     if [ $(cat /sys/block/$drive/ro) -ne 0 ]; then
       output=$(mount | grep $drive)
       if [ -z "$output" ]; then
-        output=$(parted /dev/$drive p)
+        output=$(parted -s /dev/$drive p)
       fi
     fi
   done
-- 
cgit v1.2.3