From b9ec37ce36f001c93c5c1f4c6d4a3727b466d0a264d2c8dbd804840b2ef7a4ee Mon Sep 17 00:00:00 2001 From: Dario Faggioli Date: Thu, 28 Jul 2022 21:33:05 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/distrobox?expand=0&rev=14 --- ...k-for-the-config-file-in-usr-etc-too.patch | 92 ------------------- 1 file changed, 92 deletions(-) delete mode 100644 0002-opensuse-check-for-the-config-file-in-usr-etc-too.patch diff --git a/0002-opensuse-check-for-the-config-file-in-usr-etc-too.patch b/0002-opensuse-check-for-the-config-file-in-usr-etc-too.patch deleted file mode 100644 index a41c785..0000000 --- a/0002-opensuse-check-for-the-config-file-in-usr-etc-too.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 7226c7ecf370b9a424c6021138956dfa5782b344 Mon Sep 17 00:00:00 2001 -From: Dario Faggioli -Date: Wed, 27 Jul 2022 12:50:16 +0200 -Subject: [PATCH 2/2] opensuse: check for the config file in /usr/etc too - -Signed-off-by: Dario Faggioli -(cherry picked from commit 0000000000000000000000000000000000000000) -Signed-off-by: Dario Faggioli ---- - distrobox-create | 1 + - distrobox-enter | 1 + - distrobox-list | 1 + - distrobox-rm | 1 + - distrobox-stop | 1 + - docs/README.md | 1 + - 6 files changed, 6 insertions(+) - -diff --git a/distrobox-create b/distrobox-create -index b0bb0e9..94fe003 100755 ---- a/distrobox-create -+++ b/distrobox-create -@@ -79,6 +79,7 @@ version="1.3.1" - # leave priority to environment variables. - config_files=" - /usr/share/distrobox/distrobox.conf -+ /usr/etc/distrobox/distrobox.conf - /etc/distrobox/distrobox.conf - ${HOME}/.config/distrobox/distrobox.conf - ${HOME}/.distroboxrc -diff --git a/distrobox-enter b/distrobox-enter -index e754c6b..25870f2 100755 ---- a/distrobox-enter -+++ b/distrobox-enter -@@ -69,6 +69,7 @@ version="1.3.1" - # leave priority to environment variables. - config_files=" - /usr/share/distrobox/distrobox.conf -+ /usr/etc/distrobox/distrobox.conf - /etc/distrobox/distrobox.conf - ${HOME}/.config/distrobox/distrobox.conf - ${HOME}/.distroboxrc -diff --git a/distrobox-list b/distrobox-list -index f62da97..36788df 100755 ---- a/distrobox-list -+++ b/distrobox-list -@@ -42,6 +42,7 @@ container_manager="autodetect" - # leave priority to environment variables. - config_files=" - /usr/share/distrobox/distrobox.conf -+ /usr/etc/distrobox/distrobox.conf - /etc/distrobox/distrobox.conf - ${HOME}/.config/distrobox/distrobox.conf - ${HOME}/.distroboxrc -diff --git a/distrobox-rm b/distrobox-rm -index 4d6b0a8..e23a1d7 100755 ---- a/distrobox-rm -+++ b/distrobox-rm -@@ -46,6 +46,7 @@ version="1.3.1" - # leave priority to environment variables. - config_files=" - /usr/share/distrobox/distrobox.conf -+ /usr/etc/distrobox/distrobox.conf - /etc/distrobox/distrobox.conf - ${HOME}/.config/distrobox/distrobox.conf - ${HOME}/.distroboxrc -diff --git a/distrobox-stop b/distrobox-stop -index accfce0..f848b7e 100755 ---- a/distrobox-stop -+++ b/distrobox-stop -@@ -45,6 +45,7 @@ version="1.3.1" - # leave priority to environment variables. - config_files=" - /usr/share/distrobox/distrobox.conf -+ /usr/etc/distrobox/distrobox.conf - /etc/distrobox/distrobox.conf - ${HOME}/.config/distrobox/distrobox.conf - ${HOME}/.distroboxrc -diff --git a/docs/README.md b/docs/README.md -index df00785..61b2c7a 100644 ---- a/docs/README.md -+++ b/docs/README.md -@@ -243,6 +243,7 @@ Configuration files can be placed in the following paths, from the least importa - to the most important: - - - /usr/share/distrobox/distrobox.conf -+- /usr/etc/distrobox/distrobox.conf - - /etc/distrobox/distrobox.conf - - ${HOME}/.config/distrobox/distrobox.conf - - ${HOME}/.distroboxrc --- -2.37.1 -