Attachment #873969 for bug #1221840

View | Details | Raw Unified | Return to bug 1221840
Collapse All | Expand All

Lines 27-32 Link Here

(-)a/contrib/apparmor/abstractions/passt (+1 lines)
27		27
28	/ r, # isolate_prefork(), isolation.c	28	/ r, # isolate_prefork(), isolation.c
29	mount options=(rw, runbindable) /,	29	mount options=(rw, runbindable) /,
		30	mount "" -> "/",
30	mount "" -> "/tmp/",	31	mount "" -> "/tmp/",
31	pivot_root "/tmp/" -> "/tmp/",	32	pivot_root "/tmp/" -> "/tmp/",
32	umount "/",	33	umount "/",

Lines 27-33 Link Here

(-)a/contrib/apparmor/abstractions/pasta (-1 / +1 lines)
27	@{PROC}/@{pid}/net/udp r,	27	@{PROC}/@{pid}/net/udp r,
28	@{PROC}/@{pid}/net/udp6 r,	28	@{PROC}/@{pid}/net/udp6 r,
29		29
30	@{run}/user/@{uid}/netns/* r, # pasta_open_ns(), pasta.c	30	@{run}/user/@{uid}/** r, # pasta_open_ns(), pasta.c
31		31
32	@{PROC}/[0-9]*/ns/net r, # pasta_wait_for_ns(),	32	@{PROC}/[0-9]*/ns/net r, # pasta_wait_for_ns(),
33	@{PROC}/[0-9]*/ns/user r, # conf_pasta_ns()	33	@{PROC}/[0-9]*/ns/user r, # conf_pasta_ns()




	context_run_bg qemu 'qemu-system-$(uname -m)'			   \
		' -machine accel=kvm'                                      \
		' -m '${VMEM}' -cpu host -smp '${VCPUS}                    \
		' -kernel ' "/home/sbrivio/nf/arch/x86/boot/bzImage"	   \
		' -initrd '${INITRAMFS}' -nographic -serial stdio'	   \
		' -nodefaults'						   \
		' -append "console=ttyS0 mitigations=off apparmor=0" '	   \

		' -machine accel=kvm'                                      \
		' -M accel=kvm:tcg'                                        \
		' -m '${VMEM}' -cpu host -smp '${VCPUS}                    \
		' -kernel ' "/home/sbrivio/nf/arch/x86/boot/bzImage"	   \
		' -initrd '${INITRAMFS}' -nographic -serial stdio'	   \
		' -nodefaults'						   \
		' -append "console=ttyS0 mitigations=off apparmor=0" '	   \

	context_run_bg qemu_1 'qemu-system-$(uname -m)'			     \
		' -M accel=kvm:tcg'                                          \
		' -m '${VMEM}' -cpu host -smp '${VCPUS}                      \
		' -kernel ' "/home/sbrivio/nf/arch/x86/boot/bzImage"	     \
		' -initrd '${INITRAMFS}' -nographic -serial stdio'	     \
		' -nodefaults'						     \
		' -append "console=ttyS0 mitigations=off apparmor=0" '	     \

	context_run_bg qemu_2 'qemu-system-$(uname -m)'			     \
		' -M accel=kvm:tcg'                                          \
		' -m '${VMEM}' -cpu host -smp '${VCPUS}                      \
		' -kernel ' "/home/sbrivio/nf/arch/x86/boot/bzImage"	     \
		' -initrd '${INITRAMFS}' -nographic -serial stdio'	     \
		' -nodefaults'						     \
		' -append "console=ttyS0 mitigations=off apparmor=0" '	     \

Return to bug 1221840

Lines 56-62 setup_passt() { Link Here

(-)a/test/lib/setup (-4 / +4 lines)
56	context_run_bg qemu 'qemu-system-$(uname -m)' \	56	context_run_bg qemu 'qemu-system-$(uname -m)' \
57	' -machine accel=kvm' \	57	' -machine accel=kvm' \
58	' -m '${VMEM}' -cpu host -smp '${VCPUS} \	58	' -m '${VMEM}' -cpu host -smp '${VCPUS} \
59	' -kernel ' "/boot/vmlinuz-$(uname -r)" \	59	' -kernel ' "/home/sbrivio/nf/arch/x86/boot/bzImage" \
60	' -initrd '${INITRAMFS}' -nographic -serial stdio' \	60	' -initrd '${INITRAMFS}' -nographic -serial stdio' \
61	' -nodefaults' \	61	' -nodefaults' \
62	' -append "console=ttyS0 mitigations=off apparmor=0" ' \	62	' -append "console=ttyS0 mitigations=off apparmor=0" ' \
Lines 152-158 setup_passt_in_ns() { Link Here
152	' -machine accel=kvm' \	152	' -machine accel=kvm' \
153	' -M accel=kvm:tcg' \	153	' -M accel=kvm:tcg' \
154	' -m '${VMEM}' -cpu host -smp '${VCPUS} \	154	' -m '${VMEM}' -cpu host -smp '${VCPUS} \
155	' -kernel ' "/boot/vmlinuz-$(uname -r)" \	155	' -kernel ' "/home/sbrivio/nf/arch/x86/boot/bzImage" \
156	' -initrd '${INITRAMFS}' -nographic -serial stdio' \	156	' -initrd '${INITRAMFS}' -nographic -serial stdio' \
157	' -nodefaults' \	157	' -nodefaults' \
158	' -append "console=ttyS0 mitigations=off apparmor=0" ' \	158	' -append "console=ttyS0 mitigations=off apparmor=0" ' \
Lines 223-229 setup_two_guests() { Link Here
223	context_run_bg qemu_1 'qemu-system-$(uname -m)' \	223	context_run_bg qemu_1 'qemu-system-$(uname -m)' \
224	' -M accel=kvm:tcg' \	224	' -M accel=kvm:tcg' \
225	' -m '${VMEM}' -cpu host -smp '${VCPUS} \	225	' -m '${VMEM}' -cpu host -smp '${VCPUS} \
226	' -kernel ' "/boot/vmlinuz-$(uname -r)" \	226	' -kernel ' "/home/sbrivio/nf/arch/x86/boot/bzImage" \
227	' -initrd '${INITRAMFS}' -nographic -serial stdio' \	227	' -initrd '${INITRAMFS}' -nographic -serial stdio' \
228	' -nodefaults' \	228	' -nodefaults' \
229	' -append "console=ttyS0 mitigations=off apparmor=0" ' \	229	' -append "console=ttyS0 mitigations=off apparmor=0" ' \
Lines 236-242 setup_two_guests() { Link Here
236	context_run_bg qemu_2 'qemu-system-$(uname -m)' \	236	context_run_bg qemu_2 'qemu-system-$(uname -m)' \
237	' -M accel=kvm:tcg' \	237	' -M accel=kvm:tcg' \
238	' -m '${VMEM}' -cpu host -smp '${VCPUS} \	238	' -m '${VMEM}' -cpu host -smp '${VCPUS} \
239	' -kernel ' "/boot/vmlinuz-$(uname -r)" \	239	' -kernel ' "/home/sbrivio/nf/arch/x86/boot/bzImage" \
240	' -initrd '${INITRAMFS}' -nographic -serial stdio' \	240	' -initrd '${INITRAMFS}' -nographic -serial stdio' \
241	' -nodefaults' \	241	' -nodefaults' \
242	' -append "console=ttyS0 mitigations=off apparmor=0" ' \	242	' -append "console=ttyS0 mitigations=off apparmor=0" ' \