Merge pull request #465 from chef/hotfix/fedora-22

Fixing Fedora 22 build tools to fix vm tools
chef · Oct 2, 2015 · ab0f5a5 · ab0f5a5
2 parents bff964d + 0a66bab
commit ab0f5a5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/fedora-22-i386.json b/fedora-22-i386.json
@@ -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",

diff --git a/fedora-22-x86_64.json b/fedora-22-x86_64.json
@@ -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",

diff --git a/http/fedora-22/ks.cfg b/http/fedora-22/ks.cfg
@@ -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

diff --git a/scripts/fedora/22-build-tools.sh b/scripts/fedora/22-build-tools.sh
@@ -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