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.

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

Fixing Fedora 22 build tools to fix vm tools #465

Merged
merged 1 commit into from
Oct 2, 2015
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
1 change: 1 addition & 0 deletions fedora-22-i386.json
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
"scripts/common/metadata.sh",
"scripts/fedora/fix-slow-dns.sh",
"scripts/common/sshd.sh",
"scripts/fedora/22-build-tools.sh",
"scripts/common/vmtools.sh",
"scripts/common/vagrant.sh",
"scripts/fedora/cleanup.sh",
Expand Down
1 change: 1 addition & 0 deletions fedora-22-x86_64.json
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
"scripts/common/metadata.sh",
"scripts/fedora/fix-slow-dns.sh",
"scripts/common/sshd.sh",
"scripts/fedora/22-build-tools.sh",
"scripts/common/vmtools.sh",
"scripts/common/vagrant.sh",
"scripts/fedora/cleanup.sh",
Expand Down
5 changes: 3 additions & 2 deletions http/fedora-22/ks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ firstboot --disabled
reboot
user --name=vagrant --plaintext --password vagrant

%packages --nobase --ignoremissing --excludedocs
%packages --ignoremissing --excludedocs
bzip2
gcc
# GCC won't install during kickstart
# gcc
kernel-devel
kernel-headers
tar
Expand Down
3 changes: 3 additions & 0 deletions scripts/fedora/22-build-tools.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash -eux
# Installing build tools here because Fedora 22 will not do so during kickstart
dnf -y install kernel-headers-$(uname -r) kernel-devel-$(uname -r) gcc make perl