Skip to content

Commit e3f4c70

Browse files
committed
storage: remove aufs driver
There are no signs that anyone still uses aufs, no major distro seem to support it so let's remove it and it hasn't been tested in CI for over for years[1]. Remove the driver code and config fields for it. There are still a bunch of references in pkg/archive which I have kept as I am not sure how much of that still applies. [1] containers/storage@a54d4e3 Fixes: #342 Signed-off-by: Paul Holzinger <[email protected]>
1 parent a6c98ba commit e3f4c70

File tree

14 files changed

+4
-1842
lines changed

14 files changed

+4
-1842
lines changed

storage/contrib/cirrus/build_and_test.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ case $TEST_DRIVER in
2525
vfs)
2626
showrun make STORAGE_DRIVER=vfs local-test-integration local-test-unit
2727
;;
28-
aufs)
29-
showrun make STORAGE_DRIVER=aufs local-test-integration local-test-unit
30-
;;
3128
btrfs)
3229
# Fedora: Needs btrfs-progs, btrfs-progs-devel
3330
# Debian: Needs btrfs-progs, libbtrfs-dev

storage/docs/containers-storage.conf.5.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ No bare options are used. The format of TOML can be simplified to:
2727
The `storage` table supports the following options:
2828

2929
**driver**=""
30-
Copy On Write (COW) container storage driver. Valid drivers are "overlay", "vfs", "aufs", "btrfs", and "zfs". Some drivers (for example, "zfs", "btrfs", and "aufs") may not work if your kernel lacks support for the filesystem.
30+
Copy On Write (COW) container storage driver. Valid drivers are "overlay", "vfs", "btrfs", and "zfs". Some drivers (for example, "zfs" and "btrfs") may not work if your kernel lacks support for the filesystem.
3131
This field is required to guarantee proper operation.
3232
Valid rootless drivers are "btrfs", "overlay", and "vfs".
3333
Rootless users default to the driver defined in the system configuration when possible.
@@ -145,13 +145,6 @@ The `storage.options.pull_options` table supports the following keys:
145145

146146
This is a "string bool": "false"|"true" (cannot be native TOML boolean)
147147

148-
### STORAGE OPTIONS FOR AUFS TABLE
149-
150-
The `storage.options.aufs` table supports the following options:
151-
152-
**mountopt**=""
153-
Comma separated list of default options to be used to mount container images. Suggested value "nodev". Mount options are documented in the mount(8) man page.
154-
155148
### STORAGE OPTIONS FOR BTRFS TABLE
156149

157150
The `storage.options.btrfs` table supports the following options:
@@ -210,7 +203,7 @@ attribute permissions to processes within containers rather than the
210203
for mounting the file system. In rootless mode, without the CAP_SYS_ADMIN
211204
capability, many kernels prevent mounting of overlay file systems, requiring
212205
you to specify a mount_program. The mount_program option is also required on
213-
systems where the underlying storage is btrfs, aufs, zfs, overlay, or ecryptfs
206+
systems where the underlying storage is btrfs, zfs, overlay, or ecryptfs
214207
based file systems.
215208
mount_program = "/usr/bin/fuse-overlayfs"
216209

0 commit comments

Comments
 (0)