1
=== modified file 'python/libertine/ChrootContainer.py'
2
--- python/libertine/ChrootContainer.py	2016-11-29 15:36:17 +0000
3
+++ python/libertine/ChrootContainer.py	2016-11-30 19:20:54 +0000
4
@@ -51,6 +51,9 @@
5
51
        super().__init__(container_id)
51
        super().__init__(container_id)
6
52
        self.container_type = "chroot"
52
        self.container_type = "chroot"
7
53
        self._window_manager = None
53
        self._window_manager = None
8
54
        # FIXME: Disabling seccomp is a temporary measure until we fully understand why we need
9
55
        #        it or figure out when we need it.
10
56
        environ['PROOT_NO_SECCOMP'] = '1'
11
54
        os.environ['FAKECHROOT_CMD_SUBST'] = '$FAKECHROOT_CMD_SUBST:/usr/bin/chfn=/bin/true'
57
        os.environ['FAKECHROOT_CMD_SUBST'] = '$FAKECHROOT_CMD_SUBST:/usr/bin/chfn=/bin/true'
12
55
        os.environ['DEBIAN_FRONTEND'] = 'noninteractive'
58
        os.environ['DEBIAN_FRONTEND'] = 'noninteractive'
13
56
59
14
@@ -218,10 +221,6 @@
15
218
        return proot_cmd
221
        return proot_cmd
16
219
222
17
220
    def start_application(self, app_exec_line, environ):
223
    def start_application(self, app_exec_line, environ):
18
221
        # FIXME: Disabling seccomp is a temporary measure until we fully understand why we need
19
222
        #        it or figure out when we need it.
20
223
        environ['PROOT_NO_SECCOMP'] = '1'
21
224
22
225
        # Workaround issue where a custom dconf profile is on the machine
224
        # Workaround issue where a custom dconf profile is on the machine
23
226
        if 'DCONF_PROFILE' in environ:
225
        if 'DCONF_PROFILE' in environ:
24
227
            del environ['DCONF_PROFILE']
226
            del environ['DCONF_PROFILE']
Status:	Merged
Approved by:	Larry Price on 2016-11-30
Approved revision:	340
Merged at revision:	340
Proposed branch:	lp:~townsend/libertine/fix-proot-seccomp
Merge into:	lp:libertine
Diff against target:	24 lines (+3/-4) 1 file modified python/libertine/ChrootContainer.py (+3/-4)
To merge this branch:	bzr merge lp:~townsend/libertine/fix-proot-seccomp
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Larry Price		2016-11-30	Approve on 2016-11-30
Libertine CI Bot	continuous-integration		Approve on 2016-11-30
Review via email: mp+312193@code.launchpad.net