]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-daemon: use `-e` instead of `--env` 31614/head
authorMichael Fritch <mfritch@suse.com>
Wed, 13 Nov 2019 16:10:10 +0000 (09:10 -0700)
committerMichael Fritch <mfritch@suse.com>
Wed, 13 Nov 2019 16:15:28 +0000 (09:15 -0700)
Older versions of podman don't allow intermixing `-e` and `--env`

Signed-off-by: Michael Fritch <mfritch@suse.com>
src/ceph-daemon/ceph-daemon

index 0002209bbbe8983da865098032a9f90527f4da31..e6b0ce10f419499718164ae9a8469c2f1a2a1f87 100755 (executable)
@@ -1225,7 +1225,7 @@ def command_shell():
         command = ['bash']
         podman_args += [
             '-it',
-            '--env', 'LANG=C',
+            '-e', 'LANG=C',
             '-e', "PS1=%s" % CUSTOM_PS1,
         ]
     c = CephContainer(
@@ -1247,7 +1247,7 @@ def command_enter():
         command = ['bash']
         podman_args += [
             '-it',
-            '--env', 'LANG=C',
+            '-e', 'LANG=C',
             '-e', "PS1=%s" % CUSTOM_PS1,
         ]
     c = get_container(args.fsid, daemon_type, daemon_id,