Accepting request 1038665 from devel:microos
OBS-URL: https://build.opensuse.org/request/show/1038665 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libcontainers-common?expand=0&rev=52
This commit is contained in:
commit
943a5a309a
@ -1,6 +1,8 @@
|
||||
if test "$(id -u)" -gt "0" && test -d "$HOME"; then
|
||||
if test ! -e "$HOME"/.config/containers/storage.conf && grep -qx "driver = .*btrfs.*" /etc/containers/storage.conf ; then
|
||||
if test "$(findmnt -o FSTYPE -l --target '$HOME' | grep -v FSTYPE)" != "btrfs"; then
|
||||
if test ! -e "$HOME"/.config/containers/storage.conf && \
|
||||
test ! -e "$HOME"/.local/share/containers/storage/libpod && \
|
||||
grep -qx "driver = .*btrfs.*" /etc/containers/storage.conf ; then
|
||||
if test "$(findmnt -o FSTYPE -l --target "$HOME" | grep -v FSTYPE)" != "btrfs"; then
|
||||
# Home partition is not btrfs, but system wide setting is to use btrfs, this won't work
|
||||
# default to 'overlay' then
|
||||
export STORAGE_DRIVER=overlay
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 28 09:08:11 UTC 2022 - Dirk Müller <dmueller@suse.com>
|
||||
|
||||
- add requires on util-linux-systemd for findmnt in profile script
|
||||
- only set storage_driver env when no libpod exists
|
||||
- avoid quoting issue
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 22 12:48:38 UTC 2022 - Dan Čermák <dcermak@suse.com>
|
||||
|
||||
|
@ -45,6 +45,7 @@ Source12: container-storage-driver.sh
|
||||
BuildRequires: go-go-md2man
|
||||
Requires(post): %{_bindir}/grep
|
||||
Requires(post): %{_bindir}/sed
|
||||
Requires: util-linux-systemd
|
||||
Requires(post): util-linux-systemd
|
||||
Provides: libcontainers-image = %{version}
|
||||
Provides: libcontainers-storage = %{version}
|
||||
|
Loading…
Reference in New Issue
Block a user