Skip to content

Commit cff3ae5

Browse files
Update crypttab/fstab documentation.
1 parent ce1d6d1 commit cff3ae5

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

crypttab

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
# This file is part of https://github.com/random-archer/mkinitcpio-systemd-tool
22

3-
# crypttab: mappings for encrypted partitions
3+
# crypttab: mappings for encrypted partitions in initramfs
4+
# file location in real root: /etc/mkinitcpio.d/crypttab
5+
# file location in initramfs: /etc/crypttab
46

57
# crypttab format:
68
# https://wiki.archlinux.org/index.php/Dm-crypt/System_configuration#crypttab
79

810
# how crypttab is used by systemd
911
# https://www.freedesktop.org/software/systemd/man/systemd-cryptsetup-generator.html
12+
# https://github.com/systemd/systemd/blob/master/src/cryptsetup/cryptsetup-generator.c
13+
14+
# note: use password=none to force cryptsetup password agent prompt
1015

1116
# provide here mapper partition UUID (instead of kernel command line)
1217

13-
# <name> <device> <password> <options>
14-
# root UUID=${UUID_ROOT} none luks
15-
# swap UUID=${UUID_SWAP} none luks
18+
# <mapper-name> <block-device> <password/keyfile> <crypto-options>
19+
# root UUID={{UUID_ROOT}} none luks
20+
# swap UUID={{UUID_SWAP}} none luks

fstab

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# This file is part of https://github.com/random-archer/mkinitcpio-systemd-tool
22

3-
# fstab: mappings for direct partitions
3+
# fstab: mappings for direct partitions in initramfs
4+
# file location in real root: /etc/mkinitcpio.d/fstab
5+
# file location in initramfs: /etc/fstab
46

57
# fstab format:
68
# https://wiki.archlinux.org/index.php/Fstab
@@ -9,10 +11,11 @@
911
# https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html
1012
# https://github.com/systemd/systemd/blob/master/src/fstab-generator/fstab-generator.c
1113

12-
# note: provide /sysroot/ folder inside initramfs disk image
14+
# note: provide /sysroot folder inside initramfs disk image
1315
# note: remove "root=/dev/mapper/root" stanza from kernel command line
1416

15-
# provide here root partition description (instead of kernel command line)
17+
# provide here root partition mapping (instead of kernel command line)
1618

17-
# <file system> <dir> <type> <option> <dump> <pass>
18-
# /dev/mapper/root /sysroot auto x-systemd.device-timeout=9999h 0 1
19+
# <block-device> <mount-point> <fs-type> <mount-options> <dump> <fsck>
20+
# /dev/mapper/root /sysroot auto x-systemd.device-timeout=9999h 0 1
21+
# /dev/mapper/swap none swap x-systemd.device-timeout=9999h 0 0

0 commit comments

Comments
 (0)