Merge pull request #57 from random-archer/dev-dropbear-password

dropbear password
random-archer · Apr 13, 2020 · b6d2824 · b6d2824
2 parents 8c75e2f + 2239f31
commit b6d2824
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/src/initrd-dropbear.service b/src/initrd-dropbear.service
@@ -5,7 +5,7 @@
 # note:
 # mutually exclusive with initrd-tinysshd.service
 
-# note: 
+# note:
 # for possible issues see
 # - https://github.com/random-archer/mkinitcpio-systemd-tool/issues/21
 
@@ -68,12 +68,17 @@ InitrdPath=/var/log/lastlog create=yes
 
 # note:
 # to enable root password login with dropbear,
-# provide system unit override with these lines uncommented:
-#
-#[Service] 
-#ExecStart=
-#ExecStart=/bin/dropbear -j -k -F -p ${SSHD_PORT}
+# provide system unit overrides with these lines uncommented:
+
+# shell unit: /etc/systemd/system/initrd-shell.service.d/override.conf
 #
 #[X-SystemdTool]
 #InitrdBuild=/usr/lib/mkinitcpio-systemd-tool/initrd-build.sh command=do_root_login_enable
 #
+
+# dropbear unit: /etc/systemd/system/initrd-dropbear.service.d/override.conf
+#
+#[Service]
+#ExecStart=
+#ExecStart=/bin/dropbear -j -k -F -p ${SSHD_PORT}
+#
diff --git a/tool/image/test/dropbear/test_base/usr/lib/systemd/system/initrd-dropbear.service b/tool/image/test/dropbear/test_base/usr/lib/systemd/system/initrd-dropbear.service
@@ -6,7 +6,7 @@
 # note:
 # mutually exclusive with initrd-tinysshd.service
 
-# note: 
+# note:
 # for possible issues see
 # - https://github.com/random-archer/mkinitcpio-systemd-tool/issues/21
 
@@ -69,16 +69,21 @@ InitrdPath=/var/log/lastlog create=yes
 
 # note:
 # to enable root password login with dropbear,
-# provide system unit override with these lines uncommented:
-#
-#[Service] 
-#ExecStart=
-#ExecStart=/bin/dropbear -j -k -F -p ${SSHD_PORT}
+# provide system unit overrides with these lines uncommented:
+
+# shell unit: /etc/systemd/system/initrd-shell.service.d/override.conf
 #
 #[X-SystemdTool]
 #InitrdBuild=/usr/lib/mkinitcpio-systemd-tool/initrd-build.sh command=do_root_login_enable
 #
 
+# dropbear unit: /etc/systemd/system/initrd-dropbear.service.d/override.conf
+#
+#[Service]
+#ExecStart=
+#ExecStart=/bin/dropbear -j -k -F -p ${SSHD_PORT}
+#
+
 # /etc/systemd/system/initrd-dropbear.service.d/override.conf