Skip to content

Commit

Permalink
Don't enable backports
Browse files Browse the repository at this point in the history
  • Loading branch information
swelljoe committed Jul 7, 2017
1 parent 39010ae commit 3f19375
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion virtualmin-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ install_virtualmin_release () {
run_ok "apt-get update" "Downloading Virtualmin repository metadata"
# Make sure universe repos are available
# XXX Test to make sure this run_ok syntax works as expected (with single quotes inside double)
run_ok "sed -ie 's/#*[ ]*deb \(.*\) universe$/deb \1 universe/' /etc/apt/sources.list" \
run_ok "sed -ie '/backports/b; s/#*[ ]*deb \(.*\) universe$/deb \1 universe/' /etc/apt/sources.list" \
"Enabling universe repositories, if not already available"
# XXX Is this still enabled by default on Debian/Ubuntu systems?
run_ok "sed -ie 's/^deb cdrom:/#deb cdrom:/' /etc/apt/sources.list" "Disabling cdrom: repositories"
Expand Down Expand Up @@ -738,8 +738,10 @@ case "$os_type" in
esac

# Reap any clingy processes (like spinner forks)
# get the parent pids (as those are the problem)
allpids="$(ps -o pid= --ppid $$) $allpids"
kill "$allpids" &>/dev/null
# kill the virtualmin config-system command, if it's still running
kill "$config_system_pid" &>/dev/null
# Make sure the cursor is back (if spinners misbehaved)
tput cnorm
Expand Down

0 comments on commit 3f19375

Please sign in to comment.