From cd8844a71780c0d82ce1bca7664e866bbd45e2f6 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 12 Aug 2023 17:31:04 -0500 Subject: [PATCH] Cleanup old, unused structures --- .gitmodules | 16 ----------- {http/fedora => attic}/34-x86_64.ks | 0 {http/fedora => attic}/35-x86_64.ks | 0 {http/fedora => attic}/36-x86_64.ks | 0 http/fedora/37-x86_64.ks | 23 ---------------- http/fedora/38-x86_64.ks | 23 ---------------- http/fedora/f34 | 1 - http/fedora/f35 | 1 - http/fedora/f36 | 1 - http/fedora/f37 | 1 - http/fedora/rawhide-x86_64.ks | 23 ---------------- http/ubuntu/20.04/meta-data | 0 http/ubuntu/20.04/user-data | 42 ----------------------------- http/ubuntu/22.04/meta-data | 0 http/ubuntu/22.04/user-data | 42 ----------------------------- 15 files changed, 173 deletions(-) rename {http/fedora => attic}/34-x86_64.ks (100%) rename {http/fedora => attic}/35-x86_64.ks (100%) rename {http/fedora => attic}/36-x86_64.ks (100%) delete mode 100644 http/fedora/37-x86_64.ks delete mode 100644 http/fedora/38-x86_64.ks delete mode 160000 http/fedora/f34 delete mode 160000 http/fedora/f35 delete mode 160000 http/fedora/f36 delete mode 160000 http/fedora/f37 delete mode 100644 http/fedora/rawhide-x86_64.ks delete mode 100644 http/ubuntu/20.04/meta-data delete mode 100644 http/ubuntu/20.04/user-data delete mode 100644 http/ubuntu/22.04/meta-data delete mode 100644 http/ubuntu/22.04/user-data diff --git a/.gitmodules b/.gitmodules index cc64693..94d34c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,3 @@ -[submodule "http/fedora/f34"] - path = http/fedora/f34 - url = https://pagure.io/fedora-kickstarts.git - branch = f34 -[submodule "http/fedora/f35"] - path = http/fedora/f35 - url = https://pagure.io/fedora-kickstarts.git - branch = f35 -[submodule "http/fedora/f36"] - path = http/fedora/f36 - url = https://pagure.io/fedora-kickstarts.git - branch = f36 [submodule "http/fedora/rawhide"] path = http/fedora/rawhide url = https://pagure.io/fedora-kickstarts.git @@ -22,10 +10,6 @@ path = http/centos-stream url = https://github.com/greg-hellings/centos-stream-kickstarts-mirror.git branch = main -[submodule "http/fedora/f37"] - path = http/fedora/f37 - url = https://pagure.io/fedora-kickstarts.git - branch = f37 [submodule "http/fedora/f38"] path = http/fedora/f38 url = https://pagure.io/fedora-kickstarts.git diff --git a/http/fedora/34-x86_64.ks b/attic/34-x86_64.ks similarity index 100% rename from http/fedora/34-x86_64.ks rename to attic/34-x86_64.ks diff --git a/http/fedora/35-x86_64.ks b/attic/35-x86_64.ks similarity index 100% rename from http/fedora/35-x86_64.ks rename to attic/35-x86_64.ks diff --git a/http/fedora/36-x86_64.ks b/attic/36-x86_64.ks similarity index 100% rename from http/fedora/36-x86_64.ks rename to attic/36-x86_64.ks diff --git a/http/fedora/37-x86_64.ks b/http/fedora/37-x86_64.ks deleted file mode 100644 index 2c26abe..0000000 --- a/http/fedora/37-x86_64.ks +++ /dev/null @@ -1,23 +0,0 @@ -%include /tmp/packer_ks/fedora/f37/fedora-cloud-base-vagrant.ks - -text - -%packages -# There is weirdness with the /etc/resolv.conf in the target system -# that causes some of the imported systems to fail. Hopefully this -# prevents that. --systemd-resolved -NetworkManager -%end - -%pre --interpreter /bin/bash --log /tmp/greg -set -ex -# This allows us to support virtualbox -mkdir /tmp/sr1 -mount /dev/sr1 /tmp/sr1 -cp -r /tmp/sr1/http /tmp/packer_ks - -if [ ! -e /dev/vda ]; then - ln -s /dev/sda /dev/vda -fi -%end diff --git a/http/fedora/38-x86_64.ks b/http/fedora/38-x86_64.ks deleted file mode 100644 index 10f8f9c..0000000 --- a/http/fedora/38-x86_64.ks +++ /dev/null @@ -1,23 +0,0 @@ -%include /tmp/packer_ks/fedora/f38/fedora-cloud-base-vagrant.ks - -text - -%packages -# There is weirdness with the /etc/resolv.conf in the target system -# that causes some of the imported systems to fail. Hopefully this -# prevents that. --systemd-resolved -NetworkManager -%end - -%pre --interpreter /bin/bash --log /tmp/greg -set -ex -# This allows us to support virtualbox -mkdir /tmp/sr1 -mount /dev/sr1 /tmp/sr1 -cp -r /tmp/sr1/http /tmp/packer_ks - -if [ ! -e /dev/vda ]; then - ln -s /dev/sda /dev/vda -fi -%end diff --git a/http/fedora/f34 b/http/fedora/f34 deleted file mode 160000 index 022f045..0000000 --- a/http/fedora/f34 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 022f04580e1261dd8bfb13c9d9173d65eddd5c45 diff --git a/http/fedora/f35 b/http/fedora/f35 deleted file mode 160000 index 3cfe995..0000000 --- a/http/fedora/f35 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3cfe995016eebde3204dab81b30d9768aab0df17 diff --git a/http/fedora/f36 b/http/fedora/f36 deleted file mode 160000 index dfbad4b..0000000 --- a/http/fedora/f36 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dfbad4bdf5f5b9c6a93b3b192bfe91580ac08915 diff --git a/http/fedora/f37 b/http/fedora/f37 deleted file mode 160000 index dc9e3b2..0000000 --- a/http/fedora/f37 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dc9e3b2ceab166a538c0466c126a8b1111d3fa1c diff --git a/http/fedora/rawhide-x86_64.ks b/http/fedora/rawhide-x86_64.ks deleted file mode 100644 index 085f975..0000000 --- a/http/fedora/rawhide-x86_64.ks +++ /dev/null @@ -1,23 +0,0 @@ -text - -%packages -# There is weirdness with the /etc/resolv.conf in the target system -# that causes some of the imported systems to fail. Hopefully this -# prevents that. --systemd-resolved -NetworkManager -%end - -%include /tmp/packer_ks/fedora/rawhide/fedora-cloud-base-vagrant.ks - -%pre --interpreter /bin/bash --log /tmp/greg -cmdline=$(cat /proc/cmdline) -ks=$(printf "${cmdline}" | sed -E -e 's/.*inst\.ks=([^ ]*).*/\1/') -mkdir -p /tmp/packer_ks -cd /tmp/packer_ks -wget -m -nH "$(dirname "${ks}")" - -if [ ! -e /dev/vda ]; then - ln -s /dev/sda /dev/vda -fi -%end diff --git a/http/ubuntu/20.04/meta-data b/http/ubuntu/20.04/meta-data deleted file mode 100644 index e69de29..0000000 diff --git a/http/ubuntu/20.04/user-data b/http/ubuntu/20.04/user-data deleted file mode 100644 index 8a11855..0000000 --- a/http/ubuntu/20.04/user-data +++ /dev/null @@ -1,42 +0,0 @@ -#cloud-config -# vim: set ft=yaml: -autoinstall: - version: 1 - network: # Should disable networking, workaround for unattended-updates failing in install - version: 2 - ethernets: - eth0: - dhcp4: yes - dhcp6: no - refresh-installer: - update: no - keyboard: - layout: us - toggle: null - variant: '' - locale: en_US.UTF-8 - identity: - hostname: vagrant - username: vagrant - password: $6$rounds=4096$mJTRlY/vwPMquLe0$s4Ld3ZnvF.pM86xzbAgQD7Xpi/NMVgyQNb5CEfabFgL6nLRsP56WtwA.o.Jg/xC6HaJmM2p5fCGIo37jmKVRI0 - ssh: - install-server: yes - authorized_keys: - - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key - allow-pw: yes - user-data: - disable_root: false - package_update: false # These will be done by Ansible after install - package_upgrade: false - late-commands: - - echo 'Defaults:vagrant !requiretty' > /target/etc/sudoers.d/vagrant - - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' >> /target/etc/sudoers.d/vagrant - - chmod 440 /target/etc/sudoers.d/vagrant - # Restore network after bypassing unattended updates - - sed -i -E -e 's/GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevnames=0\1"/' /target/etc/default/grub - - curtin in-target --target=/target -- update-grub - - curtin in-target --target=/target -- logger "finished late-commands" - packages: - - ca-certificates - - curl - - sudo diff --git a/http/ubuntu/22.04/meta-data b/http/ubuntu/22.04/meta-data deleted file mode 100644 index e69de29..0000000 diff --git a/http/ubuntu/22.04/user-data b/http/ubuntu/22.04/user-data deleted file mode 100644 index 630f310..0000000 --- a/http/ubuntu/22.04/user-data +++ /dev/null @@ -1,42 +0,0 @@ -#cloud-config -# vim: set ft=yaml: -autoinstall: - version: 1 - network: # Should disable networking, workaround for unattended-updates failing in install - version: 2 - ethernets: - eth0: - dhcp4: yes - dhcp6: no - refresh-installer: - update: no - keyboard: - layout: us - toggle: null - variant: '' - locale: en_US.UTF-8 - identity: - hostname: vagrant - username: vagrant - password: $6$rounds=4096$mJTRlY/vwPMquLe0$s4Ld3ZnvF.pM86xzbAgQD7Xpi/NMVgyQNb5CEfabFgL6nLRsP56WtwA.o.Jg/xC6HaJmM2p5fCGIo37jmKVRI0 - ssh: - install-server: yes - authorized_keys: - - ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key - allow-pw: yes - user-data: - disable_root: false - package_update: false - package_upgrade: false - late-commands: - - echo 'Defaults:vagrant !requiretty' > /target/etc/sudoers.d/vagrant - - echo 'vagrant ALL=(ALL) NOPASSWD:ALL' >> /target/etc/sudoers.d/vagrant - - chmod 440 /target/etc/sudoers.d/vagrant - # Restore network after bypassing unattended updates - - sed -i -E -e 's/GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="net.ifnames=0 biosdevnames=0\1"/' /target/etc/default/grub - - curtin in-target --target=/target -- update-grub - - curtin in-target --target=/target -- logger "finished late-commands" - packages: - - ca-certificates - - curl - - sudo