[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4f26ff7f66a1973ed0cea142d9599073
From:       git () ipfire ! org (Arne Fitzenreiter)
Date:       2014-01-29 23:22:47
Message-ID: 20140129232248.1A46520201 () argus ! ipfire ! org
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  4f26ff7f66a1973ed0cea142d9599073e22bddcf (commit)
      from  11a47ed33b0cd16036e490d0cf01cc5ec76e3b83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f26ff7f66a1973ed0cea142d9599073e22bddcf
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date:   Thu Jan 30 00:20:26 2014 +0100

    installer: add gpt support.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/installer/parted | 1 +
 src/install+setup/install/main.c  | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 120000 config/rootfiles/installer/parted

Difference in files:
diff --git a/config/rootfiles/installer/parted b/config/rootfiles/installer/parted
new file mode 120000
index 0000000..dc69674
--- /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 52b5c8c..0a86bb0 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]);


hooks/post-receive
--
IPFire 2.x development tree


[prev in list] [next in list] [prev in thread] [next in thread]