Skip to content

Commit

Permalink
Avoid dpkg interactive conflict resultion dialog while building. Keep…
Browse files Browse the repository at this point in the history
… already existing /etc/NetworkManager/NetworkManager.conf by qubes-core-agent-linux.

workaround for Qubes issue: 'use /etc/NetworkManager/conf.d snippet instead of /etc/NetworkManager/NetworkManager.conf to avoid dpkg interactive conflict resolution dialog questions'
QubesOS/qubes-issues#1176
  • Loading branch information
Patrick Schleizer committed Sep 9, 2015
1 parent 9fca4d6 commit 20ed305
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion build-steps.d/1700_install-packages
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,16 @@ $whonix_build_script_skip_package_install${reset}"

pkg-install-maybe anon-shared-desktop

## Keep already existing /etc/NetworkManager/NetworkManager.conf by qubes-core-agent-linux.
## Avoid dpkg interactive conflict resultion dialog while building.
## workaround for Qubes issue:
## 'use /etc/NetworkManager/conf.d snippet instead of /etc/NetworkManager/NetworkManager.conf to avoid dpkg interactive conflict resolution dialog questions'
## https://github.com/QubesOS/qubes-issues/issues/1176
local temp
temp=" -o Dpkg::Options::=--force-confold "
apt_unattended_opts+="$temp"
pkg-install-maybe anon-shared-desktop-kde
apt_unattended_opts="$(echo "$apt_unattended_opts" | sed "s|$temp||g")"

pkg-install-maybe anon-shared-kde-accessibility

Expand Down Expand Up @@ -423,8 +432,11 @@ $whonix_build_script_skip_package_install${reset}"
## a default /etc/fstab.
## The qubes-whonix package also ships /etc/fstab.
## This would result in an interactive dpkg conflict resolution dialog.
apt_unattended_opts+=" -o Dpkg::Options::=--force-confnew "
local temp
temp=" -o Dpkg::Options::=--force-confnew "
apt_unattended_opts+="$temp"
pkg-install-maybe qubes-whonix
apt_unattended_opts="$(echo "$apt_unattended_opts" | sed "s|$temp||g")"
fi

"$WHONIX_SOURCE_HELP_STEPS_FOLDER/remove-local-temp-apt-repo"
Expand Down

0 comments on commit 20ed305

Please sign in to comment.