develop

Author: Andrei-Pozolotin

fstab

@@ -2,7 +2,7 @@
 
 # TODO
 # currently systemd requires use of "root=" kenel argument for /sysroot mount
-# https://github.com/systemd/systemd/blob/master/src/fstab-generator/fstab-generator.c
+# http://unix.stackexchange.com/questions/289672/kernel-init-without-root-parameter
 
 # fstab: mappings for direct partitions
 
@@ -11,9 +11,10 @@
 
 # how fstab is used by systemd
 # https://www.freedesktop.org/software/systemd/man/systemd-fstab-generator.html
+# https://github.com/systemd/systemd/blob/master/src/fstab-generator/fstab-generator.c
 
 # provide here root partition description (instead of kernel command line)
 
-#  <file system>        <dir>      <type>    <option      <dump> <pass>
-#  /dev/mapper/swap     none        swap      defaults            0 0
-#  /dev/mapper/root     /sysroot    ext4      defaults,ro         0 1
+#  <file system>        <dir>      <type>    <option>         <dump> <pass>
+#  /dev/mapper/swap     none        swap      defaults           0     0
+#  /dev/mapper/root     /sysroot    ext4      defaults,ro        0     1

initrd-cryptsetup.path

@@ -0,0 +1,28 @@
+# This file is part of https://github.com/random-archer/mkinitcpio-systemd-tool
+
+[Unit]
+Description=Initrd Cryptsetup Path
+Documentation=https://github.com/random-archer/mkinitcpio-systemd-tool/blob/master/README.md
+ConditionPathExists=/etc/crypttab
+ConditionPathExists=/etc/initrd-release
+#ConditionPathExists=!/run/plymouth/pid
+DefaultDependencies=no
+Conflicts=shutdown.target
+After=plymouth-start.service
+Before=paths.target shutdown.target
+
+[Path]
+MakeDirectory=yes
+DirectoryNotEmpty=/run/systemd/ask-password
+
+[Install]
+WantedBy=sysinit.target
+
+[X-SystemdTool]
+
+# enable service
+InitrdService=enable
+
+# disable default password agents
+InitrdPath=/usr/lib/systemd/system/systemd-ask-password-console.path replace=yes create=yes
+InitrdPath=/usr/lib/systemd/system/systemd-ask-password-wall.path    replace=yes create=yes

initrd-cryptsetup.service

@@ -28,14 +28,8 @@ StandardOutput=inherit
 StandardError=inherit
 TTYPath=/dev/console
 
-[Install]
-WantedBy=sysinit.target
-
 [X-SystemdTool]
 
-# enable service
-InitrdService=enable
-
 # provision disk tables in initramfs
 InitrdPath=/etc/crypttab source=/etc/mkinitcpio.d/crypttab replace=yes
 InitrdPath=/etc/fstab    source=/etc/mkinitcpio.d/fstab    replace=yes

initrd-shell.service

@@ -33,9 +33,9 @@ InitrdBinary=/usr/bin/journalctl
 InitrdLink=/root/.profile /etc/systemd/system/initrd-shell.sh
 
 # configure user settings
-InitrdPath=/etc/group
-InitrdPath=/etc/passwd
-InitrdPath=/etc/shadow
+InitrdPath=/etc/group  replace=yes
+InitrdPath=/etc/passwd replace=yes
+InitrdPath=/etc/shadow replace=yes
 InitrdBuild=/etc/systemd/system/initrd-build.sh command=do_root_shell
 InitrdBuild=/etc/systemd/system/initrd-build.sh command=do_secret_clean
 

initrd-shell.sh

@@ -262,6 +262,7 @@ service_default() {
 # cryptsetup service implementation
 service_cryptsetup() {
     log_info "cryptsetup service" 
+    [[ $watch_folder ]] || log_error "missing $watch_folder"
     if has_crypt_jobs ; then
         run_crypt_jobs
     else
@@ -379,7 +380,6 @@ setup_interrupts() {
 # respond depending on script invocation type [script_entry=xxx]
 process_invocation() {
     log_info "init"
-    mkdir -p "$watch_folder" || log_error "can not make $watch_folder"
     case "$script_entry" in
         # development
         exit)     do_exit ;;