Skip to content
Snippets Groups Projects
Commit dac26740 authored by Simon McVittie's avatar Simon McVittie
Browse files

scripts: Stop systemd-nspawn from using a pseudo-terminal


In a command that doesn't run for very long, the command might exit
before all output has been processed by the pty.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 68a77243
No related branches found
No related tags found
No related merge requests found
...@@ -75,6 +75,7 @@ def main(): ...@@ -75,6 +75,7 @@ def main():
'systemd-nspawn', 'systemd-nspawn',
'--directory={}'.format(args.sysroot), '--directory={}'.format(args.sysroot),
'--as-pid2', '--as-pid2',
'--pipe',
'--tmpfs=/run/lock', '--tmpfs=/run/lock',
'--register=no', '--register=no',
'env', 'DEBIAN_FRONTEND=noninteractive', 'env', 'DEBIAN_FRONTEND=noninteractive',
......
...@@ -183,6 +183,7 @@ def main(): ...@@ -183,6 +183,7 @@ def main():
'systemd-nspawn', 'systemd-nspawn',
'--directory={}'.format(args.sysroot), '--directory={}'.format(args.sysroot),
'--as-pid2', '--as-pid2',
'--pipe',
'--tmpfs=/run/lock', '--tmpfs=/run/lock',
'--register=no', '--register=no',
] ]
......
...@@ -128,6 +128,7 @@ def main(): ...@@ -128,6 +128,7 @@ def main():
'systemd-nspawn', 'systemd-nspawn',
'--directory={}'.format(args.sysroot), '--directory={}'.format(args.sysroot),
'--as-pid2', '--as-pid2',
'--pipe',
'--tmpfs=/run/lock', '--tmpfs=/run/lock',
'--register=no', '--register=no',
] ]
......
...@@ -57,7 +57,7 @@ in_chroot () { ...@@ -57,7 +57,7 @@ in_chroot () {
fi fi
done done
systemd-nspawn --directory="$sysroot" --as-pid2 --tmpfs=/run/lock \ systemd-nspawn --directory="$sysroot" --as-pid2 --pipe --tmpfs=/run/lock \
--register=no env DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes \ --register=no env DEBIAN_FRONTEND=noninteractive SUDO_FORCE_REMOVE=yes \
"$@" "$@"
} }
......
...@@ -53,7 +53,7 @@ in_chroot () { ...@@ -53,7 +53,7 @@ in_chroot () {
fi fi
done done
systemd-nspawn --directory="$sysroot" --as-pid2 --tmpfs=/run/lock \ systemd-nspawn --directory="$sysroot" --as-pid2 --pipe --tmpfs=/run/lock \
--register=no env DEBIAN_FRONTEND=noninteractive \ --register=no env DEBIAN_FRONTEND=noninteractive \
"$@" "$@"
} }
......
...@@ -57,6 +57,7 @@ def main(): ...@@ -57,6 +57,7 @@ def main():
'systemd-nspawn', 'systemd-nspawn',
'--directory={}'.format(args.sysroot), '--directory={}'.format(args.sysroot),
'--as-pid2', '--as-pid2',
'--pipe',
'--tmpfs=/run/lock', '--tmpfs=/run/lock',
'--register=no', '--register=no',
'env', 'env',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment