summaryrefslogtreecommitdiff
path: root/libpod/reset.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-12-16 08:48:28 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2020-12-16 15:09:37 -0500
commit82424aa0079d69d96ce3a5f6d858465b6760709e (patch)
tree117dc7e33af55598eae6f06f5344e7db32919bb6 /libpod/reset.go
parentbacb2fc526dba7214e3c8420eccc5cf22bbb1a29 (diff)
downloadpodman-82424aa0079d69d96ce3a5f6d858465b6760709e.tar.gz
podman-82424aa0079d69d96ce3a5f6d858465b6760709e.tar.bz2
podman-82424aa0079d69d96ce3a5f6d858465b6760709e.zip
Don't accidently remove XDG_RUNTIME_DIR when reseting storage
In certain cases XDG_RUNTIME_DIR was deleted by accident based on settings in the storage.conf. This patch verifies that when doing a storage reset, we don't accidently remove XDG_RUNTIME_DIR. Fixes: https://github.com/containers/podman/issues/8680 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'libpod/reset.go')
-rw-r--r--libpod/reset.go37
1 files changed, 30 insertions, 7 deletions
diff --git a/libpod/reset.go b/libpod/reset.go
index 6d2842723..24efeed40 100644
--- a/libpod/reset.go
+++ b/libpod/reset.go
@@ -77,18 +77,35 @@ func (r *Runtime) Reset(ctx context.Context) error {
}
}
+ xdgRuntimeDir := filepath.Clean(os.Getenv("XDG_RUNTIME_DIR"))
_, prevError := r.store.Shutdown(true)
- if err := os.RemoveAll(r.store.GraphRoot()); err != nil {
+ graphRoot := filepath.Clean(r.store.GraphRoot())
+ if graphRoot == xdgRuntimeDir {
if prevError != nil {
logrus.Error(prevError)
}
- prevError = err
+ prevError = errors.Errorf("failed to remove runtime graph root dir %s, since it is the same as XDG_RUNTIME_DIR", graphRoot)
+ } else {
+ if err := os.RemoveAll(graphRoot); err != nil {
+ if prevError != nil {
+ logrus.Error(prevError)
+ }
+ prevError = err
+ }
}
- if err := os.RemoveAll(r.store.RunRoot()); err != nil {
+ runRoot := filepath.Clean(r.store.RunRoot())
+ if runRoot == xdgRuntimeDir {
if prevError != nil {
logrus.Error(prevError)
}
- prevError = err
+ prevError = errors.Errorf("failed to remove runtime root dir %s, since it is the same as XDG_RUNTIME_DIR", runRoot)
+ } else {
+ if err := os.RemoveAll(runRoot); err != nil {
+ if prevError != nil {
+ logrus.Error(prevError)
+ }
+ prevError = err
+ }
}
runtimeDir, err := util.GetRuntimeDir()
if err != nil {
@@ -98,13 +115,19 @@ func (r *Runtime) Reset(ctx context.Context) error {
if tempDir == runtimeDir {
tempDir = filepath.Join(tempDir, "containers")
}
- if err := os.RemoveAll(tempDir); err != nil {
+ if filepath.Clean(tempDir) == xdgRuntimeDir {
if prevError != nil {
logrus.Error(prevError)
}
- prevError = err
+ prevError = errors.Errorf("failed to remove runtime tmpdir %s, since it is the same as XDG_RUNTIME_DIR", tempDir)
+ } else {
+ if err := os.RemoveAll(tempDir); err != nil {
+ if prevError != nil {
+ logrus.Error(prevError)
+ }
+ prevError = err
+ }
}
-
if storageConfPath, err := storage.DefaultConfigFile(rootless.IsRootless()); err == nil {
if _, err = os.Stat(storageConfPath); err == nil {
fmt.Printf("A storage.conf file exists at %s\n", storageConfPath)