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

Merge branch 'wip/fdanis/fix_systemd-nspawn-error' into 'master'

Fix systemd-nspawn error when running in gitlab CI

See merge request smcv/flatdeb!6
parents c3c2dadb ca23a6af
No related branches found
No related tags found
1 merge request!7Update flatdeb
......@@ -74,6 +74,7 @@ def main():
'--directory={}'.format(args.sysroot),
'--as-pid2',
'--tmpfs=/run/lock',
'--register=no',
'env', 'DEBIAN_FRONTEND=noninteractive',
]
......
......@@ -136,6 +136,7 @@ def main():
'--directory={}'.format(args.sysroot),
'--as-pid2',
'--tmpfs=/run/lock',
'--register=no',
]
in_chroot_quick = [
'chroot', args.sysroot,
......
......@@ -201,6 +201,7 @@ def main():
'--directory={}'.format(args.sysroot),
'--as-pid2',
'--tmpfs=/run/lock',
'--register=no',
]
if args.output:
......
......@@ -55,7 +55,7 @@ in_chroot () {
done
systemd-nspawn --directory="$sysroot" --as-pid2 --tmpfs=/run/lock \
env DEBIAN_FRONTEND=noninteractive \
--register=no env DEBIAN_FRONTEND=noninteractive \
"$@"
}
......
......@@ -58,6 +58,7 @@ def main():
'--directory={}'.format(args.sysroot),
'--as-pid2',
'--tmpfs=/run/lock',
'--register=no',
'env',
'DEBIAN_FRONTEND=noninteractive',
'SUDO_FORCE_REMOVE=yes',
......
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