diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install-system | 18 | ||||
| -rwxr-xr-x | scripts/install/install-get-partition | 16 | ||||
| -rwxr-xr-x | scripts/vyatta-bridge.pl | 4 |
3 files changed, 35 insertions, 3 deletions
diff --git a/scripts/install-system b/scripts/install-system index 536233d7..fbff5e1f 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -647,7 +647,7 @@ save_image_config() { if [ -n "$output" ]; then echo -e "Warning: error in copying the old config partition.\nSee $INSTALL_LOG for more details." - lecho "Warning: error in copying the old config partition.\ncp -pR /mnt/tmp/* /mnt/config\n$output\n" + echo "Warning: error in copying the old config partition.\ncp -pR /mnt/tmp/* /mnt/config\n$output\n" fi rename_old_config } @@ -840,6 +840,22 @@ create_partitions() { exit 1 fi + # Make sure you can print disk info using parted + parted --script /dev/$ldrive p >/dev/null 2>&1 + + # If unable to read disk, it's likely it needs a disklabel + if [ "$?" != "0" ]; then + echo "Creating a new disklabel on $ldrive" + echo "parted /dev/$ldrive mklabel msdos" + output=$(parted -s /dev/$ldrive mklabel msdos) + + parted --script /dev/$ldrive p >/dev/null 2>&1 + if [ "$?" != "0" ]; then + echo "Unable to read disk label. Exiting." + exit 1 + fi + fi + echo "Creating root partition on /dev/$ldrive" >> $INSTALL_LOG # make the root partition diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition index 86197708..594fa929 100755 --- a/scripts/install/install-get-partition +++ b/scripts/install/install-get-partition @@ -682,6 +682,22 @@ create_partitions() { exit 1 fi + # Make sure you can print disk info using parted + 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 -s /dev/$ldrive mklabel msdos) + + parted --script /dev/$ldrive p >/dev/null 2>&1 + if [ "$?" != "0" ]; then + echo "Unable to read disk label. Exiting." + exit 1 + fi + fi + lecho "Creating root partition on /dev/$ldrive" # make the root partition diff --git a/scripts/vyatta-bridge.pl b/scripts/vyatta-bridge.pl index 68d3e107..b1a3afaa 100755 --- a/scripts/vyatta-bridge.pl +++ b/scripts/vyatta-bridge.pl @@ -72,8 +72,8 @@ if ( $action eq 'SET' ) { foreach my $peth ($cfg->listNodes()) { my $link = $cfg->returnValue("$peth link"); - die "Error: can not add interface $slave to bridge already used by pseudo-ethernet $peth\n" - if ($link eq $slave); + die "Error: can not add interface $ifname to bridge already used by pseudo-ethernet $peth\n" + if ($link eq $ifname); } print "Adding interface $ifname to bridge $newbridge\n"; |