summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-11-19 16:48:15 +0100
committerGitHub <noreply@github.com>2021-11-19 16:48:15 +0100
commit671e5ee42d4eb71fc0238e8b0b1e4a68b1def156 (patch)
treed1c6fdd3c0eb348f005886f1e682cfd5db8c51c9 /pkg
parentf82f6c1b0d102b6047be65c408bc365f066ecda9 (diff)
parentb2623ceb4b8a55ba46d1262dac220f0eb4e4eabd (diff)
downloadpodman-671e5ee42d4eb71fc0238e8b0b1e4a68b1def156.tar.gz
podman-671e5ee42d4eb71fc0238e8b0b1e4a68b1def156.tar.bz2
podman-671e5ee42d4eb71fc0238e8b0b1e4a68b1def156.zip
Merge pull request #12367 from rst0git/file-locks-1
test: Update error string for --file-locks test
Diffstat (limited to 'pkg')
-rw-r--r--pkg/api/handlers/libpod/containers.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/api/handlers/libpod/containers.go b/pkg/api/handlers/libpod/containers.go
index d5da22a91..21c72bbda 100644
--- a/pkg/api/handlers/libpod/containers.go
+++ b/pkg/api/handlers/libpod/containers.go
@@ -221,6 +221,7 @@ func Checkpoint(w http.ResponseWriter, r *http.Request) {
PrintStats bool `schema:"printStats"`
PreCheckpoint bool `schema:"preCheckpoint"`
WithPrevious bool `schema:"withPrevious"`
+ FileLocks bool `schema:"fileLocks"`
}{
// override any golang type defaults
}
@@ -246,6 +247,7 @@ func Checkpoint(w http.ResponseWriter, r *http.Request) {
PrintStats: query.PrintStats,
PreCheckPoint: query.PreCheckpoint,
WithPrevious: query.WithPrevious,
+ FileLocks: query.FileLocks,
}
if query.Export {
@@ -305,6 +307,7 @@ func Restore(w http.ResponseWriter, r *http.Request) {
IgnoreStaticIP bool `schema:"ignoreStaticIP"`
IgnoreStaticMAC bool `schema:"ignoreStaticMAC"`
PrintStats bool `schema:"printStats"`
+ FileLocks bool `schema:"fileLocks"`
PublishPorts string `schema:"publishPorts"`
}{
// override any golang type defaults
@@ -324,6 +327,7 @@ func Restore(w http.ResponseWriter, r *http.Request) {
IgnoreStaticIP: query.IgnoreStaticIP,
IgnoreStaticMAC: query.IgnoreStaticMAC,
PrintStats: query.PrintStats,
+ FileLocks: query.FileLocks,
PublishPorts: strings.Fields(query.PublishPorts),
}