Compare commits
56 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
64df6e4c2c |
||
|
|
ae57335223 | ||
|
|
24aebce18e | ||
|
|
1c489e8814 |
||
|
|
3b59b9167d |
||
|
|
35bc45e44c | ||
|
|
c5f597d25a |
||
|
|
0945c3be00 |
||
|
|
9190c9536b |
||
|
|
fb25054e9a |
||
|
|
8b3a765a8a |
||
|
|
2566a30e68 |
||
|
|
8ad163c53d |
||
|
|
78c58edeab |
||
|
|
f3089680a3 |
||
|
|
94cfecb1bb | ||
|
|
355d1057b9 |
||
|
|
d251af6f3f |
||
|
|
2026ec1d9c | ||
|
|
93487ae1e6 | ||
|
|
f8824c56ed | ||
|
|
131862c9a8 | ||
|
|
67d7b5c046 | ||
|
|
e80c22b964 |
||
|
|
c40129f0a5 |
||
|
|
55a12353b6 |
||
|
|
37c2c1e934 |
||
|
|
e126b214a7 | ||
|
|
cdddfb59ed | ||
|
|
00af0584ae | ||
|
|
4f555eaa9c | ||
|
|
f142f8d504 | ||
|
|
103a1635e4 | ||
|
|
57e6b7ca23 | ||
|
|
a79325135f | ||
|
|
ea40d9effe | ||
|
|
44528bb774 | ||
|
|
f60e8c6c12 | ||
|
|
cb8cb423d9 | ||
|
|
d5897a3b49 | ||
|
|
d9d7979fbd | ||
|
|
cea7490e28 | ||
|
|
af2c842d0b | ||
|
|
4a4cdc766a | ||
|
|
224038594f | ||
|
|
62d028eb85 | ||
|
|
e63712aee2 | ||
|
|
c4991274bb | ||
|
|
63bea215f3 | ||
|
|
622079f99a | ||
|
|
e0df41811b | ||
|
|
b40d77906e | ||
|
|
6a48eb6852 | ||
|
|
5b3bc51eae | ||
|
|
dec1fd2f40 | ||
|
|
8b72355617 |
4 changed files with 817 additions and 184 deletions
97
.gitignore
vendored
97
.gitignore
vendored
|
|
@ -1 +1,98 @@
|
|||
/libpod-367213a.tar.gz
|
||||
/libpod-3d0100b.tar.gz
|
||||
/libpod-3723cec.tar.gz
|
||||
/libpod-525e3b1.tar.gz
|
||||
/libpod-c187538.tar.gz
|
||||
/libpod-98b95ff.tar.gz
|
||||
/libpod-f79a39a.tar.gz
|
||||
/cri-o-712f3b8.tar.gz
|
||||
/libpod-bc358eb.tar.gz
|
||||
/libpod-b47fc0d.tar.gz
|
||||
/libpod-57b403e.tar.gz
|
||||
/libpod-304bf53.tar.gz
|
||||
/libpod-db6bf9e.tar.gz
|
||||
/libpod-998fd2e.tar.gz
|
||||
/libpod-864b9c0.tar.gz
|
||||
/libpod-77a1665.tar.gz
|
||||
/libpod-6f51a5b.tar.gz
|
||||
/libpod-191da31.tar.gz
|
||||
/libpod-62b59df.tar.gz
|
||||
/libpod-fa8442e.tar.gz
|
||||
/libpod-6c5ebb0.tar.gz
|
||||
/libpod-96d1162.tar.gz
|
||||
/libpod-6a9dbf3.tar.gz
|
||||
/libpod-f2658ec.tar.gz
|
||||
/libpod-228732d.tar.gz
|
||||
/libpod-9b457e3.tar.gz
|
||||
/libpod-cf1d884.tar.gz
|
||||
/libpod-398133e.tar.gz
|
||||
/libpod-bef93de.tar.gz
|
||||
/libpod-58cb8f7.tar.gz
|
||||
/libpod-39a7a77.tar.gz
|
||||
/libpod-6774425.tar.gz
|
||||
/libpod-eda0fd7.tar.gz
|
||||
/libpod-7a0a855.tar.gz
|
||||
/libpod-970eaf0.tar.gz
|
||||
/libpod-64dc803.tar.gz
|
||||
/libpod-5ae940a.tar.gz
|
||||
/libpod-bb0e754.tar.gz
|
||||
/libpod-fa4705c.tar.gz
|
||||
/libpod-faa8c3e.tar.gz
|
||||
/libpod-2526355.tar.gz
|
||||
/libpod-cc1bad8.tar.gz
|
||||
/libpod-07253fc.tar.gz
|
||||
/libpod-45838b9.tar.gz
|
||||
/libpod-0613844.tar.gz
|
||||
/libpod-9fcc475.tar.gz
|
||||
/libpod-624660c.tar.gz
|
||||
/libpod-c54b423.tar.gz
|
||||
/libpod-44d1c1c.tar.gz
|
||||
/libpod-8ee0f2b.tar.gz
|
||||
/libpod-a127b4f.tar.gz
|
||||
/libpod-a9e9fd4.tar.gz
|
||||
/libpod-22e6f11.tar.gz
|
||||
/libpod-13f7450.tar.gz
|
||||
/libpod-cae49fc.tar.gz
|
||||
/libpod-14cf6d2.tar.gz
|
||||
/libpod-7b2b2bc.tar.gz
|
||||
/libpod-b1ebad9.tar.gz
|
||||
/libpod-1cbce85.tar.gz
|
||||
/libpod-b78e7e4.tar.gz
|
||||
/libpod-1e9e530.tar.gz
|
||||
/libpod-ab72130.tar.gz
|
||||
/libpod-95ea3d4.tar.gz
|
||||
/libpod-65033b5.tar.gz
|
||||
/libpod-6bdf023.tar.gz
|
||||
/libpod-b43677c.tar.gz
|
||||
/libpod-9e13457.tar.gz
|
||||
/libpod-5645789.tar.gz
|
||||
/libpod-f228cf7.tar.gz
|
||||
/libpod-6804fde.tar.gz
|
||||
/libpod-4bd0f22.tar.gz
|
||||
/libpod-7182339.tar.gz
|
||||
/libpod-e89bbd6.tar.gz
|
||||
/libpod-208b9a6.tar.gz
|
||||
/libpod-56133f7.tar.gz
|
||||
/libpod-fd12c89.tar.gz
|
||||
/libpod-d61d8a3.tar.gz
|
||||
/libpod-b96be3a.tar.gz
|
||||
/libpod-767b3dd.tar.gz
|
||||
/libpod-6d8fac8.tar.gz
|
||||
/libpod-f2462ca.tar.gz
|
||||
/libpod-99959e5.tar.gz
|
||||
/libpod-ca6ffbc.tar.gz
|
||||
/libpod-0660108.tar.gz
|
||||
/libpod-f661e1d.tar.gz
|
||||
/libpod-c7424b6.tar.gz
|
||||
/libpod-4f9b1ae.tar.gz
|
||||
/libpod-84cfdb2.tar.gz
|
||||
/libpod-86154b6.tar.gz
|
||||
/libpod-9a18681.tar.gz
|
||||
/libpod-c90b740.tar.gz
|
||||
/libpod-9c806a4.tar.gz
|
||||
/libpod-3dd577e.tar.gz
|
||||
/libpod-87d8edb.tar.gz
|
||||
/libpod-433cbd5.tar.gz
|
||||
/libpod-5a4e590.tar.gz
|
||||
/libpod-1a439f9.tar.gz
|
||||
/libpod-3d55721.tar.gz
|
||||
|
|
|
|||
41
f27.patch
Normal file
41
f27.patch
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
diff --git a/Makefile b/Makefile
|
||||
index bbd00e4..477890a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -236,8 +236,6 @@ install.docker: docker-docs
|
||||
install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(MANDIR)/man1
|
||||
|
||||
install.systemd:
|
||||
- install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.socket ${SYSTEMDDIR}/io.podman.socket
|
||||
- install ${SELINUXOPT} -m 644 -D contrib/varlink/io.podman.service ${SYSTEMDDIR}/io.podman.service
|
||||
install ${SELINUXOPT} -m 644 -D contrib/varlink/podman.conf ${TMPFILESDIR}/podman.conf
|
||||
|
||||
install.python:
|
||||
diff --git a/libpod.conf b/libpod.conf
|
||||
index cef5a12..3a363e2 100644
|
||||
--- a/libpod.conf
|
||||
+++ b/libpod.conf
|
||||
@@ -30,7 +30,7 @@ conmon_env_vars = [
|
||||
]
|
||||
|
||||
# CGroup Manager - valid values are "systemd" and "cgroupfs"
|
||||
-cgroup_manager = "systemd"
|
||||
+cgroup_manager = "cgroupfs"
|
||||
|
||||
# Directory for persistent libpod files (database, etc)
|
||||
# By default, this will be configured relative to where containers/storage
|
||||
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go
|
||||
index 9d1347cc..f1f2b963 100644
|
||||
--- a/cmd/podman/libpodruntime/runtime.go
|
||||
+++ b/cmd/podman/libpodruntime/runtime.go
|
||||
@@ -105,6 +105,10 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions
|
||||
|
||||
if c.GlobalIsSet("cgroup-manager") {
|
||||
options = append(options, libpod.WithCgroupManager(c.GlobalString("cgroup-manager")))
|
||||
+ } else {
|
||||
+ if rootless.IsRootless() {
|
||||
+ options = append(options, libpod.WithCgroupManager("cgroupfs"))
|
||||
+ }
|
||||
}
|
||||
|
||||
// TODO flag to set libpod static dir?
|
||||
861
podman.spec
861
podman.spec
File diff suppressed because it is too large
Load diff
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libpod-367213a.tar.gz) = a331028909048a440ce6f417528e0132fe2f2a5a2d3b60b1b5211992ff7956858700f89a181e9d647e65bf7f2554b6ffc6030b6425e6d06a09094ca701c40d74
|
||||
SHA512 (libpod-3d55721.tar.gz) = 78366d0f6cb63d83bfbd49dc59b9206494eef9aa72d8a8d7e937f875bc05fb245d3ff8ae3ca6b7f6397d8ee094b5e48a37c750dfb9278033d204fda769aa7420
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue