Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

search path for containers/storage.conf #479

Merged
merged 1 commit into from
Jul 4, 2024
Merged

search path for containers/storage.conf #479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions tools/qm-storage-settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,18 @@ exec_command() {
setup_init() {
ROOTFS=$(exec_command "/usr/share/qm/qm-rootfs")

# containers/storage.conf
STORAGE_CONFIG="${ROOTFS}/etc/containers/storage.conf"
STORAGE_CONF_PATHS=(
"${ROOTFS}/etc/containers/storage.conf"
"${ROOTFS}/usr/share/containers/storage.conf"
)

for STORAGE_CONF_PATH in ${STORAGE_CONF_PATHS[@]}; do
if [ -f ${STORAGE_CONF_PATH} ]; then
STORAGE_CONFIG="${STORAGE_CONF_PATH}"
return
fi
done

if [ -d /run/osbuild/ostree ]; then # osbuild exist, let's try ostree approach
STORAGE_CONFIG="/run/osbuild/tree/${STORAGE_CONFIG}"
if [ ! -f "${STORAGE_CONFIG}" ]; then
Expand Down
Loading