diff options
| author | Jonathan Bauer | 2019-08-01 14:55:46 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-08-01 14:55:46 +0200 |
| commit | 4c4803eee4b079220d2a49bb8c0f96361366a1ad (patch) | |
| tree | 7036fedb839c8330dedfb64a468a5fa1153b74e7 /builder | |
| parent | [slx-network] do not bridge additional nic (diff) | |
| download | systemd-init-4c4803eee4b079220d2a49bb8c0f96361366a1ad.tar.gz systemd-init-4c4803eee4b079220d2a49bb8c0f96361366a1ad.tar.xz systemd-init-4c4803eee4b079220d2a49bb8c0f96361366a1ad.zip | |
[dnbd3-rootfs] move scripts to /usr/local/bin
Diffstat (limited to 'builder')
| -rwxr-xr-x | builder/modules.d/dnbd3-rootfs/module-setup.sh | 13 | ||||
| -rw-r--r-- | builder/modules.d/dnbd3-rootfs/services/dnbd3root.service | 7 |
2 files changed, 4 insertions, 16 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/module-setup.sh b/builder/modules.d/dnbd3-rootfs/module-setup.sh index a2e691c5..046732df 100755 --- a/builder/modules.d/dnbd3-rootfs/module-setup.sh +++ b/builder/modules.d/dnbd3-rootfs/module-setup.sh @@ -177,16 +177,9 @@ install() { `install` ' # region binaries - inst "$moddir/binaries/dnbd3/build/dnbd3-client" /usr/bin/dnbd3-client + inst "$moddir/binaries/dnbd3/build/dnbd3-client" /usr/local/bin/dnbd3-client inst "$moddir/binaries/systemd-preserve-process-marker/systemd-preserve-process-marker" \ - /usr/bin/systemd-preserve-process-marker - ## DEPRECATED - #inst "$moddir/scripts/device-add-write-layer.sh" \ - # /usr/bin/device-add-write-layer - #inst "$moddir/scripts/container-unpack-xmount.sh" \ - # /usr/bin/container-unpack-xmount - #inst "$moddir/scripts/container-unpack-qemu.sh" \ - # /usr/bin/container-unpack-qemu + /usr/local/bin/systemd-preserve-process-marker # xmount local \ xmount_installation="$moddir/binaries/xmount/trunk/build/release_build" @@ -217,7 +210,7 @@ install() { # device-mapper) if dracut_module_included "systemd-initrd"; then inst "$moddir/hooks/prepare-root-partition.sh" \ - /usr/bin/dnbd3root + /usr/local/bin/dnbd3root inst_simple "${moddir}/services/dnbd3root.service" \ "${systemdsystemunitdir}/dnbd3root.service" mkdir --parents \ diff --git a/builder/modules.d/dnbd3-rootfs/services/dnbd3root.service b/builder/modules.d/dnbd3-rootfs/services/dnbd3root.service index 592b049d..df079576 100644 --- a/builder/modules.d/dnbd3-rootfs/services/dnbd3root.service +++ b/builder/modules.d/dnbd3-rootfs/services/dnbd3root.service @@ -4,14 +4,9 @@ After=dracut-pre-mount.service network.target Before=dracut-mount.service DefaultDependencies=no IgnoreOnIsolate=true -#OnFailure=emergency.target -#Conflicts=shutdown.target -#ConditionKernelCommandLine=! -#ConditionPathExists=/etc/multipath.conf [Service] Type=oneshot RemainAfterExit=true KillMode=none -ExecStart=/usr/bin/dnbd3root -#ExecStop=echo 'stopping dnbd3' +ExecStart=/usr/local/bin/dnbd3root |