Drop several Dracut modules and add boot.mount

README.md

@@ -17,12 +17,6 @@
 
 This repo holds custom dracut modules required by Flatcar Container Linux
 
-## Running tests
-
-```
-./test
-```
-
 ## Code of Conduct
 
 In the interest of promoting a fair, diverse, and open community, Kinvolk uses its [Code of Conduct](https://github.com/kinvolk/contribution/blob/master/CODE_OF_CONDUCT.md) for all its projects and events.

dracut/51diskless-generator/diskless-generator

@@ -43,8 +43,8 @@ if [[ -z "${usr}" && -f /usr.squashfs ]]; then
 
 [Unit]
 Before=initrd-root-fs.target
-Wants=remount-sysroot.service
-After=remount-sysroot.service
+Wants=ignition-remount-sysroot.service
+After=ignition-remount-sysroot.service
 # Make sure the loop device nodes are available
 Wants=systemd-tmpfiles-setup-dev-early.service
 After=systemd-tmpfiles-setup-dev-early.service

dracut/51diskless-generator/module-setup.sh

@@ -4,7 +4,6 @@
 
 depends() {
     echo systemd
-    echo usr-generator
 }
 
 install() {