summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2022-02-25 10:27:06 +0100
committerSimon Rettberg2022-02-25 10:27:06 +0100
commit916b14d6bc002b7072f4f094ef0eadd4d16e05b3 (patch)
tree294b39133c5ea273c3789097754f675579b39142
parent[slx-ssl] Fix ordering (diff)
downloadsystemd-init-916b14d6bc002b7072f4f094ef0eadd4d16e05b3.tar.gz
systemd-init-916b14d6bc002b7072f4f094ef0eadd4d16e05b3.tar.xz
systemd-init-916b14d6bc002b7072f4f094ef0eadd4d16e05b3.zip
Ordering fuckery
-rwxr-xr-xmodules.d/slx-network/module-setup.sh3
-rwxr-xr-xmodules.d/slx-ssl/module-setup.sh3
2 files changed, 4 insertions, 2 deletions
diff --git a/modules.d/slx-network/module-setup.sh b/modules.d/slx-network/module-setup.sh
index cea977d5..bf384322 100755
--- a/modules.d/slx-network/module-setup.sh
+++ b/modules.d/slx-network/module-setup.sh
@@ -36,6 +36,7 @@ install() {
# hooks
inst_hook cmdline 10 "${moddir}/hooks/parse-ipxe-network-kcl.sh"
inst_hook pre-pivot 10 "${moddir}/hooks/configure-jumbo-frames.sh"
- inst_hook pre-pivot 50 "${moddir}/hooks/copy-network-files.sh"
+ # DO NOT TOUCH THIS
+ inst_hook pre-pivot 99 "${moddir}/hooks/copy-network-files.sh"
inst_hook pre-pivot 60 "${moddir}/hooks/activate-bootif-dhcp.sh"
}
diff --git a/modules.d/slx-ssl/module-setup.sh b/modules.d/slx-ssl/module-setup.sh
index 023d1b8b..b3fd803b 100755
--- a/modules.d/slx-ssl/module-setup.sh
+++ b/modules.d/slx-ssl/module-setup.sh
@@ -9,5 +9,6 @@ depends() {
}
install() {
# config.tgz unpacking happens in pre-pivot/90
- inst_hook pre-pivot 99 "$moddir/hooks/setup-ssl-sat.sh"
+ # BEFORE "copy network files"
+ inst_hook pre-pivot 98 "$moddir/hooks/setup-ssl-sat.sh"
}