From f1937dbc09c2c2a72e3bf15adfb70b7b8c21f0cd Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Wed, 30 Apr 2014 00:52:23 -0400 Subject: [PATCH] Remove ancient "hidden" files --- definitions/.centos/cleanup.sh | 5 ---- definitions/.centos/ks.cfg | 39 ------------------------ definitions/.centos/session.rb | 12 -------- definitions/.debian/cleanup.sh | 6 ---- definitions/.debian/networking.sh | 7 ----- definitions/.debian/preseed.cfg | 47 ----------------------------- definitions/.debian/session.rb | 31 ------------------- definitions/.debian/sudoers.sh | 4 --- definitions/.debian/update.sh | 4 --- definitions/.fedora/cleanup.sh | 4 --- definitions/.fedora/ks.cfg | 50 ------------------------------- definitions/.fedora/session.rb | 13 -------- definitions/.suse/session.rb | 19 ------------ definitions/.suse/sudoers.sh | 3 -- definitions/.ubuntu/cleanup.sh | 6 ---- definitions/.ubuntu/networking.sh | 7 ----- definitions/.ubuntu/preseed.cfg | 31 ------------------- definitions/.ubuntu/session.rb | 38 ----------------------- definitions/.ubuntu/sudoers.sh | 4 --- definitions/.ubuntu/update.sh | 15 ---------- 20 files changed, 345 deletions(-) delete mode 100644 definitions/.centos/cleanup.sh delete mode 100644 definitions/.centos/ks.cfg delete mode 100644 definitions/.centos/session.rb delete mode 100644 definitions/.debian/cleanup.sh delete mode 100644 definitions/.debian/networking.sh delete mode 100644 definitions/.debian/preseed.cfg delete mode 100644 definitions/.debian/session.rb delete mode 100644 definitions/.debian/sudoers.sh delete mode 100644 definitions/.debian/update.sh delete mode 100644 definitions/.fedora/cleanup.sh delete mode 100644 definitions/.fedora/ks.cfg delete mode 100644 definitions/.fedora/session.rb delete mode 100644 definitions/.suse/session.rb delete mode 100644 definitions/.suse/sudoers.sh delete mode 100644 definitions/.ubuntu/cleanup.sh delete mode 100644 definitions/.ubuntu/networking.sh delete mode 100644 definitions/.ubuntu/preseed.cfg delete mode 100644 definitions/.ubuntu/session.rb delete mode 100644 definitions/.ubuntu/sudoers.sh delete mode 100644 definitions/.ubuntu/update.sh diff --git a/definitions/.centos/cleanup.sh b/definitions/.centos/cleanup.sh deleted file mode 100644 index 19e473a9f..000000000 --- a/definitions/.centos/cleanup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts kudzu -yum -y clean all -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*rpm diff --git a/definitions/.centos/ks.cfg b/definitions/.centos/ks.cfg deleted file mode 100644 index 3f71306d4..000000000 --- a/definitions/.centos/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --permissive -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -autopart -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages --ignoremissing -@Base -@Core -@Development Tools -openssl-devel -readline-devel -zlib-devel -kernel-devel - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -g 999 -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers diff --git a/definitions/.centos/session.rb b/definitions/.centos/session.rb deleted file mode 100644 index 431e1eaf2..000000000 --- a/definitions/.centos/session.rb +++ /dev/null @@ -1,12 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -CENTOS_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => - [ 'linux text ks=http://%IP%:%PORT%/ks.cfg' ], - :kickstart_file => "ks.cfg", - :os_type_id => 'Centos_64', - :postinstall_files => [ "vagrant.sh", - "sshd.sh", - "cleanup.sh", - "minimize.sh" ], - :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.debian/cleanup.sh b/definitions/.debian/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/definitions/.debian/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/definitions/.debian/networking.sh b/definitions/.debian/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/definitions/.debian/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/definitions/.debian/preseed.cfg b/definitions/.debian/preseed.cfg deleted file mode 100644 index 820f090c5..000000000 --- a/definitions/.debian/preseed.cfg +++ /dev/null @@ -1,47 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i apt-setup/use_mirror boolean true -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i keymap select us -d-i mirror/country string manual -d-i mirror/http/directory string /debian -d-i mirror/http/hostname string mirrors.kernel.org -d-i mirror/http/proxy string -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/root-login boolean false -d-i passwd/root-password-again password vagrant -d-i passwd/root-password password vagrant -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server sudo bzip2 acpid cryptsetup zlib1g-dev wget curl dkms make -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -# Prevent packaged version of VirtualBox Guest Additions being installed: -d-i preseed/early_command string sed -i \ - '/in-target/idiscover(){/sbin/discover|grep -v VirtualBox;}' \ - /usr/lib/pre-pkgsel.d/20install-hwpackages -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -apt-cdrom-setup apt-setup/cdrom/set-first boolean false -apt-mirror-setup apt-setup/use_mirror boolean true -popularity-contest popularity-contest/participate boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/definitions/.debian/session.rb b/definitions/.debian/session.rb deleted file mode 100644 index 3ea5ac0e7..000000000 --- a/definitions/.debian/session.rb +++ /dev/null @@ -1,31 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -DEBIAN_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => - [ - '', - 'install ', - 'preseed/url=http://%IP%:%PORT%/preseed.cfg ', - 'debian-installer=en_US ', - 'auto ', - 'locale=en_US ', - 'kbd-chooser/method=us ', - 'keyboard-configuration/xkb-keymap=us ', - 'netcfg/get_hostname=%NAME% ', - 'netcfg/get_domain=vagrantup.com ', - 'fb=false ', - 'debconf/frontend=noninteractive ', - 'console-setup/ask_detect=false ', - 'console-keymaps-at/keymap=us ', - '' - ], - :os_type_id => 'Debian_64', - :postinstall_files => [ "update.sh", - "vagrant.sh", - "sshd.sh", - "networking.sh", - "sudoers.sh", - "cleanup.sh", - "minimize.sh" ], - :kickstart_file => "preseed.cfg", - :shutdown_cmd => "/sbin/shutdown -h -P now" }) diff --git a/definitions/.debian/sudoers.sh b/definitions/.debian/sudoers.sh deleted file mode 100644 index 36862e097..000000000 --- a/definitions/.debian/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\tsecure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"' /etc/sudoers -sed -i -e 's/%sudo\tALL=(ALL:ALL) ALL/%sudo\tALL=(ALL:ALL) NOPASSWD: ALL/' /etc/sudoers diff --git a/definitions/.debian/update.sh b/definitions/.debian/update.sh deleted file mode 100644 index a4cc91499..000000000 --- a/definitions/.debian/update.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade diff --git a/definitions/.fedora/cleanup.sh b/definitions/.fedora/cleanup.sh deleted file mode 100644 index a4d82c900..000000000 --- a/definitions/.fedora/cleanup.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux -yum -y erase gtk2 libX11 hicolor-icon-theme freetype -yum -y clean all -rm -f /tmp/chef*rpm diff --git a/definitions/.fedora/ks.cfg b/definitions/.fedora/ks.cfg deleted file mode 100644 index c89695e03..000000000 --- a/definitions/.fedora/ks.cfg +++ /dev/null @@ -1,50 +0,0 @@ -install -cdrom -lang en_US.UTF-8 -keyboard us -network --bootproto=dhcp -rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/ -firewall --disabled -authconfig --enableshadow --passalgo=sha512 -selinux --disabled -timezone UTC -bootloader --location=mbr -text -skipx -zerombr -clearpart --all --initlabel -part /boot --fstype=ext4 --size=500 -part pv.2 --grow --size=500 -volgroup vg_vagrant --pesize=32768 pv.2 -logvol / --fstype=ext4 --name=lv_root --vgname=vg_vagrant --size=1024 --grow -logvol swap --fstype=swap --name=lv_swap --vgname=vg_vagrant --size=528 --grow --maxsize=1056 -bootloader --location=mbr --append="norhgb biosdevname=0" -auth --useshadow --enablemd5 -firstboot --disabled -reboot - -%packages -@Core -bzip2 -gcc -kernel-devel -kernel-headers -openssl-devel -readline-devel -tar -wget -zlib-devel -%end - -%post -# update root certs -wget -O/etc/pki/tls/certs/ca-bundle.crt http://curl.haxx.se/ca/cacert.pem -# vagrant -groupadd vagrant -useradd vagrant -g vagrant -G wheel -u 900 -echo "vagrant" | passwd --stdin vagrant -# sudo -echo 'Defaults:vagrant !requiretty' > /etc/sudoers.d/vagrant -echo '%vagrant ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers.d/vagrant -chmod 440 /etc/sudoers.d/vagrant -%end diff --git a/definitions/.fedora/session.rb b/definitions/.fedora/session.rb deleted file mode 100644 index 8fae74a1e..000000000 --- a/definitions/.fedora/session.rb +++ /dev/null @@ -1,13 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -FEDORA_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => - [ ' text ks=http://%IP%:%PORT%/ks.cfg' ], - :kickstart_file => "ks.cfg", - :os_type_id => 'Fedora_64', - :memory_size=> "512", - :postinstall_files => [ "vagrant.sh", - "sshd.sh", - "cleanup.sh", - "minimize.sh" ], - :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.suse/session.rb b/definitions/.suse/session.rb deleted file mode 100644 index c1b3e1762..000000000 --- a/definitions/.suse/session.rb +++ /dev/null @@ -1,19 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -SUSE_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => [ - '', - 'linux netdevice=eth0 netsetup=dhcp install=cd:/', - ' lang=en_US autoyast=http://%IP%:%PORT%/autoinst.xml', - ' textmode=1', - '' - ], - # in here twice for a reason - YaST2 requests it twice - :kickstart_file => ["autoinst.xml", "autoinst.xml"], - :os_type_id => 'OpenSUSE_64', - :postinstall_files => [ "vagrant.sh", - "sshd.sh", - "sudoers.sh", - "cleanup.sh", - "minimize.sh" ], - :shutdown_cmd => "/sbin/halt -h -p" }) diff --git a/definitions/.suse/sudoers.sh b/definitions/.suse/sudoers.sh deleted file mode 100644 index eb80f3f88..000000000 --- a/definitions/.suse/sudoers.sh +++ /dev/null @@ -1,3 +0,0 @@ -# update sudoers - can't do this in autoinst.xml -echo -e "\nupdate sudoers ..." -echo -e "vagrant ALL=(ALL) NOPASSWD: ALL\n" >> /etc/sudoers diff --git a/definitions/.ubuntu/cleanup.sh b/definitions/.ubuntu/cleanup.sh deleted file mode 100644 index 6c7f703d6..000000000 --- a/definitions/.ubuntu/cleanup.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -eux - -apt-get -y autoremove -apt-get -y clean -rm -rf VBoxGuestAdditions_*.iso VBoxGuestAdditions_*.iso.? -rm -f /tmp/chef*deb diff --git a/definitions/.ubuntu/networking.sh b/definitions/.ubuntu/networking.sh deleted file mode 100644 index de3269a58..000000000 --- a/definitions/.ubuntu/networking.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -eux - -rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules -rm /lib/udev/rules.d/75-persistent-net-generator.rules -rm -rf /dev/.udev/ /var/lib/dhcp3/* -echo "pre-up sleep 2" >> /etc/network/interfaces diff --git a/definitions/.ubuntu/preseed.cfg b/definitions/.ubuntu/preseed.cfg deleted file mode 100644 index 903f2e14b..000000000 --- a/definitions/.ubuntu/preseed.cfg +++ /dev/null @@ -1,31 +0,0 @@ -choose-mirror-bin mirror/http/proxy string -d-i base-installer/kernel/override-image string linux-server -d-i clock-setup/utc boolean true -d-i clock-setup/utc-auto boolean true -d-i finish-install/reboot_in_progress note -d-i grub-installer/only_debian boolean true -d-i grub-installer/with_other_os boolean true -d-i partman-auto-lvm/guided_size string max -d-i partman-auto/choose_recipe select atomic -d-i partman-auto/method string lvm -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm boolean true -d-i partman-lvm/confirm_nooverwrite boolean true -d-i partman-lvm/device_remove_lvm boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true -d-i partman/confirm_write_new_label boolean true -d-i passwd/user-fullname string vagrant -d-i passwd/user-uid string 900 -d-i passwd/user-password password vagrant -d-i passwd/user-password-again password vagrant -d-i passwd/username string vagrant -d-i pkgsel/include string openssh-server cryptsetup build-essential libssl-dev libreadline-dev zlib1g-dev linux-source dkms -d-i pkgsel/install-language-support boolean false -d-i pkgsel/update-policy select unattended-upgrades -d-i pkgsel/upgrade select full-upgrade -d-i time/zone string UTC -d-i user-setup/allow-password-weak boolean true -d-i user-setup/encrypt-home boolean false -tasksel tasksel/first multiselect standard, ubuntu-server diff --git a/definitions/.ubuntu/session.rb b/definitions/.ubuntu/session.rb deleted file mode 100644 index ddf0e3fe0..000000000 --- a/definitions/.ubuntu/session.rb +++ /dev/null @@ -1,38 +0,0 @@ -require File.dirname(__FILE__) + "/../.common/session.rb" - -UBUNTU_SESSION = - COMMON_SESSION.merge({ :boot_cmd_sequence => - [ - "", - "", - "", - "/install/vmlinuz" , - " auto", - " console-setup/ask_detect=false", - " console-setup/layoutcode=us", - " console-setup/modelcode=pc105", - " debconf/frontend=noninteractive", - " debian-installer=en_US", - " fb=false", - " initrd=/install/initrd.gz", - " kbd-chooser/method=us", - " keyboard-configuration/layout=USA", - " keyboard-configuration/variant=USA", - " locale=en_US", - " netcfg/get_domain=vm", - " netcfg/get_hostname=vagrant", - " noapic" , - " preseed/url=http://%IP%:%PORT%/preseed.cfg", - " -- ", - "" - ], - :os_type_id => 'Ubuntu_64', - :postinstall_files => [ "update.sh", - "vagrant.sh", - "sshd.sh", - "networking.sh", - "sudoers.sh", - "cleanup.sh", - "minimize.sh" ], - :kickstart_file => "preseed.cfg", - :shutdown_cmd => "shutdown -P now" }) diff --git a/definitions/.ubuntu/sudoers.sh b/definitions/.ubuntu/sudoers.sh deleted file mode 100644 index ce45b7611..000000000 --- a/definitions/.ubuntu/sudoers.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -eux - -sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers -sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers diff --git a/definitions/.ubuntu/update.sh b/definitions/.ubuntu/update.sh deleted file mode 100644 index 80e8dd3f9..000000000 --- a/definitions/.ubuntu/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -eux - -apt-get update -apt-get -y upgrade - -# ensure the correct kernel headers are installed -apt-get -y install linux-headers-$(uname -r) - -# update package index on boot -cat < /etc/init/refresh-apt.conf -description "update package index" -start on networking -task -exec /usr/bin/apt-get update -EOF