Skip to content

Commit 1d7dbd8

Browse files
dougslandYarboa
dougsland
authored and
Yarboa
committed
Switch default additional image store to match modern defaults
cs10/fedora uses /usr/lib/containers/storage as an additional image store by default. Ref: https://gitlab.com/CentOS/automotive/src/automotive-image-builder/-/merge_requests/648 Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
1 parent 42f4a0f commit 1d7dbd8

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

‎docs/docs/usage.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@ lrwxrwxrwx. 1 root root 0 May 1 04:33 /proc/self/ns/net -> 'net:[4026532287]'
238238
## Debugging with podman in QM
239239

240240
```console
241-
bash-5.1# podman --root /usr/share/containers/storage pull alpine
242-
Error: creating runtime static files directory "/usr/share/containers/storage/libpod":
243-
mkdir /usr/share/containers/storage: read-only file system
241+
bash-5.1# podman --root /usr/lib/containers/storage pull alpine
242+
Error: creating runtime static files directory "/usr/lib/containers/storage/libpod":
243+
mkdir /usr/lib/containers/storage: read-only file system
244244
```
245245

246246
## Debugging with quadlet

‎tools/qm-storage-settings‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ setup_init() {
4545

4646
STORAGE_CONF_PATHS=(
4747
"${ROOTFS}/etc/containers/storage.conf"
48+
"${ROOTFS}/usr/lib/containers/storage.conf"
4849
"${ROOTFS}/usr/share/containers/storage.conf"
4950
)
5051

@@ -82,8 +83,9 @@ additional_images_storages() {
8283
8384
# Execute the following if we are inside the specified block
8485
if (insideBlock == 1) {
85-
# Check if the line contains the specific path "/usr/share/containers/storage"
86-
if ($0 ~ /"\/usr\/share\/containers\/storage"/) {
86+
# Check if the line contains the specific path "/usr/lib/containers/storage" or
87+
# /usr/share/containers/storage
88+
if ($0 ~ /"\/usr\/(lib|share)\/containers\/storage"/) {
8789
if ($0 !~ /,$/) { # If the line does not end with a comma
8890
print $0 "," # Print the line with a comma appended
8991
} else {

0 commit comments

Comments
 (0)