X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finstaller%2Fhw.c;h=71a1f1cce369fb027ce65a2e5b5ae919f4a6ae66;hb=d111587cc3b0007b35c09dd847d035e6ffadffc7;hp=c9b95017d3ced051a52043ac6e83551a9348821a;hpb=7fe5bc8261d639753ee7a5a005ce06325231769b;p=ipfire-2.x.git

diff --git a/src/installer/hw.c b/src/installer/hw.c
index c9b95017d3..71a1f1cce3 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -146,14 +146,7 @@ int hw_mount(const char* source, const char* target, const char* fs, int flags)
 		}
 	}
 
-	int r = mount(source, target, fs, flags, NULL);
-
-	if (r) {
-		fprintf(stderr, "Error mounting %s to %s (fs = %s, flags = %d): %s\n",
-				source, target, fs, flags, strerror(r));
-	}
-
-	return r;
+	return mount(source, target, fs, flags, NULL);
 }
 
 int hw_umount(const char* target) {
@@ -554,8 +547,10 @@ static int hw_calculate_partition_table(struct hw* hw, struct hw_destination* de
 
 		snprintf(dest->part_boot_efi, sizeof(dest->part_boot_efi),
 			"%s%d", path, part_idx++);
-	} else
+	} else {
 		*dest->part_boot_efi = '\0';
+		dest->part_boot_efi_idx = 0;
+	}
 
 	if (dest->size_swap > 0)
 		snprintf(dest->part_swap, sizeof(dest->part_swap), "%s%d", path, part_idx++);
@@ -713,7 +708,6 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) {
 		if (*dest->part_bootldr) {
 			asprintf(&cmd, "%s set %d bios_grub on", cmd, dest->part_boot_idx);
 		}
-		asprintf(&cmd, "%s disk_set pmbr_boot on", cmd);
 	}
 
 	r = mysystem(output, cmd);