summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-05-06 20:23:01 -0400
committerAndrew Cady <d@jerkface.net>2020-05-06 20:23:01 -0400
commiteab4091ba437ed510d0c9fbad7e7fcb50d864c0b (patch)
treeded0350c3f49579ec92d8db5d698c2a14721c2cd
parent3ce680a3821a8c1ff75018f4468649be1bb64f74 (diff)
initrd: call samizdat_install_udev_rules earlier
-rw-r--r--initramfs-tools/scripts/samizdat1
-rw-r--r--src/initrd/common.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 85fbc7b..f0d1546 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -32,6 +32,7 @@ mountroot()
32 wait_for_gnupghome_tar 32 wait_for_gnupghome_tar
33 fi 33 fi
34 34
35 samizdat_install_udev_rules
35 bootwait samizdat-gpg 36 bootwait samizdat-gpg
36 bootmenu 37 bootmenu
37 bootwait root-mounted 38 bootwait root-mounted
diff --git a/src/initrd/common.sh b/src/initrd/common.sh
index 17c9359..070ecba 100644
--- a/src/initrd/common.sh
+++ b/src/initrd/common.sh
@@ -62,7 +62,7 @@ bootmenu()
62 if [ $? != 0 -a ! "$no_panic" ]; then 62 if [ $? != 0 -a ! "$no_panic" ]; then
63 panic "error loading boot menu! the system won't be usable :(" 63 panic "error loading boot menu! the system won't be usable :("
64 fi 64 fi
65 samizdat_install_udev_rules 65
66 if [ "$do_trigger" ]; then 66 if [ "$do_trigger" ]; then
67 force_grok_block 67 force_grok_block
68 fi 68 fi