Switch references of /var/run -> /run

Systemd is now complaining or mentioning /var/run as a legacy directory. It has been many years where /var/run is a symlink to /run on all most distributions, make the change to the default. Partial fix for containers/podman#8369 Signed-off-by: Daniel J Walsh <[email protected]>
rhatdan · Dec 18, 2020 · 18f3e87 · 18f3e87
1 parent 6747061
commit 18f3e87
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
@@ -186,7 +186,7 @@ remove_storage_mountopt() {
     cat <<EOF> $FILEPATH
 [storage]
 driver = "overlay"
-runroot = "/var/run/containers/storage"
+runroot = "/run/containers/storage"
 graphroot = "/var/lib/containers/storage"
 [storage.options]
 mountopt = ""

diff --git a/docs/buildah-info.md b/docs/buildah-info.md
@@ -56,15 +56,15 @@ $ buildah info
         "ImageStore": {
             "number": 1
         },
-        "RunRoot": "/var/run/containers/storage"
+        "RunRoot": "/run/containers/storage"
     }
 }
 ```
 
 Run buildah info and retrieve only the store information:
 ```
 $ buildah info --format={{".store"}}
-map[GraphOptions:[overlay.override_kernel_check=true] GraphStatus:map[Backing Filesystem:extfs Supports d_type:true Native Overlay Diff:true] ImageStore:map[number:1] ContainerStore:map[number:2] GraphRoot:/var/lib/containers/storage RunRoot:/var/run/containers/storage GraphDriverName:overlay]
+map[GraphOptions:[overlay.override_kernel_check=true] GraphStatus:map[Backing Filesystem:extfs Supports d_type:true Native Overlay Diff:true] ImageStore:map[number:1] ContainerStore:map[number:2] GraphRoot:/var/lib/containers/storage RunRoot:/run/containers/storage GraphDriverName:overlay]
 ```
 
 ## SEE ALSO

diff --git a/docs/buildah-unshare.md b/docs/buildah-unshare.md
@@ -35,7 +35,7 @@ buildah unshare pwd
 
 buildah unshare cat /proc/self/uid\_map /proc/self/gid\_map
 
-buildah unshare rm -fr $HOME/.local/share/containers/storage /var/run/user/\`id -u\`/run
+buildah unshare rm -fr $HOME/.local/share/containers/storage /run/user/\`id -u\`/run
 
 buildah unshare --mount containerID sh -c 'cat ${containerID}/etc/os-release'
 

diff --git a/docs/buildah.md b/docs/buildah.md
@@ -51,7 +51,7 @@ Default root dir is configured in /etc/containers/storage.conf
 
 **--runroot** **value**
 
-Storage state dir (default: "/var/run/containers/storage" for UID 0, "/var/run/user/$UID" for other users)
+Storage state dir (default: "/run/containers/storage" for UID 0, "/run/user/$UID" for other users)
 Default state dir is configured in /etc/containers/storage.conf
 
 **--storage-driver** **value**

diff --git a/docs/tutorials/03-on-build.md b/docs/tutorials/03-on-build.md
@@ -69,7 +69,7 @@ The second container is now created and the `/bar` file will be created within i
 STEP 1: FROM onbuild-image
 STEP 2: RUN touch /bar    # Note /bar created here based on the ONBUILD in Dockerfile
 STEP 3: RUN touch /baz
-STEP 4: COMMIT containers-storage:[overlay@/var/lib/containers/storage+/var/run/containers/storage:overlay.override_kernel_check=true]localhost/result-image:latest
+STEP 4: COMMIT containers-storage:[overlay@/var/lib/containers/storage+/run/containers/storage:overlay.override_kernel_check=true]localhost/result-image:latest
 {output edited for brevity}
 $ container=$(sudo buildah from result-image:latest)
 # buildah run $container ls /bar /foo /baz
@@ -98,7 +98,7 @@ The onbuild-image has been created, so now create a container from it using the
 STEP 1: FROM onbuild-image
 STEP 2: RUN touch /bar    # Note /bar created here based on the ONBUILD in Dockerfile
 STEP 3: RUN touch /baz
-STEP 4: COMMIT containers-storage:[overlay@/var/lib/containers/storage+/var/run/containers/storage:overlay.override_kernel_check=true]localhost/result-image:latest
+STEP 4: COMMIT containers-storage:[overlay@/var/lib/containers/storage+/run/containers/storage:overlay.override_kernel_check=true]localhost/result-image:latest
 {output edited for brevity}
 $ container=$(sudo buildah from result-image:latest)
 # buildah run $container ls /bar /foo /baz