From: Arne Fitzenreiter Date: Wed, 29 Jan 2014 23:20:26 +0000 (+0100) Subject: installer: add gpt support. X-Git-Tag: v2.15-beta2~50 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f26ff7f66a1973ed0cea142d9599073e22bddcf;p=ipfire-2.x.git installer: add gpt support. --- diff --git a/config/rootfiles/installer/parted b/config/rootfiles/installer/parted new file mode 120000 index 0000000000..dc6967423d --- /dev/null +++ b/config/rootfiles/installer/parted @@ -0,0 +1 @@ +../packages/parted \ No newline at end of file diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 52b5c8ceae..0a86bb0b49 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -372,7 +372,14 @@ int main(int argc, char *argv[]) fclose(handle); - snprintf(commandstring, STRING_SIZE, "/sbin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk); + if (disk < 2097150) { + // <2TB use sfdisk and normal mbr + snprintf(commandstring, STRING_SIZE, "/sbin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk); + } else { + // >2TB use parted with gpt + snprintf(commandstring, STRING_SIZE, "/usr/sbin/parted -s %s mklabel gpt mkpart boot ext2 1M 64M mkpart swap linux-swap 64M 1000M mkpart root ext4 1000M 5000M mkpart var ext4 5000M 100%% disk_set pmbr_boot on", hdparams.devnode_disk); + } + if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK])) { errorbox(ctr[TR_UNABLE_TO_PARTITION]);