1
diff --git a/curtin/util.py b/curtin/util.py
2
index 58ee7e1..dcf9422 100644
3
--- a/curtin/util.py
4
+++ b/curtin/util.py
5
@@ -73,12 +73,36 @@ class NotExclusiveError(OSError):
6
73
def _subp(args, data=None, rcs=None, env=None, capture=False,
73
def _subp(args, data=None, rcs=None, env=None, capture=False,
7
74
          combine_capture=False, shell=False, logstring=False,
74
          combine_capture=False, shell=False, logstring=False,
8
75
          decode="replace", target=None, cwd=None, log_captured=False,
75
          decode="replace", target=None, cwd=None, log_captured=False,
10
76
          unshare_pid=None):
76
          unshare_pid=None,
11
77
          *, systemd_force_offline: Optional[bool] = None):
12
77
    if rcs is None:
78
    if rcs is None:
13
78
        rcs = [0]
79
        rcs = [0]
14
79
    devnull_fp = None
80
    devnull_fp = None
15
80
81
16
81
    tpath = paths.target_path(target)
82
    tpath = paths.target_path(target)
17
83
18
84
    env = env.copy() if env is not None else os.environ.copy()
19
85
    # To determine if we are running in a chroot, systemd checks if
20
86
    # /proc/1/root (corresponding to the init process) and / are the same
21
87
    # inode. If they are different, systemd assumes we are in a chroot.
22
88
    # However, we are running apt-get in a new PID namespace (with /proc
23
89
    # properly mounted). This means that in the new namespace, apt-get gets
24
90
    # assigned PID 1 and is therefore the "init" process.
25
91
    # When systemd compares /proc/1/root and /, it sees they are identical
26
92
    # because the init process is actually running in the chroot.
27
93
    #
28
94
    # Before we started passing the --mount-proc option to unshare, it was
29
95
    # working because /proc/1 in the chroot would still refer to the systemd
30
96
    # init process (running outside the chroot).
31
97
    #
32
98
    # With the SYSTEMD_OFFLINE variable, one can "force" systemd to assume it
33
99
    # is running in a chroot. Let's use it.
34
100
    if systemd_force_offline is not None:
35
101
        # Override the SYSTEMD_OFFLINE variable even if it already exists.
36
102
        env['SYSTEMD_OFFLINE'] = str(int(systemd_force_offline))
37
103
    elif 'SYSTEMD_OFFLINE' not in env and tpath != "/":
38
104
        env['SYSTEMD_OFFLINE'] = '1'
39
105
40
82
    chroot_args = [] if tpath == "/" else ['chroot', target]
106
    chroot_args = [] if tpath == "/" else ['chroot', target]
41
83
    sh_args = ['sh', '-c'] if shell else []
107
    sh_args = ['sh', '-c'] if shell else []
42
84
    if isinstance(args, string_types):
108
    if isinstance(args, string_types):
43
@@ -260,6 +284,10 @@ def subp(*args, **kwargs):
44
260
        unshare the pid namespace.
284
        unshare the pid namespace.
45
261
        default value (None) is to unshare pid namespace if possible
285
        default value (None) is to unshare pid namespace if possible
46
262
        and target != /
286
        and target != /
47
287
    :param systemd_force_offline:
48
288
        if not None, will set the SYSTEMD_OFFLINE env variable to '1' or '0'
49
289
        if None, the variable will be set to '1' only if running in a chroot
50
290
        (i.e., target is not /) and the variable is not already set.
51
263
291
52
264
    :return
292
    :return
53
265
        if not capturing, return is (None, None)
293
        if not capturing, return is (None, None)
54
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
55
index 2dd63a7..96f260f 100644
56
--- a/tests/unittests/test_util.py
57
+++ b/tests/unittests/test_util.py
58
@@ -350,6 +350,57 @@ class TestSubp(CiTestCase):
59
350
                    ['apt-get', 'install'])
350
                    ['apt-get', 'install'])
60
351
        self.assertEqual(expected, args[0])
351
        self.assertEqual(expected, args[0])
61
352
352
62
353
    @mock.patch.dict(os.environ, clear=True)
63
354
    @mock.patch('curtin.util.subprocess.Popen', side_effect=OSError)
64
355
    def test_systemd_offline_default__no_chroot(self, m_popen):
65
356
        with self.assertRaises(util.ProcessExecutionError):
66
357
            util.subp(['ls', '-l'], target='/')
67
358
        m_popen.assert_called_once()
68
359
        self.assertEqual(m_popen.call_args.kwargs['env'], {})
69
360
70
361
    @mock.patch('curtin.util.subprocess.Popen', side_effect=OSError)
71
362
    def test_systemd_offline_default__in_chroot(self, m_popen):
72
363
        with mock.patch.dict(os.environ, clear=True):
73
364
            with self.assertRaises(util.ProcessExecutionError):
74
365
                util.subp(['ls', '-l'], target='/target')
75
366
        m_popen.assert_called_once()
76
367
        self.assertEqual(m_popen.call_args.kwargs['env'],
77
368
                         {'SYSTEMD_OFFLINE': '1'})
78
369
79
370
    @mock.patch('curtin.util.subprocess.Popen', side_effect=OSError)
80
371
    def test_systemd_offline_default__no_override(self, m_popen):
81
372
        with mock.patch.dict(os.environ, {'SYSTEMD_OFFLINE': '1'}, clear=True):
82
373
            with self.assertRaises(util.ProcessExecutionError):
83
374
                util.subp(['ls', '-l'], target='/target')
84
375
        m_popen.assert_called_once()
85
376
        self.assertEqual(m_popen.call_args.kwargs['env'],
86
377
                         {'SYSTEMD_OFFLINE': '1'})
87
378
88
379
        m_popen.reset_mock()
89
380
        with mock.patch.dict(os.environ, {'SYSTEMD_OFFLINE': '0'}, clear=True):
90
381
            with self.assertRaises(util.ProcessExecutionError):
91
382
                util.subp(['ls', '-l'], target='/target')
92
383
        m_popen.assert_called_once()
93
384
        self.assertEqual(m_popen.call_args.kwargs['env'],
94
385
                         {'SYSTEMD_OFFLINE': '0'})
95
386
96
387
    @mock.patch('curtin.util.subprocess.Popen', side_effect=OSError)
97
388
    def test_systemd_offline_specified(self, m_popen):
98
389
        with mock.patch.dict(os.environ, {'SYSTEMD_OFFLINE': '0'}, clear=True):
99
390
            with self.assertRaises(util.ProcessExecutionError):
100
391
                util.subp(['ls', '-l'], systemd_force_offline=True)
101
392
        m_popen.assert_called_once()
102
393
        self.assertEqual(m_popen.call_args.kwargs['env'],
103
394
                         {'SYSTEMD_OFFLINE': '1'})
104
395
105
396
        m_popen.reset_mock()
106
397
        with mock.patch.dict(os.environ, {'SYSTEMD_OFFLINE': '1'}, clear=True):
107
398
            with self.assertRaises(util.ProcessExecutionError):
108
399
                util.subp(['ls', '-l'], systemd_force_offline=False)
109
400
        m_popen.assert_called_once()
110
401
        self.assertEqual(m_popen.call_args.kwargs['env'],
111
402
                         {'SYSTEMD_OFFLINE': '0'})
112
403
113
353
404
114
354
class TestGetUnsharePidArgs(CiTestCase):
405
class TestGetUnsharePidArgs(CiTestCase):
115
355
    """Test the internal implementation for when to unshare."""
406
    """Test the internal implementation for when to unshare."""
Reviewer	Review Type	Date Requested	Status
Dan Bungert		2024-03-11	Approve on 2024-03-13
Server Team CI bot	continuous-integration		Approve on 2024-03-13
Chris Peterson			Approve on 2024-03-12
Review via email: mp+462140@code.launchpad.net