Use a single partition for the Vagrant images (#115)

* Use a single partition for Vagrant images

There is no performance penalty for using a swapfile instead of a swap
partition; by not defining a swap of boot partition, we allow our users
to create a swapfile themselves if they need one.

* Use Kickstart to set the bootloader timeout

* Remove several unneccessary packages

- plymouth displays a bootup screen, not needed by Vagrant
- manpages don't bring anything if we use --excludedocs
- linux-firmware isn't useful for VM hardware
- support for ext[234] and btrfs isn't needed, we use XFS

* Add the man pages again to the image

* Configure swapping to a file

We use a 2GiB file as swap, as recommended by Red Hat for systems with
up to 4G RAM.

* Add cifs-utils to the images (for Windows users)

* Switch the filesystem from xfs to ext4

All CentOS Linux 7 images in the last few months are unable to boot due
to apparent XFS filesystem corruption.  This is 100% reproducible with
both Image Factory and Packer when using libvirt (the images for
VirtualBox are working).  It might be caused by qemu-img, since the
initial boot performed by Packer immediately after the installation is
successful.

Author: lpancescu

vagrant/centos6.ks

@@ -13,18 +13,13 @@ timezone --utc UTC
 services --enabled ntpd,tuned
 # The biosdevname and ifnames options ensure we get "eth0" as our interface
 # even in environments like virtualbox that emulate a real NW card
-bootloader --location=mbr --append="no_timer_check console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 elevator=noop"
+bootloader --timeout=1 --append="no_timer_check console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 elevator=noop"
 zerombr
 clearpart --all --drives=vda
+part / --fstype=ext4 --asprimary --size=1024 --grow --ondisk=vda
 
 user --name=vagrant --password=vagrant
 
-part biosboot --fstype=biosboot --size=1
-part /boot --fstype ext4 --size=250 --ondisk=vda
-part pv.2 --size=1 --grow --ondisk=vda
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
 reboot
 
 %packages
@@ -35,6 +30,7 @@ bzip2
 rsync
 screen
 nfs-utils
+cifs-utils
 tuned
 hyperv-daemons
 # Microcode updates cannot work in a VM
@@ -72,6 +68,12 @@ hyperv-daemons
 
 %post
 
+# configure swap to a file
+fallocate -l 2G /swapfile
+chmod 600 /swapfile
+mkswap /swapfile
+echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+
 # sudo
 echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
 
@@ -127,9 +129,6 @@ echo 'vag' > /etc/yum/vars/infra
 # Configure tuned
 tuned-adm profile virtual-guest
 
-# Configure grub to wait just 1 second before booting
-sed -i 's/^timeout=[0-9]\+$/timeout=1/' /boot/grub/grub.conf
-
 # Enable VMware PVSCSI support for VMware Fusion guests. This produces
 # a tiny increase in the image and is harmless for other environments.
 pushd /etc/dracut.conf.d

vagrant/centos7.ks

@@ -12,32 +12,30 @@ selinux --enforcing
 timezone --utc UTC
 # The biosdevname and ifnames options ensure we get "eth0" as our interface
 # even in environments like virtualbox that emulate a real NW card
-bootloader --location=mbr --append="no_timer_check console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 elevator=noop"
+bootloader --timeout=1 --append="no_timer_check console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 elevator=noop"
 zerombr
 clearpart --all --drives=vda
+part / --fstype=ext4 --asprimary --size=1024 --grow --ondisk=vda
 
 user --name=vagrant --password=vagrant
 
-part biosboot --fstype=biosboot --size=1
-part /boot --fstype xfs --size=1024 --ondisk=vda
-part pv.2 --size=1 --grow --ondisk=vda
-volgroup VolGroup00 --pesize=32768 pv.2
-logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=768 --grow --maxsize=1536
-logvol / --fstype xfs --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow
 reboot
 
-%packages --excludedocs --instLangs=en
+%packages --instLangs=en
 deltarpm
 bash-completion
 man-pages
 bzip2
-@core
 rsync
-screen
 nfs-utils
+cifs-utils
 chrony
 yum-utils
 hyperv-daemons
+-e2fsprogs
+-btrfs-progs
+# Vagrant boxes aren't normally visible, no need for Plymouth
+-plymouth
 # Microcode updates cannot work in a VM
 -microcode_ctl
 # Firmware packages are not needed in a VM
@@ -62,6 +60,7 @@ hyperv-daemons
 -iwl6050-firmware
 -iwl7260-firmware
 -iwl7265-firmware
+-linux-firmware
 # Don't build rescue initramfs
 -dracut-config-rescue
 # Disable kdump
@@ -76,6 +75,12 @@ hyperv-daemons
 
 %post
 
+# configure swap to a file
+fallocate -l 2G /swapfile
+chmod 600 /swapfile
+mkswap /swapfile
+echo "/swapfile none swap defaults 0 0" >> /etc/fstab
+
 # sudo
 echo "%vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
 
@@ -130,9 +135,6 @@ EOF
 
 echo 'vag' > /etc/yum/vars/infra
 
-# Configure grub to wait just 1 second before booting
-sed -i 's/^GRUB_TIMEOUT=[0-9]\+$/GRUB_TIMEOUT=1/' /etc/default/grub && grub2-mkconfig -o /boot/grub2/grub.cfg
-
 # Blacklist the floppy module to avoid probing timeouts
 echo blacklist floppy > /etc/modprobe.d/nofloppy.conf
 chcon -u system_u -r object_r -t modules_conf_t /etc/modprobe.d/nofloppy.conf