diff options
Diffstat (limited to 'scripts/install')
| -rwxr-xr-x | scripts/install/install-functions | 10 | ||||
| -rwxr-xr-x | scripts/install/install-get-partition | 8 |
2 files changed, 9 insertions, 9 deletions
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 diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index 250cec68..f010291e 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -290,7 +290,7 @@ check_for_new_raid () { sfdisk --change-id /dev/$drive $data_dev 0xfd # mark data partition as bootable lecho "Marking /dev/$drive partition $data_dev bootable" - output=$(parted /dev/$drive set $data_dev boot on 2>&1) + output=$(parted -s /dev/$drive set $data_dev boot on 2>&1) lecho "$output" done @@ -629,7 +629,7 @@ delete_partitions () { fi lecho "Removing partition $lpart on /dev/$ldrive" - output=$(parted /dev/$ldrive rm $lpart) + output=$(parted -s /dev/$ldrive rm $lpart) status=$? if [ "$status" != 0 ]; then echo -e "Warning: cannot delete partition $lpart on $ldrive.\n" @@ -683,7 +683,7 @@ create_partitions() { lecho "Creating root partition on /dev/$ldrive" # make the root partition - output=$(parted /dev/$ldrive mkpart primary $start_offset $root_part_size) + output=$(parted -s /dev/$ldrive mkpart primary $start_offset $root_part_size) status=$? if [ "$status" != 0 ]; then echo -e "Error creating primary partition on $ldrive.\nPlease see $INSTALL_LOG for more details.\nExiting..." @@ -842,7 +842,7 @@ setup_method_auto () { create_partitions "$INSTALL_DRIVE" "$root_part_size" 0 "yes" # mark data partition as bootable lecho "Marking /dev/$INSTALL_DRIVE partition 1 as bootable" - output=$(parted /dev/$INSTALL_DRIVE set 1 boot on 2>&1) + output=$(parted -s /dev/$INSTALL_DRIVE set 1 boot on 2>&1) lecho "$output" # Must give partition device time to settle sleep 5 |