diff options
| author | Simon Rettberg | 2021-07-08 16:05:57 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2021-07-08 16:05:57 +0200 |
| commit | eec5e1576e70d27caa639f36e34679ed18817458 (patch) | |
| tree | 48b4f6be10d33c6c3b81a7723ff0c4bbb0b66cf7 /core/modules/dnbd3-proxy-mode | |
| parent | Drop 32bit support, improve CPU detection (diff) | |
| download | mltk-eec5e1576e70d27caa639f36e34679ed18817458.tar.gz mltk-eec5e1576e70d27caa639f36e34679ed18817458.tar.xz mltk-eec5e1576e70d27caa639f36e34679ed18817458.zip | |
Add installer mode for stage4
Diffstat (limited to 'core/modules/dnbd3-proxy-mode')
| -rwxr-xr-x | core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy | 18 | ||||
| -rw-r--r-- | core/modules/dnbd3-proxy-mode/module.build | 4 |
2 files changed, 20 insertions, 2 deletions
diff --git a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy index e45272a6..e44fc15a 100755 --- a/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy +++ b/core/modules/dnbd3-proxy-mode/data/opt/openslx/scripts/systemd-setup_dnbd3_proxy @@ -283,6 +283,24 @@ if [ -n "$islocal" ]; then adduser dnbd3 fuse # Start service, is not symlinked when not in proxy mode systemctl --no-block start dnbd3-proxy.service + if [ -d /dev/dnbd0 ] && [ "$( cat /sys/block/dnbd0/net/rid )" -gt 0 ]; then + # give it some time to start + usleep 500000 + # add the server + if ! dnbd3-client -A "127.0.0.1:$DNBD3_PORT" -d /dev/dnbd0; then + echo "Cannot add localhost to dnbd0" >&2 + else + for i in 1 2 3 4 5 ""; do + echo | busybox timeout 1 busybox nc 127.0.0.1 "$DNBD3_PORT" && break + echo "port wait fail #$i" + [ -z "$i" ] && break + sleep 1 + done + if ! dnbd3-client -s "127.0.0.1:$DNBD3_PORT" -d /dev/dnbd0; then + echo "Cannot switch dnbd0 to localhost" >&2 + fi + fi + fi fi exit 0 diff --git a/core/modules/dnbd3-proxy-mode/module.build b/core/modules/dnbd3-proxy-mode/module.build index a2c0bd22..4ab661f9 100644 --- a/core/modules/dnbd3-proxy-mode/module.build +++ b/core/modules/dnbd3-proxy-mode/module.build @@ -8,6 +8,6 @@ build() { } post_copy() { - add_group "dnbd3" - USER="dnbd3" GROUP="dnbd3" add_user + add_system_group "dnbd3" + USER="dnbd3" GROUP="dnbd3" add_system_user } |