Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check resolv.conf file for updated --dns-server instead of guestinfo. #7824

Merged
merged 11 commits into from
Apr 27, 2018
Merged

Check resolv.conf file for updated --dns-server instead of guestinfo. #7824

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9744d8b
Check that binaries exist if they were installed via different means.
vburenin Apr 24, 2018
4f6ac4c
Merge branch 'master' into ci-test-needs
vburenin Apr 24, 2018
6743554
Enable SSH and check /etc/resolv.conf directly for the appropriate co…
vburenin Apr 25, 2018
bc4eb20
DNS vic-machine test has been updated to look for the real data.
vburenin Apr 25, 2018
e70fbd3
Merge branch 'master' into ci-test-needs
vburenin Apr 25, 2018
6acabc9
Removed guest info check.
vburenin Apr 25, 2018
9eca37f
Improved behavior with DHCP DNS server assignement.
vburenin Apr 26, 2018
b09f07f
Merge branch 'master' into ci-test-needs
vburenin Apr 26, 2018
f6e9e0b
Fixed log messages.
vburenin Apr 26, 2018
3ad65ce
Added more logs to track which DHCP options are set.
vburenin Apr 27, 2018
7585121
Merge branch 'master' into ci-test-needs
vburenin Apr 27, 2018
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
4 changes: 4 additions & 0 deletions isos/base/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,10 @@ END {
ensure_apt_packages() {
local install

if [ -x /usr/local/bin/xorriso -a -x /usr/bin/cpio ]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? We're passing in the package names we depend on to confirm and instead you've hardcoded a check for specific binaries.
I also see absolutely no correlation between this change and #7775

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just to trigger CI, nothing else.

return 0
fi

# ensure we've got the utils we need
for pkg in "$@"; do
dpkg -s $pkg >/dev/null 2>&1 || install="$install $pkg"
Expand Down