-
Notifications
You must be signed in to change notification settings - Fork 486
Rebase be39b6d - select yum or apt-get in systemd-resolved #228
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the PR! Code changes LGTM, except for a couple tiny NITs. Once those are fixed, I can kick off tests.
@@ -67,14 +67,30 @@ function assert_not_empty { | |||
fi | |||
} | |||
|
|||
function has_yum { | |||
[ -n "$(command -v yum)" ] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: we follow the Google Bash style guide, so would you mind updating to [[ ]]
instead of [ ]
?
echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections | ||
sudo apt-get install -y iptables-persistent | ||
if has_apt_get; then | ||
sudo apt-get update -y |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: Not related to this PR, but I think we want:
sudo apt-get update -y | |
sudo DEBIAN_FRONTEND=noninteractive apt-get update -y |
Without it, we may occasionally get an interactive prompt here, causing the build to hang on input.
sudo apt-get update -y | ||
echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections | ||
echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections | ||
sudo apt-get install -y iptables-persistent |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: Not related to this PR, but I think we want:
sudo apt-get install -y iptables-persistent | |
sudo DEBIAN_FRONTEND=noninteractive apt-get install -y iptables-persistent |
Without it, we may occasionally get an interactive prompt here, causing the build to hang on input.
Rebase of #204 for tests.