pool/distrobox
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/distrobox?expand=0&rev=14

Browse Source
This commit is contained in:
Dario Faggioli 2022-07-28 21:33:05 +00:00 committed by Git OBS Bridge
parent ba14e7419d
commit b9ec37ce36
1 changed files with 0 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
0002-opensuse-check-for-the-config-file-in-usr-etc-too.patch
View File

@ -1,92 +0,0 @@
From 7226c7ecf370b9a424c6021138956dfa5782b344 Mon Sep 17 00:00:00 2001
From: Dario Faggioli <dfaggioli@suse.com>
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 <dfaggioli@suse.com>
(cherry picked from commit 0000000000000000000000000000000000000000)
Signed-off-by: Dario Faggioli <dfaggioli@suse.com>
---
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