summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2015-05-21 17:05:11 +0200
committerJonathan Bauer2015-05-21 17:05:11 +0200
commitb01b2b7b396b6977d906aa435d9234b12eacb0d0 (patch)
treec70464d25e71ee04b7c436b1c7b6d27a1ccf7484
parenthook script to setup loopback as its not done in deepin (diff)
downloadsystemd-init-b01b2b7b396b6977d906aa435d9234b12eacb0d0.tar.gz
systemd-init-b01b2b7b396b6977d906aa435d9234b12eacb0d0.tar.xz
systemd-init-b01b2b7b396b6977d906aa435d9234b12eacb0d0.zip
always use the @-wrapper for nbd-client call
-rwxr-xr-xtestModule/scripts/setup-qcow23
1 files changed, 2 insertions, 1 deletions
diff --git a/testModule/scripts/setup-qcow2 b/testModule/scripts/setup-qcow2
index cc74457b..70babc17 100755
--- a/testModule/scripts/setup-qcow2
+++ b/testModule/scripts/setup-qcow2
@@ -114,7 +114,8 @@ export_qcow() {
# helper to mount the qcow2-container per nbd
connect_qcow() {
# try to mount the locally exported qcow2-container using nbd-client
- if nbd-client --systemd-mark --persist 127.0.0.1 2000 /dev/nbd0; then
+ if /usr/bin/systemd-preserve-process-marker \
+ nbd-client --persist 127.0.0.1 2000 /dev/nbd0; then
# it worked, lets set the symlink to /dev/root as dracut needs it
# later on to mount that device to the future root (/sysroot)
ln -sf /dev/nbd0 /dev/root