Skip to content

Commit 13572c9

Browse files
committed
ref(*): format devices as ext4 instead of btrfs
We also set the inode and block size here as recommended by CoreOS, so the Docker volume has the maximum inodes available.
1 parent dd39b48 commit 13572c9

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

contrib/azure/azure-user-data-template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ coreos:
1111
Type=oneshot
1212
RemainAfterExit=yes
1313
ExecStart=/usr/sbin/wipefs -f /dev/sdc
14-
ExecStart=/usr/sbin/mkfs.btrfs -f /dev/sdc
14+
ExecStart=/usr/sbin/mkfs.ext4 -i 4096 -b 4096 /dev/sdc
1515
ExecStart=/bin/touch /etc/azure-formatted
1616
- name: var-lib-docker.mount
1717
command: start
@@ -24,4 +24,4 @@ coreos:
2424
[Mount]
2525
What=/dev/sdc
2626
Where=/var/lib/docker
27-
Type=btrfs
27+
Type=ext4

contrib/ec2/gen-json.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Type=oneshot
1515
RemainAfterExit=yes
1616
ExecStart=/usr/sbin/wipefs -f /dev/xvdb
17-
ExecStart=/usr/sbin/mkfs.ext4 /dev/xvdb
17+
ExecStart=/usr/sbin/mkfs.ext4 -i 4096 -b 4096 /dev/xvdb
1818
ExecStart=/bin/touch /etc/ephemeral-volume-formatted
1919
'''
2020
MOUNT_EPHEMERAL_VOLUME = '''
@@ -47,7 +47,7 @@
4747
Type=oneshot
4848
RemainAfterExit=yes
4949
ExecStart=/usr/sbin/wipefs -f /dev/xvdf
50-
ExecStart=/usr/sbin/mkfs.btrfs -f /dev/xvdf
50+
ExecStart=/usr/sbin/mkfs.ext4 -i 4096 -b 4096 /dev/xvdf
5151
ExecStart=/bin/touch /etc/docker-volume-formatted
5252
'''
5353
MOUNT_DOCKER_VOLUME = '''
@@ -59,7 +59,7 @@
5959
[Mount]
6060
What=/dev/xvdf
6161
Where=/var/lib/docker
62-
Type=btrfs
62+
Type=ext4
6363
'''
6464

6565
new_units = [

contrib/gce/gce-user-data-template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ coreos:
1111
Type=oneshot
1212
RemainAfterExit=yes
1313
ExecStart=/usr/sbin/wipefs -f /dev/disk/by-id/scsi-0Google_PersistentDisk_coredocker
14-
ExecStart=/usr/sbin/mkfs.btrfs -f /dev/disk/by-id/scsi-0Google_PersistentDisk_coredocker
14+
ExecStart=/usr/sbin/mkfs.ext4 -i 4096 -b 4096 /dev/disk/by-id/scsi-0Google_PersistentDisk_coredocker
1515
ExecStart=/bin/touch /etc/gce-formatted
1616
- name: var-lib-docker.mount
1717
command: start
@@ -24,4 +24,4 @@ coreos:
2424
[Mount]
2525
What=/dev/disk/by-id/scsi-0Google_PersistentDisk_coredocker
2626
Where=/var/lib/docker
27-
Type=btrfs
27+
Type=ext4

0 commit comments

Comments
 (0)