]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
installer: add gpt support.
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 29 Jan 2014 23:20:26 +0000 (00:20 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 29 Jan 2014 23:20:26 +0000 (00:20 +0100)
config/rootfiles/installer/parted [new symlink]
src/install+setup/install/main.c

diff --git a/config/rootfiles/installer/parted b/config/rootfiles/installer/parted
new file mode 120000 (symlink)
index 0000000..dc69674
--- /dev/null
@@ -0,0 +1 @@
+../packages/parted
\ No newline at end of file
index 52b5c8ceae0b5096ebd551143b723eb7bb7d3088..0a86bb0b49120f9bb7b8c607e69ef72857cd7d49 100644 (file)
@@ -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]);