CI: update CI for new rootful password setup

Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>
89luca89 · Aug 6, 2023 · 6c315c5 · 6c315c5
1 parent 315b9f2
commit 6c315c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/compatibility.yml b/.github/workflows/compatibility.yml
@@ -169,6 +169,7 @@ jobs:
 
       # Ensure distrobox export works:
       - name: Distrobox export - sudo
+        if: matrix.container_manager != 'docker'
         shell: 'script -q -e -c "bash {0}"'
         run: |
           image=${{ matrix.distribution }}

diff --git a/distrobox-export b/distrobox-export
@@ -224,12 +224,12 @@ fi
 #
 if [ "${is_login}" -ne 0 ]; then
 	if [ "${is_sudo}" -ne 0 ]; then
-		start_shell="$(command -v sudo) -i"
+		start_shell="$(command -v sudo) -S -i"
 	else
-		start_shell="$(command -v sudo) -u ${USER} -i"
+		start_shell="$(command -v sudo) -S -u ${USER} -i"
 	fi
 elif [ "${is_sudo}" -ne 0 ]; then
-	start_shell="$(command -v sudo)"
+	start_shell="$(command -v sudo) -S"
 else
 	start_shell=""
 fi