Skip to content

Commit 5a6411a

Browse files
authored
Merge pull request #10 from Hayao0819/master
PlymouthのHOOKSの順番を修正した
2 parents a95472c + 9250e4b commit 5a6411a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/modules/initcpiocfg/main.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,19 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
124124
swap_uuid = ""
125125
btrfs = ""
126126
lvm2 = ""
127-
hooks = ["base", "udev", "autodetect", "modconf", "block", "keyboard",
128-
"keymap"]
127+
hooks = ["base", "udev"]
128+
# It is important that the plymouth hook comes before any encrypt hook
129+
if detect_plymouth():
130+
hooks += ["plymouth"]
131+
132+
hooks += ["autodetect", "modconf", "block", "keyboard","keymap"]
133+
129134
modules = []
130135
files = []
131136
encrypt_hook = False
132137
openswap_hook = False
133138
unencrypted_separate_boot = False
134139

135-
# It is important that the plymouth hook comes before any encrypt hook
136-
if detect_plymouth():
137-
hooks.append("plymouth")
138-
139140
for partition in partitions:
140141
if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
141142
# Skip foreign swap

src/modules/testpythonrun.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)