Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package podman for openSUSE:Factory checked 
in at 2022-04-08 22:45:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/podman (Old)
 and      /work/SRC/openSUSE:Factory/.podman.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "podman"

Fri Apr  8 22:45:21 2022 rev:92 rq:967493 version:4.0.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/podman/podman.changes    2022-01-14 
23:13:16.766633291 +0100
+++ /work/SRC/openSUSE:Factory/.podman.new.1900/podman.changes  2022-04-08 
22:45:22.811364612 +0200
@@ -1,0 +2,933 @@
+Thu Apr  7 12:25:33 UTC 2022 - Fabian Vogt <fv...@suse.com>
+
+- Add patch to make buildah happy after selinux change:
+  * 0001-Adjust-buildah-to-opencontainers-selinux-v1.10.1.patch
+
+-------------------------------------------------------------------
+Thu Apr  7 08:51:50 UTC 2022 - Fabian Vogt <fv...@suse.com>
+
+- Add patch to fix starting containers on btrfs with SELinux
+  (gh#opencontainers/selinux#172):
+  * 0001-Relabel-relabel-links-instead-of-their-targets.patch
+- Add patch to fix starting containers as user service with systemd 250
+  (boo#1197672, gh#containers/podman#13731):
+  * 0002-specgen-do-not-set-OOMScoreAdj-by-default.patch
+
+-------------------------------------------------------------------
+Fri Apr 01 20:34:28 UTC 2022 - mich...@stroeder.com
+
+- Update to version 4.0.3:
+  * Security
+    - This release fixes CVE-2022-27649, where containers run by Podman would 
have excess inheritable capabilities set.
+  * Changes
+    - The podman machine rm --force command will now remove running machines 
as well (such machines are shut down first, then removed) (#13448).
+    - When a podman machine VM is started that is using a too-old VM image, it 
will now start in a reduced functionality mode, and provide instructions on how 
to recreate it (previously, VMs were effectively unusable) (#13510).
+  * Bugfixes
+    - Fixed a bug where devices added to containers by the --device option to 
podman run and podman create would not be accessible within the container.
+    - Fixed a bug where Podman would refuse to create containers when the 
working directory in the container was a symlink (#13346).
+    - Fixed a bug where pods would be created with cgroups even if cgroups 
were disabled in containers.conf (#13411).
+    - Fixed a bug where the podman play kube command would produce confusing 
errors if invalid YAML with duplicated container named was passed (#13332).
+    - Fixed a bug where the podman machine rm command would not remove the 
Podman API socket on the host that was associated with the VM.
+    - Fixed a bug where the remote Podman client was unable to properly resize 
the TTYs of containers on non-Linux OSes.
+    - Fixed a bug where rootless Podman could hang indefinitely when starting 
containers on systems with IPv6 disabled (#13388).
+    - Fixed a bug where the podman version command could sometimes print 
excess blank lines as part of its output.
+    - Fixed a bug where the podman generate systemd command would sometimes 
generate systemd services with names beginning with a hyphen (#13272).
+    - Fixed a bug where locally building the pause image could fail if the 
current directory contained a .dockerignore file (#13529).
+    - Fixed a bug where root containers in VMs created by podman machine could 
not bind ports to specific IPs on the host (#13543).
+    - Fixed a bug where the storage utilization percentages displayed by 
podman system df were incorrect (#13516).
+    - Fixed a bug where the CPU utilization percentages displayed by podman 
stats were incorrect (#13597).
+    - Fixed a bug where containers created with the --no-healthcheck option 
would still display healthcheck status in podman inspect (#13578).
+    - Fixed a bug where the podman pod rm command could print a warning about 
a missing cgroup (#13382).
+    - Fixed a bug where the podman exec command could sometimes print a timed 
out waiting for file error after the process in the container exited (#13227).
+    - Fixed a bug where virtual machines created by podman machine were not 
tolerant of changes to the path to the qemu binary on the host (#13394).
+    - Fixed a bug where the remote Podman client's podman build command did 
not properly handle the context directory if a Containerfile was manually 
specified using -f (#13293).
+    - Fixed a bug where Podman would not properly detect the use of systemd as 
PID 1 in a container when the entrypoint was prefixed with /bin/sh -c (#13324).
+    - Fixed a bug where rootless Podman could, on systems that do not use 
systemd as init, print a warning message about the rootless network namespace 
(#13703).
+    - Fixed a bug where the default systemd unit file for podman system 
service did not delegate all cgroup controllers, resulting in podman info 
queries against the remote API returning incorrect cgroup controllers (#13710).
+    - Fixed a bug where the slirp4netns port forwarder for rootless Podman 
would only publish the first port of a range (#13643).
+  * API
+    - Fixed a bug where the Compat Create API for containers did not properly 
handle permissions for tmpfs mounts (#13108).
+  * Misc
+    - The static binary for Linux is now built with CGo disabled to avoid 
panics due to a Golang bug (#13557).
+    - Updated Buildah to v1.24.3
+    - Updated the containers/storage library to v1.38.3
+    - Updated the containers/image library to v5.19.2
+    - Updated the containers/common library to v0.47.5
+
+-------------------------------------------------------------------
+Wed Mar 16 13:25:48 UTC 2022 - rbr...@suse.com
+
+- Update to version 4.0.2:
+  * Bump to v4.0.2
+  * Update release notes for v4.0.2
+  * Revert "use GetRuntimeDir() from c/common"
+  * Revert "Option --url and --connection should imply --remote."
+  * Option --url and --connection should imply --remote.
+  * Bump to v4.0.2-dev
+  * Bump to v4.0.1
+  * Update release notes for v4.0.1
+  * Fix a potential flake in volume plugins tests
+  * Propagate $CONTAINERS_CONF to conmon
+  * tests: Remove inaccurate comment
+  * System tests: show one-line config overview
+  * provide better error on invalid flag
+  * use GetRuntimeDir() from c/common
+  * kube: honor --build=false and make --build=true by default
+  * system tests: cleanup networks on teardown
+  * Remove the runtime lock
+  * Don't log errors on removing volumes inuse, if container --volumes-from
+  * kube: honor mount propagation mode
+  * Load ip_tables modules at boot
+  * Cirrus: Disable F34 aka prior-fedora testing
+  * Cirrus: Update VM Images for 4.0 release
+  * Bump to v4.0.1-dev
+  * Bump to v4.0.0
+  * Release notes for v4.0.0 final
+  * Fix lint
+  * Fix manifest 4.0 Endpoints Branch forced 4.0 only endpoints
+  * Introduce podman machine init --root=t|f and podman machine set --root=t|f
+  * Initial implementation of mac forwarding using a privileged docker sock 
claim helper
+  * ignition: propagate proxy settings from a host into a vm
+  * Update to podman4 copr stream
+  * Unify ls --filter docs for networks and pods
+  * e2e: merge after/since image-filter tests
+  * podman network: add documentation for netavark
+  * create: Fix key=value annotation in the flag output
+  * enable netavark specific tests
+  * Fix checkpoint/restore pod tests
+  * Make sure building with relative paths work correctly.
+  * Add 409 response to swagger godoc
+  * Fix images since/after tests
+  * Changes of docker descriptions
+  * Temporarily pull machine images from side repo
+  * Cirrus: TODO: netavark/aardvark release branches
+  * Cirrus: Expand netavark testing to include rootless
+  * Cirrus: Minor - limit release task applicability
+  * Cirrus: Add [CI:BUILD] magic that only builds
+  * CI: fix nightly builds
+  * Cirrus: Log netavark/aardvark binary build info.
+  * Cirrus: Add netavark/aardvark system test task
+  * Cirrus: Also download aardvark-dns binary
+  * Cirrus: Add e2e task w/ upstream netavark
+  * Revert minimum API change
+  * netavark e2e tests
+  * Bump to v4.0.0-dev
+  * Bump to v4.0.0-RC5
+  * Update release notes for v4.0.0-RC5
+  * Modify /etc/resolv.conf when connecting/disconnecting
+  * Do not set the network config dir to cni plugin dir
+  * Show API doc for several versions
+  * [NO NEW TEST NEEDED] Add schema for ImageCreate 200 response.
+  * fix: Multiplication of durations
+  * move rootless netns slirp4netns process to systemd user.slice
+  * compat: endpoint /build must set header content type as application/json 
in reponse
+  * Cleanup: remove obsolete/misleading bug workaround
+  * tests: retrofit healthcheck system tests
+  * healthcheck, libpod: Read healthcheck event output from os pipe
+  * Fix: Do not print error when parsing journald log fails
+  * Bump github.com/buger/goterm from 1.0.1 to 1.0.4
+  * append podman dns search domain
+  * Podman pod create --share-parent vs --share=cgroup
+  * System tests: revert emergency skip of checkpoint tests
+  * Add version guard to libpod API endpoints
+  * [v4.0] Bump c/common to v0.47.4
+  * idmap should be able to be specified along with other options
+  * Vendor in containers/buildah v1.24.1
+  * Bump to v4.0.0-dev
+  * Bump to v4.0.0-RC4
+  * Disable failing E2E test
+  * Revert "Move each search dns to its own line"
+  * Move each search dns to its own line
+  * Update release notes for v4.0.0-RC4
+  * Document `schema` values in the `--url` flag
+  * podman image scp syntax correction
+  * system prune: remove all networks
+  * Only change network fields if they were actually changed by the user
+  * docs: clarify rootless net stats
+  * Fix size to match Docker selection
+  * libpod: enforce noexec,nosuid,nodev for /dev/shm
+  * Clarify remote client means Mac and Windows
+  * libpod: report slirp4netns network stats
+  * Add notes to "--oom-kill-disable" not supported on cgroups V2
+  * Fix use of infra image to clarify default
+  * Adapt podman images ls filters docs to be aligned with prune filters docs
+  * ignition, machine: delegate cpu,io cgroup controllers to machine's default 
users
+  * pkg/bindings/images.Build(): slashify "dockerfile" values, too
+  * Remove mention of IPv6 portfwd from release notes
+  * Bump to v4.0.0-dev
+  * Bump to v4.0.0-RC3
+  * Update release notes for v4.0.0-RC3
+  * Fix Cirrus destination branch
+  * volume: add support for non-volatile upperdir,workdir for overlay volumes
+  * github: label issues based on os fix regex
+  * github: label issues based on os
+  * Cirrus: Fix get_ci_vm.sh initial setup
+  * System tests: emergency skip of checkpoint tests
+  * network create: allow multiple subnets
+  * Update troubleshooting.md
+  * Fix sort ordering of filters
+  * Unify podman prune filter description: volumes, networks, system
+  * Bump Buildah to v1.24.0
+  * rootless: drop permission check for devices
+  * switch podman image scp from depending on machinectl to just os/exec
+  * Bump github.com/containers/image/v5 from 5.18.0 to 5.19.0
+  * Bump github.com/containers/storage from 1.38.0 to 1.38.1
+  * change location of where make outputs podman binary on osx
+  * Github workflow: Fix parsing of GraphQL response JSON
+  * Github-workflow: Fix YAML syntax
+  * Update godoc, swagger using wrong struct
+  * Makefile: install targets independent of build
+  * [CI:DOCS] Fix typos and improve language
+  * CI: enable rootless-remote system tests
+  * pkg/specgen/generate/security: fix error message
+  * Github workflow: Send e-mail on job error
+  * Github workflow: Update Cirrus-cron GraphQL query
+  * remote build: set rootless oci isolation correctly
+  * [CI:DOCS] Fix typos and improve language
+  * Fix handling of duplicate matches on id expansion
+  * Show correct default values or show none
+  * exec: retry rm -rf on ENOTEMPTY and EBUSY
+  * container create: do not check for network dns support
+  * libpod: fix leaking fd
+  * libpod: fix connection leak
+  * [CI:DOCS] fix typo subpordinate
+  * Fix filter description and unify filters docs for containers/images prune
+  * Remove unused param and clean API handlers
+  * Restore machine start logic that was hanging
+  * Bump to v4.0.0-dev
++++ 736 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/podman/podman.changes
++++ and /work/SRC/openSUSE:Factory/.podman.new.1900/podman.changes

Old:
----
  podman-3.4.4.tar.xz

New:
----
  0001-Adjust-buildah-to-opencontainers-selinux-v1.10.1.patch
  0001-Relabel-relabel-links-instead-of-their-targets.patch
  0002-specgen-do-not-set-OOMScoreAdj-by-default.patch
  podman-4.0.3.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ podman.spec ++++++
--- /var/tmp/diff_new_pack.yOagyc/_old  2022-04-08 22:45:23.691354845 +0200
+++ /var/tmp/diff_new_pack.yOagyc/_new  2022-04-08 22:45:23.699354756 +0200
@@ -22,7 +22,7 @@
 %define with_libostree 1
 %endif
 Name:           podman
-Version:        3.4.4
+Version:        4.0.3
 Release:        0
 Summary:        Daemon-less container engine for managing containers, pods and 
images
 License:        Apache-2.0
@@ -32,6 +32,10 @@
 Source1:        podman.conf
 Source3:        %{name}-rpmlintrc
 Source4:        README.SUSE.SLES
+# PATCH-FIX-UPSTREAM
+Patch1:         0001-Relabel-relabel-links-instead-of-their-targets.patch
+Patch2:         0002-specgen-do-not-set-OOMScoreAdj-by-default.patch
+Patch3:         0001-Adjust-buildah-to-opencontainers-selinux-v1.10.1.patch
 BuildRequires:  bash-completion
 BuildRequires:  cni
 BuildRequires:  device-mapper-devel
@@ -47,7 +51,7 @@
 BuildRequires:  libcontainers-common
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
-BuildRequires:  golang(API) = 1.13
+BuildRequires:  golang(API) = 1.16
 BuildRequires:  pkgconfig(libselinux)
 BuildRequires:  pkgconfig(libsystemd)
 Recommends:     apparmor-abstractions
@@ -77,7 +81,7 @@
 skopeo, as they all share the same datastore backend.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %package remote
 Summary: Client for managing podman containers remotely
@@ -128,7 +132,7 @@
 # Updates must be tested manually.
 
 %install
-make DESTDIR=%{buildroot} PREFIX=/usr install install.completions 
install.docker install.docker-docs
+make DESTDIR=%{buildroot} PREFIX=/usr install install.completions 
install.docker
 
 # packaged in libcontainers-common
 rm %{buildroot}/usr/share/man/man5/oci-hooks.*
@@ -157,6 +161,9 @@
 %dir %{_prefix}/lib/modules-load.d
 %{_prefix}/lib/modules-load.d/podman.conf
 %{_tmpfilesdir}/podman.conf
+# Rootless port
+%dir %{_libexecdir}/podman
+%{_libexecdir}/podman/rootlessport
 # Completion
 %{_datadir}/bash-completion/completions/podman
 %{_datadir}/zsh/site-functions/_podman
@@ -191,7 +198,6 @@
 
 %files docker
 %{_bindir}/docker
-%{_mandir}/man1/docker*.1*
 %{_tmpfilesdir}/podman-docker.conf
 
 %post docker

++++++ 0001-Adjust-buildah-to-opencontainers-selinux-v1.10.1.patch ++++++
>From 3b94ac9fd951be492380e99323259add5456b706 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fv...@suse.de>
Date: Thu, 7 Apr 2022 14:24:07 +0200
Subject: [PATCH] Adjust buildah to opencontainers/selinux v1.10.1

Backport of https://github.com/containers/buildah/pull/3875
---
 vendor/github.com/containers/buildah/selinux.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vendor/github.com/containers/buildah/selinux.go 
b/vendor/github.com/containers/buildah/selinux.go
index e7e9fd8c2..de38d4aac 100644
--- a/vendor/github.com/containers/buildah/selinux.go
+++ b/vendor/github.com/containers/buildah/selinux.go
@@ -4,10 +4,10 @@ package buildah
 
 import (
        "fmt"
+       "os"
 
        "github.com/opencontainers/runtime-tools/generate"
        selinux "github.com/opencontainers/selinux/go-selinux"
-       "github.com/opencontainers/selinux/go-selinux/label"
        "github.com/pkg/errors"
 )
 
@@ -33,7 +33,7 @@ func runLabelStdioPipes(stdioPipe [][]int, processLabel, 
mountLabel string) erro
        }
        for i := range stdioPipe {
                pipeFdName := fmt.Sprintf("/proc/self/fd/%d", stdioPipe[i][0])
-               if err := label.Relabel(pipeFdName, pipeContext, false); err != 
nil {
+               if err := selinux.SetFileLabel(pipeFdName, pipeContext); err != 
nil && !os.IsNotExist(err) {
                        return errors.Wrapf(err, "setting file label on %q", 
pipeFdName)
                }
        }
-- 
2.35.1


++++++ 0001-Relabel-relabel-links-instead-of-their-targets.patch ++++++
>From 951c73696c76a54ca174c7478e225b99fee3e561 Mon Sep 17 00:00:00 2001
From: Tobias Polley <pol...@predic8.de>
Date: Thu, 17 Mar 2022 23:00:54 +0100
Subject: [PATCH 1/2] Relabel: relabel links instead of their targets

Signed-off-by: Tobias Polley <pol...@predic8.de>
---
 vendor/github.com/opencontainers/selinux/go-selinux/rchcon.go   | 2 +-
 .../opencontainers/selinux/go-selinux/rchcon_go115.go           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/rchcon.go 
b/vendor/github.com/opencontainers/selinux/go-selinux/rchcon.go
index 897ecbac4..feb739d32 100644
--- a/vendor/github.com/opencontainers/selinux/go-selinux/rchcon.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/rchcon.go
@@ -12,7 +12,7 @@ import (
 
 func rchcon(fpath, label string) error {
        return pwalkdir.Walk(fpath, func(p string, _ fs.DirEntry, _ error) 
error {
-               e := setFileLabel(p, label)
+               e := lSetFileLabel(p, label)
                // Walk a file tree can race with removal, so ignore ENOENT.
                if errors.Is(e, os.ErrNotExist) {
                        return nil
diff --git 
a/vendor/github.com/opencontainers/selinux/go-selinux/rchcon_go115.go 
b/vendor/github.com/opencontainers/selinux/go-selinux/rchcon_go115.go
index 2c8b033ce..ecc7abfac 100644
--- a/vendor/github.com/opencontainers/selinux/go-selinux/rchcon_go115.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/rchcon_go115.go
@@ -11,7 +11,7 @@ import (
 
 func rchcon(fpath, label string) error {
        return pwalk.Walk(fpath, func(p string, _ os.FileInfo, _ error) error {
-               e := setFileLabel(p, label)
+               e := lSetFileLabel(p, label)
                // Walk a file tree can race with removal, so ignore ENOENT.
                if errors.Is(e, os.ErrNotExist) {
                        return nil
-- 
2.35.1


++++++ 0002-specgen-do-not-set-OOMScoreAdj-by-default.patch ++++++
>From a8d92cf8540d4983934ba8f258a403de81af930d Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscri...@redhat.com>
Date: Mon, 4 Apr 2022 13:14:35 +0200
Subject: [PATCH 2/2] specgen: do not set OOMScoreAdj by default

do not force a value of OOMScoreAdj=0 if it is wasn't specified by the
user.

Closes: https://github.com/containers/podman/issues/13731

Signed-off-by: Giuseppe Scrivano <gscri...@redhat.com>
(cherry picked from commit 164b64ea3baa8502a23fc0c7674f4a7e60507aa0)
---
 cmd/podman/common/create.go      | 3 +--
 cmd/podman/common/create_opts.go | 2 +-
 cmd/podman/containers/create.go  | 7 +++++++
 pkg/domain/entities/pods.go      | 2 +-
 pkg/specgenutil/specgen.go       | 2 +-
 test/e2e/run_test.go             | 7 +++++++
 test/system/030-run.bats         | 6 ++++++
 7 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index 1121806d5..e7d073226 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -402,8 +402,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf 
*entities.ContainerCreateOptions,
                )
 
                oomScoreAdjFlagName := "oom-score-adj"
-               createFlags.IntVar(
-                       &cf.OOMScoreAdj,
+               createFlags.Int(
                        oomScoreAdjFlagName, 0,
                        "Tune the host's OOM preferences (-1000 to 1000)",
                )
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go
index b110b3d85..6c985cb60 100644
--- a/cmd/podman/common/create_opts.go
+++ b/cmd/podman/common/create_opts.go
@@ -277,7 +277,7 @@ func ContainerCreateToContainerCLIOpts(cc 
handlers.CreateContainerConfig, rtc *c
                LogDriver:         cc.HostConfig.LogConfig.Type,
                LogOptions:        
stringMaptoArray(cc.HostConfig.LogConfig.Config),
                Name:              cc.Name,
-               OOMScoreAdj:       cc.HostConfig.OomScoreAdj,
+               OOMScoreAdj:       &cc.HostConfig.OomScoreAdj,
                Arch:              "",
                OS:                "",
                Variant:           "",
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go
index 89d2e5515..1f3331272 100644
--- a/cmd/podman/containers/create.go
+++ b/cmd/podman/containers/create.go
@@ -238,6 +238,13 @@ func CreateInit(c *cobra.Command, vals 
entities.ContainerCreateOptions, isInfra
                        vals.GroupAdd = groups
                }
 
+               if c.Flags().Changed("oom-score-adj") {
+                       val, err := c.Flags().GetInt("oom-score-adj")
+                       if err != nil {
+                               return vals, err
+                       }
+                       vals.OOMScoreAdj = &val
+               }
                if c.Flags().Changed("pids-limit") {
                        val := c.Flag("pids-limit").Value.String()
                        // Convert -1 to 0, so that -1 maps to unlimited pids 
limit
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go
index 7922db4e6..cb6132e26 100644
--- a/pkg/domain/entities/pods.go
+++ b/pkg/domain/entities/pods.go
@@ -210,7 +210,7 @@ type ContainerCreateOptions struct {
        Name              string `json:"container_name"`
        NoHealthCheck     bool
        OOMKillDisable    bool
-       OOMScoreAdj       int
+       OOMScoreAdj       *int
        Arch              string
        OS                string
        Variant           string
diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go
index 17699a038..260d78913 100644
--- a/pkg/specgenutil/specgen.go
+++ b/pkg/specgenutil/specgen.go
@@ -660,7 +660,7 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c 
*entities.ContainerCreateOptions
        s.Name = c.Name
        s.PreserveFDs = c.PreserveFDs
 
-       s.OOMScoreAdj = &c.OOMScoreAdj
+       s.OOMScoreAdj = c.OOMScoreAdj
        if c.Restart != "" {
                splitRestart := strings.Split(c.Restart, ":")
                switch len(splitRestart) {
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 81dcc4342..d772cbc21 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -609,6 +609,13 @@ USER bin`, BB)
                session.WaitWithDefaultTimeout()
                Expect(session).Should(Exit(0))
                Expect(session.OutputToString()).To(Equal("111"))
+
+               currentOOMScoreAdj, err := 
ioutil.ReadFile("/proc/self/oom_score_adj")
+               Expect(err).To(BeNil())
+               session = podmanTest.Podman([]string{"run", "--rm", 
fedoraMinimal, "cat", "/proc/self/oom_score_adj"})
+               session.WaitWithDefaultTimeout()
+               Expect(session).Should(Exit(0))
+               
Expect(session.OutputToString()).To(Equal(strings.TrimRight(string(currentOOMScoreAdj),
 "\n")))
        })
 
        It("podman run limits host test", func() {
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index ec85ef166..72e4a2bc8 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -815,4 +815,10 @@ EOF
     run_podman run --uidmap 0:10001:10002 --rm --hostname ${HOST} $IMAGE grep 
${HOST} /etc/hosts
     is "${lines[0]}" ".*${HOST}.*"
 }
+
+@test "podman run doesn't override oom-score-adj" {
+    current_oom_score_adj=$(cat /proc/self/oom_score_adj)
+    run_podman run --rm $IMAGE cat /proc/self/oom_score_adj
+    is "$output" "$current_oom_score_adj" "different oom_score_adj in the 
container"
+}
 # vim: filetype=sh
-- 
2.35.1


++++++ _service ++++++
--- /var/tmp/diff_new_pack.yOagyc/_old  2022-04-08 22:45:23.783353824 +0200
+++ /var/tmp/diff_new_pack.yOagyc/_new  2022-04-08 22:45:23.787353779 +0200
@@ -2,7 +2,7 @@
   <service name="tar_scm" mode="disabled">
     <param name="url">https://github.com/containers/podman.git</param>
     <param name="scm">git</param>
-    <param name="revision">v3.4.4</param>
+    <param name="revision">v4.0.3</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>
     <param name="versionrewrite-pattern">v(.*)</param>

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.yOagyc/_old  2022-04-08 22:45:23.807353557 +0200
+++ /var/tmp/diff_new_pack.yOagyc/_new  2022-04-08 22:45:23.811353513 +0200
@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param 
name="url">https://github.com/containers/podman.git</param>
-              <param 
name="changesrevision">f6526ada1025c2e3f88745ba83b8b461ca659933</param></service></servicedata>
+              <param 
name="changesrevision">62534053086fdeba7b93117e7c4dc6e797835a3e</param></service></servicedata>
 (No newline at EOF)
 

++++++ podman-3.4.4.tar.xz -> podman-4.0.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/podman/podman-3.4.4.tar.xz 
/work/SRC/openSUSE:Factory/.podman.new.1900/podman-4.0.3.tar.xz differ: char 
15, line 1

Reply via email to