Skip to content
Draft
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions modules/linux_gui/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,17 @@
provider => 'shell',
}

# eno1d1 is a second port on the same NIC as eno1. It may have a live
# cable but no DHCP scope, causing NetworkManager-wait-online to time
# out on boot. Mark it unmanaged so NM ignores it.
file { '/etc/NetworkManager/conf.d/unmanaged-devices.conf':
ensure => file,
owner => 'root',
group => 'root',
mode => '0644',
content => "[keyfile]\nunmanaged-devices=interface-name:eno1d1\n",
}

# ensure ~/.config/systemd/user/ exists
file { [
"${builder_home}/.config/systemd",
Expand Down
2 changes: 0 additions & 2 deletions modules/puppet/templates/puppet-ubuntu-run-puppet.sh.erb
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ function update_puppet {
git remote add origin "${PUPPET_REPO}" || return 1
fi

# TODO: authenticate the remote actions

# Fetch and checkout production branch
git fetch --all --prune || return 1
git checkout --force "origin/${PUPPET_BRANCH}" \
Expand Down
Loading