From 9fc867629f703ddd12324e5a7789ab5b98334c9c Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Mon, 12 Dec 2016 10:36:49 -0800
Subject: [PATCH] Improve mkfs options

- make quiet
- force, so some adjustments are not checked see https://github.com/docker/pinata/issues/6198
- set resize_inode as we do resize partitions on cloud and they could have very few inodes otherwise
- inline all the default options and remove the config file, so script is more standalone

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 alpine/etc/mke2fs.conf                        | 52 -------------------
 .../packages/automount/etc/init.d/automount   |  4 +-
 2 files changed, 3 insertions(+), 53 deletions(-)
 delete mode 100644 alpine/etc/mke2fs.conf

diff --git a/alpine/etc/mke2fs.conf b/alpine/etc/mke2fs.conf
deleted file mode 100644
index b9e800cc5..000000000
--- a/alpine/etc/mke2fs.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-[defaults]
-	base_features = sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr
-	default_mntopts = acl,user_xattr
-	enable_periodic_fsck = 0
-	blocksize = 4096
-	inode_size = 256
-	inode_ratio = 16384
-
-[fs_types]
-	ext3 = {
-		features = has_journal
-	}
-	ext4 = {
-		features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize
-		inode_size = 256
-	}
-	ext4dev = {
-		features = has_journal,extent,huge_file,flex_bg,inline_data,64bit,dir_nlink,extra_isize
-		inode_size = 256
-		options = test_fs=1
-	}
-	small = {
-		blocksize = 1024
-		inode_size = 128
-		inode_ratio = 4096
-	}
-	floppy = {
-		blocksize = 1024
-		inode_size = 128
-		inode_ratio = 8192
-	}
-	big = {
-		inode_ratio = 32768
-	}
-	huge = {
-		inode_ratio = 65536
-	}
-	news = {
-		inode_ratio = 4096
-	}
-	largefile = {
-		inode_ratio = 1048576
-		blocksize = -1
-	}
-	largefile4 = {
-		inode_ratio = 4194304
-		blocksize = -1
-	}
-	hurd = {
-	     blocksize = 4096
-	     inode_size = 128
-	}
diff --git a/alpine/packages/automount/etc/init.d/automount b/alpine/packages/automount/etc/init.d/automount
index 23075fba4..24b654371 100755
--- a/alpine/packages/automount/etc/init.d/automount
+++ b/alpine/packages/automount/etc/init.d/automount
@@ -71,7 +71,9 @@ do_mkfs()
 	blockdev --rereadpt $diskdev 2> /dev/null
 	mdev -s
 
-	mkfs.ext4 ${diskdev}1
+	FSOPTS="-O resize_inode,has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize"
+
+	mkfs.ext4 -q -F $FSOPTS ${diskdev}1
 
 	mount ${diskdev}1 /var
 }