summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2018-09-03 08:57:37 +0200
committertorben2018-09-03 08:57:37 +0200
commite6ac1e71f8b652fd2e9cf324261f4c6f7b5bd0e1 (patch)
tree7c5586d3eff41197148efc405ac7d7ccad231390
parentfix. (diff)
downloadsystemd-init-e6ac1e71f8b652fd2e9cf324261f4c6f7b5bd0e1.tar.gz
systemd-init-e6ac1e71f8b652fd2e9cf324261f4c6f7b5bd0e1.tar.xz
systemd-init-e6ac1e71f8b652fd2e9cf324261f4c6f7b5bd0e1.zip
Refactoring for proper file names.
-rwxr-xr-xmodules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh3
-rwxr-xr-xmodules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh (renamed from modules.d/systemd-networkd-ext/hooks/parse-kcl-for-networkd.sh)0
-rwxr-xr-xmodules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh (renamed from modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh)0
-rwxr-xr-xmodules.d/systemd-networkd-ext/module-setup.sh4
4 files changed, 4 insertions, 3 deletions
diff --git a/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh b/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh
index 1f0487ec..938fbfaa 100755
--- a/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh
+++ b/modules.d/systemd-networkd-ext/hooks/configure-dhcp-for-newroot.sh
@@ -5,7 +5,8 @@ source /usr/lib/configure-logging.sh
# This hook creates a networkd configuration for the NEWROOT
# * DHCP configuration for the boot interface
# * Set static hostname via /etc/hostname
-# This uses the configuration file generated by the parse-kcl-for-networkd.sh
+# This uses the configuration file generated by the
+# convert-kcl-network-configuration-to-systemd-service-files.sh
# hook Note: on systemd v219, UseDomains is bugged and does not seem to do
# anything thus that option is complemented with the KCL's domain to hopefully
# guarantee one of these will take effect.
diff --git a/modules.d/systemd-networkd-ext/hooks/parse-kcl-for-networkd.sh b/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh
index d4c4c109..d4c4c109 100755
--- a/modules.d/systemd-networkd-ext/hooks/parse-kcl-for-networkd.sh
+++ b/modules.d/systemd-networkd-ext/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh
diff --git a/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh b/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh
index 5ed9a835..5ed9a835 100755
--- a/modules.d/systemd-networkd-ext/hooks/copy-networkd-files-to-newroot.sh
+++ b/modules.d/systemd-networkd-ext/hooks/prepare-network-service-in-newroot.sh
diff --git a/modules.d/systemd-networkd-ext/module-setup.sh b/modules.d/systemd-networkd-ext/module-setup.sh
index 4dabb8f0..38bb2014 100755
--- a/modules.d/systemd-networkd-ext/module-setup.sh
+++ b/modules.d/systemd-networkd-ext/module-setup.sh
@@ -391,9 +391,9 @@ EOF
# the hook script that will parse the "ip=" kernel command line
# parameter and generate the .link and .network files needed
# by systemd-networkd.
- inst_hook cmdline 10 "$moddir/hooks/parse-kcl-for-networkd.sh"
+ inst_hook cmdline 10 "$moddir/hooks/convert-kcl-network-configuration-to-systemd-service-files.sh"
inst_hook pre-mount 00 "$moddir/hooks/wait-for-network.sh"
- inst_hook pre-pivot 10 "$moddir/hooks/copy-networkd-files-to-newroot.sh"
+ inst_hook pre-pivot 10 "$moddir/hooks/prepare-network-service-in-newroot.sh"
inst_hook pre-pivot 20 "$moddir/hooks/configure-dhcp-for-newroot.sh"
}