1
=== modified file 'python/libertine/LxdContainer.py'
2
--- python/libertine/LxdContainer.py	2017-01-05 20:16:25 +0000
3
+++ python/libertine/LxdContainer.py	2017-01-06 21:59:14 +0000
4
@@ -98,20 +98,6 @@
5
98
98
6
99
99
7
100
def _setup_bind_mount_service(container, uid, username):
100
def _setup_bind_mount_service(container, uid, username):
8
101
    utils.get_logger().info("Creating systemd mount override service")
9
102
    service = '''
10
103
[Unit]
11
104
Description=Fix system mounts for libertine
12
105
13
106
[Service]
14
107
ExecStart=/usr/bin/libertine-lxd-mount-update
15
108
16
109
[Install]
17
110
WantedBy=multi-user.target
18
111
'''[1:-1]
19
112
    container.files.put('/etc/systemd/system/libertine-lxd-mount-update.service', service.encode('utf-8'))
20
113
    container.execute(shlex.split('chmod 644 /etc/systemd/system/libertine-lxd-mount-update.service'))
21
114
22
115
    utils.get_logger().info("Creating mount update shell script")
101
    utils.get_logger().info("Creating mount update shell script")
23
116
    script = '''
102
    script = '''
24
117
#!/bin/sh
103
#!/bin/sh
25
@@ -128,9 +114,6 @@
26
128
    container.files.put('/usr/bin/libertine-lxd-mount-update', script.format(uid=uid, username=username).encode('utf-8'))
114
    container.files.put('/usr/bin/libertine-lxd-mount-update', script.format(uid=uid, username=username).encode('utf-8'))
27
129
    container.execute(shlex.split('chmod 755 /usr/bin/libertine-lxd-mount-update'))
115
    container.execute(shlex.split('chmod 755 /usr/bin/libertine-lxd-mount-update'))
28
130
116
29
131
    utils.get_logger().info("Enabling systemd mount update service")
30
132
    container.execute(shlex.split('systemctl enable libertine-lxd-mount-update.service'))
31
133
32
134
117
33
135
def lxd_container(client, container_id):
118
def lxd_container(client, container_id):
34
136
    try:
119
    try:
35
@@ -404,6 +387,8 @@
36
404
            utils.get_logger().error("Could not get container '{}'".format(self._id))
387
            utils.get_logger().error("Could not get container '{}'".format(self._id))
37
405
            return None
388
            return None
38
406
389
39
390
        requires_remount = self._container.status != 'Running'
40
391
41
407
        if self._manager:
392
        if self._manager:
42
408
            result = LifecycleResult.from_dict(self._manager.app_start(self._id))
393
            result = LifecycleResult.from_dict(self._manager.app_start(self._id))
43
409
        else:
394
        else:
44
@@ -415,6 +400,9 @@
45
415
            utils.get_logger().error(result.error)
400
            utils.get_logger().error(result.error)
46
416
            return False
401
            return False
47
417
402
48
403
        if requires_remount:
49
404
            self._container.execute(shlex.split('/usr/bin/libertine-lxd-mount-update'))
50
405
51
418
        args = self._lxc_args("sudo -E -u {} env PATH={}".format(os.environ['USER'], environ['PATH']), environ)
406
        args = self._lxc_args("sudo -E -u {} env PATH={}".format(os.environ['USER'], environ['PATH']), environ)
52
419
407
53
420
        self._start_window_manager(args.copy())
408
        self._start_window_manager(args.copy())
Reviewer	Review Type	Date Requested	Status
Christopher Townsend (community)		2017-01-06	Approve on 2017-01-09
Libertine CI Bot	continuous-integration		Approve on 2017-01-06
Review via email: mp+314257@code.launchpad.net