chiark / gitweb /
machined: drop btrfs subvolumes when removing container images
authorLennart Poettering <lennart@poettering.net>
Sun, 5 Apr 2015 09:28:04 +0000 (11:28 +0200)
committerSven Eden <yamakuzure@gmx.net>
Tue, 14 Mar 2017 06:50:10 +0000 (07:50 +0100)
src/shared/machine-image.c

index c5808af..f166e94 100644 (file)
@@ -363,11 +363,13 @@ int image_remove(Image *i) {
         case IMAGE_DIRECTORY:
                 /* Allow deletion of read-only directories */
                 (void) chattr_path(i->path, false, FS_IMMUTABLE_FL);
-
-                /* fall through */
+                return rm_rf(i->path, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME);
 
         case IMAGE_RAW:
-                return rm_rf(i->path, REMOVE_ROOT|REMOVE_PHYSICAL);
+                if (unlink(i->path) < 0)
+                        return -errno;
+
+                return 0;
 
         default:
                 return -EOPNOTSUPP;