diff options
| author | Jonathan Bauer | 2019-07-16 12:56:29 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-07-16 12:56:29 +0200 |
| commit | bcbb49f4ab9fbf0f1d959919ef851cadb7076835 (patch) | |
| tree | adf71efae8ec5b6cd5534759e43a6770e7b57f63 | |
| parent | [systemd-networkd] renamed dump to network.conf (diff) | |
| download | systemd-init-bcbb49f4ab9fbf0f1d959919ef851cadb7076835.tar.gz systemd-init-bcbb49f4ab9fbf0f1d959919ef851cadb7076835.tar.xz systemd-init-bcbb49f4ab9fbf0f1d959919ef851cadb7076835.zip | |
[slx-uuid] get uuid in pre-udev already
| -rwxr-xr-x | builder/modules.d/slx-uuid/module-setup.sh | 6 | ||||
| -rw-r--r-- | builder/modules.d/slx-uuid/scripts/get-system-uuid.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/builder/modules.d/slx-uuid/module-setup.sh b/builder/modules.d/slx-uuid/module-setup.sh index 875c9f77..569b5155 100755 --- a/builder/modules.d/slx-uuid/module-setup.sh +++ b/builder/modules.d/slx-uuid/module-setup.sh @@ -9,12 +9,12 @@ check() { return 255 } depends() { - echo dnbd3-rootfs + echo busybox } install() { mkdir -p "$initdir/etc/bad-uuid.d" inst_simple "$moddir/bad-uuid-defaults.conf" "/etc/bad-uuid.d/bad-uuid-defaults.conf" - inst_multiple dmidecode head - inst_hook pre-mount 05 "$moddir/scripts/get-system-uuid.sh" + inst_multiple dmidecode + inst_hook pre-udev 05 "$moddir/scripts/get-system-uuid.sh" inst_hook pre-pivot 10 "$moddir/scripts/copy-system-uuid-to-newroot.sh" } diff --git a/builder/modules.d/slx-uuid/scripts/get-system-uuid.sh b/builder/modules.d/slx-uuid/scripts/get-system-uuid.sh index 4f170e23..fd6bb125 100644 --- a/builder/modules.d/slx-uuid/scripts/get-system-uuid.sh +++ b/builder/modules.d/slx-uuid/scripts/get-system-uuid.sh @@ -6,8 +6,8 @@ . /lib/dracut-lib.sh get_system_uuid() { - if [ -e /run/openslx/pxe-network.conf ]; then - . /run/openslx/pxe-network.conf + if [ -e /run/openslx/network.conf ]; then + . /run/openslx/network.conf fi if [ -z "$SLX_PXE_MAC" ]; then |