From: Michael Fritch <mfritch@suse.com>
Date: Wed, 13 Nov 2019 16:10:10 +0000 (-0700)
Subject: ceph-daemon: use `-e` instead of `--env`
X-Git-Tag: v15.1.0~908^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=341b6943e9158bc47be47be5154d668e4d9d1471;p=ceph.git

ceph-daemon: use `-e` instead of `--env`

Older versions of podman don't allow intermixing `-e` and `--env`

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/ceph-daemon/ceph-daemon b/src/ceph-daemon/ceph-daemon
index 0002209bbbe8..e6b0ce10f419 100755
--- a/src/ceph-daemon/ceph-daemon
+++ b/src/ceph-daemon/ceph-daemon
@@ -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,