[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5208ceedd90d01acc3cb0ef9b34903d449aedb9a

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2151 bytes --]

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  5208ceedd90d01acc3cb0ef9b34903d449aedb9a (commit)
      from  17d270d5c95c63b9029b3a0e87820b7d59e7da36 (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 5208ceedd90d01acc3cb0ef9b34903d449aedb9a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Apr 11 10:20:00 2016 +0100

    installer: Force overwriting EXT4 FS
    
    On 64 bit systems, the installation fails if a previous XFS FS
    is detected on the partition an EXT4 FS should be formatted.
    
    This does not happen on 32 bit systems.
    
    Fixes: #11091
    
    Reported-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Tested-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>

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

Summary of changes:
 src/installer/hw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/src/installer/hw.c b/src/installer/hw.c
index 92d0ae5..362be47 100644
--- a/src/installer/hw.c
+++ b/src/installer/hw.c
@@ -747,11 +747,11 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {
 
 	// EXT4
 	} else if (fs == HW_FS_EXT4) {
-		snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -T ext4 %s", path);
+		snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 %s", path);
 
 	// EXT4 w/o journal
 	} else if (fs == HW_FS_EXT4_WO_JOURNAL) {
-		snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -T ext4 -O ^has_journal %s", path);
+		snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 -O ^has_journal %s", path);
 
 	// XFS
 	} else if (fs == HW_FS_XFS) {


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