diff options
| -rw-r--r-- | docs/source/markdown/podman-system-migrate.1.md | 7 | ||||
| -rwxr-xr-x | hack/release.sh | 15 | ||||
| -rw-r--r-- | install.md | 2 | ||||
| -rw-r--r-- | pkg/cgroups/cgroups.go | 3 | ||||
| -rw-r--r-- | pkg/cgroups/cgroups_supported.go | 3 |
5 files changed, 6 insertions, 24 deletions
diff --git a/docs/source/markdown/podman-system-migrate.1.md b/docs/source/markdown/podman-system-migrate.1.md index d5e3bcb95..28db56dee 100644 --- a/docs/source/markdown/podman-system-migrate.1.md +++ b/docs/source/markdown/podman-system-migrate.1.md @@ -4,10 +4,10 @@ podman\-system\-migrate - Migrate existing containers to a new podman version ## SYNOPSIS -** podman system migrate** +**podman system migrate** ## DESCRIPTION -** podman system migrate** migrates containers to the latest podman version. +**podman system migrate** migrates containers to the latest podman version. **podman system migrate** takes care of migrating existing containers to the latest version of podman if any change is necessary. @@ -32,9 +32,6 @@ Set a new OCI runtime for all containers. This can be used after a system upgrade which changes the default OCI runtime to move all containers to the new runtime. There are no guarantees that the containers will continue to work under the new runtime, as some runtimes support differing options and configurations. -## SYNOPSIS -**podman system migrate** - ## SEE ALSO `podman(1)`, `libpod.conf(5)`, `usermod(8)` diff --git a/hack/release.sh b/hack/release.sh index 56a853347..7c22aed42 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -36,12 +36,6 @@ write_spec_version() sed -i "s/^\(Version: *\).*/\1${LOCAL_VERSION}/" contrib/spec/podman.spec.in } -write_makefile_epoch() -{ - LOCAL_EPOCH="$1" - sed -i "s/^\(EPOCH_TEST_COMMIT ?= \).*/\1${LOCAL_EPOCH}/" Makefile -} - write_changelog() { echo "- Changelog for v${VERSION} (${DATE})" >.changelog.txt && @@ -66,17 +60,8 @@ dev_version_commit() git commit -asm "Bump to v${NEXT_VERSION}-dev" } -epoch_commit() -{ - LOCAL_EPOCH="$1" - write_makefile_epoch "${LOCAL_EPOCH}" && - git commit -asm 'Bump gitvalidation epoch' -} - git fetch origin && git checkout -b "bump-${VERSION}" origin/master && -EPOCH=$(git rev-parse HEAD) && release_commit && git tag -s -m "version ${VERSION}" "v${VERSION}" && dev_version_commit && -epoch_commit "${EPOCH}" diff --git a/install.md b/install.md index 35a931c85..90ad4f233 100644 --- a/install.md +++ b/install.md @@ -140,7 +140,7 @@ The Kubic project provides RC/testing packages for Debian 10, testing and unstable. ```bash -# Debian Untesting/Sid +# Debian Unstable/Sid echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/testing/Debian_Unstable/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:testing.list wget -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:testing/Debian_Unstable/Release.key -O Release.key diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go index 6b28b2759..96786223d 100644 --- a/pkg/cgroups/cgroups.go +++ b/pkg/cgroups/cgroups.go @@ -97,8 +97,7 @@ type controllerHandler interface { } const ( - cgroupRoot = "/sys/fs/cgroup" - _cgroup2SuperMagic = 0x63677270 + cgroupRoot = "/sys/fs/cgroup" // CPU is the cpu controller CPU = "cpu" // CPUAcct is the cpuacct controller diff --git a/pkg/cgroups/cgroups_supported.go b/pkg/cgroups/cgroups_supported.go index 2a36777d4..a9fef38b9 100644 --- a/pkg/cgroups/cgroups_supported.go +++ b/pkg/cgroups/cgroups_supported.go @@ -12,6 +12,7 @@ import ( "syscall" "github.com/pkg/errors" + "golang.org/x/sys/unix" ) var ( @@ -27,7 +28,7 @@ func IsCgroup2UnifiedMode() (bool, error) { if err := syscall.Statfs("/sys/fs/cgroup", &st); err != nil { isUnified, isUnifiedErr = false, err } else { - isUnified, isUnifiedErr = st.Type == _cgroup2SuperMagic, nil + isUnified, isUnifiedErr = st.Type == unix.CGROUP2_SUPER_MAGIC, nil } }) return isUnified, isUnifiedErr |