summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2018-05-25 09:26:13 -0700
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-25 16:37:34 +0000
commit8fcf1aaa29e61b9305096f61a8ba26bc81462b05 (patch)
treed3bb287cb63269b1aed47f1914f866b59a3781b9 /pkg
parentde13777e71c73cca85c1a69d69da27299be9a269 (diff)
downloadpodman-8fcf1aaa29e61b9305096f61a8ba26bc81462b05.tar.gz
podman-8fcf1aaa29e61b9305096f61a8ba26bc81462b05.tar.bz2
podman-8fcf1aaa29e61b9305096f61a8ba26bc81462b05.zip
Rename addFIPSsModeSecret to addFIPSModeSecret
Signed-off-by: Jhon Honce <jhonce@redhat.com> Closes: #833 Approved by: mheon
Diffstat (limited to 'pkg')
-rw-r--r--pkg/secrets/secrets.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/secrets/secrets.go b/pkg/secrets/secrets.go
index 1b525de83..12609c7e3 100644
--- a/pkg/secrets/secrets.go
+++ b/pkg/secrets/secrets.go
@@ -156,7 +156,7 @@ func SecretMountsWithUIDGID(mountLabel, containerWorkingDir, mountFile, mountPre
// Add FIPS mode secret if /etc/system-fips exists on the host
_, err := os.Stat("/etc/system-fips")
if err == nil {
- if err := addFIPSsModeSecret(&secretMounts, containerWorkingDir); err != nil {
+ if err := addFIPSModeSecret(&secretMounts, containerWorkingDir); err != nil {
logrus.Warnf("error adding FIPS mode secret to container: %v", err)
}
} else if os.IsNotExist(err) {
@@ -237,11 +237,11 @@ func addSecretsFromMountsFile(filePath, mountLabel, containerWorkingDir, mountPr
return mounts, nil
}
-// addFIPSsModeSecret creates /run/secrets/system-fips in the container
+// addFIPSModeSecret creates /run/secrets/system-fips in the container
// root filesystem if /etc/system-fips exists on hosts.
// This enables the container to be FIPS compliant and run openssl in
// FIPS mode as the host is also in FIPS mode.
-func addFIPSsModeSecret(mounts *[]rspec.Mount, containerWorkingDir string) error {
+func addFIPSModeSecret(mounts *[]rspec.Mount, containerWorkingDir string) error {
secretsDir := "/run/secrets"
ctrDirOnHost := filepath.Join(containerWorkingDir, secretsDir)
if _, err := os.Stat(ctrDirOnHost); os.IsNotExist(err) {