Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/core.func
Original file line number Diff line number Diff line change
Expand Up @@ -2741,7 +2741,7 @@ apt_conffile_report() {
rm -f "$_CS_CONFFILE_GUARD"
_CS_CONFFILE_GUARD=""
unset APT_CONFIG
[[ -n "${added//[[:space:]]/}" ]] || return 0
[[ -n "${added//[[:space:]]/}" && -z "${_CS_CONFFILE_QUIET:-}" ]] || return 0

msg_warn "Kept your version of these config files - upstream shipped changes to them too:"
local f
Expand Down
4 changes: 4 additions & 0 deletions lxc/install.func
Original file line number Diff line number Diff line change
Expand Up @@ -1371,6 +1371,10 @@ network_check() {
# Updates container OS and sources appropriate tools.func
# ------------------------------------------------------------------------------
update_os() {
# Scripts write a package's config before installing it; dpkg then asked about
# the conffile with no terminal and the install failed.
_CS_CONFFILE_QUIET=1
declare -f apt_conffile_guard >/dev/null 2>&1 && apt_conffile_guard
msg_info "Updating Container OS"
configure_http_proxy

Expand Down
Loading