From 934ed0bdb5b58dc150fb80498e2bc228a91f7890 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 24 Jul 2020 23:28:10 -0400 Subject: [PATCH] remove atomic and cloud kickstarts that aren't used Atomic is a thing of the past and I have no idea what fedora-cloud-bigdata.ks and fedora-cloud-experimental.ks were ever used for. Let's get rid of them to reduce confusion. --- fedora-cloud-atomic-pxetolive.ks | 36 ----- fedora-cloud-bigdata.ks | 220 ------------------------------- fedora-cloud-experimental.ks | 215 ------------------------------ 3 files changed, 471 deletions(-) delete mode 100644 fedora-cloud-atomic-pxetolive.ks delete mode 100644 fedora-cloud-bigdata.ks delete mode 100644 fedora-cloud-experimental.ks diff --git a/fedora-cloud-atomic-pxetolive.ks b/fedora-cloud-atomic-pxetolive.ks deleted file mode 100644 index d865ccc..0000000 --- a/fedora-cloud-atomic-pxetolive.ks +++ /dev/null @@ -1,36 +0,0 @@ -# PXE-to-Live Atomic: PXE boot directly into a running Atomic Host -# https://fedoraproject.org/wiki/Changes/AtomicHost - -lang en_US.UTF-8 -keyboard us -timezone America/New_York -zerombr -clearpart --all --initlabel -rootpw --lock --iscrypted locked -user --name=none -bootloader --timeout=1 -network --bootproto=dhcp --device=link --activate -# We are only able to install atomic with separate /boot partition currently -part / --fstype="ext4" --size=6000 -part /boot --size=500 --fstype="ext4" -shutdown -services --disabled=docker-storage-setup -services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final - -ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host - -%post - -# Ensure the root password is locked, we use cloud-init -passwd -l root -userdel -r none - -# We copy content of separate /boot partition to root part when building live squashfs image, -# and we don't want systemd to try to mount it when pxe booting -cat /dev/null > /etc/fstab - -# Disable network service here, as doing it in the services line -# fails due to RHBZ #1369794 -/sbin/chkconfig network off - -%end diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks deleted file mode 100644 index 822e492..0000000 --- a/fedora-cloud-bigdata.ks +++ /dev/null @@ -1,220 +0,0 @@ -# This is a Fedora 21 spin designed based on the Fedora Cloud Base Image -# but tailored specifically for Big Data processing out-of-the-box. -# Primarily, it builds on that image but adds extra packages, but over -# time may have additional focus. -# -# It's configured with cloud-init so it will take advantage of -# ec2-compatible metadata services for provisioning ssh keys. Cloud-init -# creates a user account named "fedora" with passwordless sudo access. The -# root password is empty and locked by default. -# -# Note that unlike the standard F20 install, this image has /tmp on disk -# rather than in tmpfs, since memory is usually at a premium. - -text -lang en_US.UTF-8 -keyboard us -timezone --utc Etc/UTC - -selinux --enforcing -rootpw --lock --iscrypted locked -user --name=none - -firewall --disabled - -bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" - -network --bootproto=dhcp --device=eth0 --activate --onboot=on -services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final - -zerombr -clearpart --all -part / --size 3000 --fstype ext4 - -%include fedora-repo.ks - - -reboot - -# Package list. -%packages - -fedora-release-cloud - -kernel-core -@core -@cloud-server - -# Needed initially, but removed below. -firewalld - -# rescue mode generally isn't useful in the cloud context --dracut-config-rescue - -# Some things from @core we can do without in a minimal install --biosdevname --plymouth --NetworkManager --iprutils --kbd --uboot-tools --kernel --grub2 - -%end - - - -%post --erroronfail - -# Create grub.conf for EC2. This used to be done by appliance creator but -# anaconda doesn't do it. And, in case appliance-creator is used, we're -# overriding it here so that both cases get the exact same file. -# Note that the console line is different -- that's because EC2 provides -# different virtual hardware, and this is a convenient way to act differently -echo -n "Creating grub.conf for pvgrub" -rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab ) -mkdir /boot/grub -echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf -for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do - echo "title Fedora ($kv)" >> /boot/grub/grub.conf - echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf - echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf - echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf - echo -done - - -#link grub.conf to menu.lst for ec2 to work -echo -n "Linking menu.lst to old-style grub.conf for pv-grub" -ln -sf grub.conf /boot/grub/menu.lst -ln -sf /boot/grub/grub.conf /etc/grub.conf - -# older versions of livecd-tools do not follow "rootpw --lock" line above -# https://bugzilla.redhat.com/show_bug.cgi?id=964299 -passwd -l root -# remove the user anaconda forces us to make -userdel -r none - -# setup systemd to boot to the right runlevel -echo -n "Setting default runlevel to multiuser text mode" -rm -f /etc/systemd/system/default.target -ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target -echo . - -# this is installed by default but we don't need it in virt -# Commenting out the following for #1234504 -# rpm works just fine for removing this, no idea why dnf can't cope -echo "Removing linux-firmware package." -rpm -e linux-firmware - -# Remove firewalld; was supposed to be optional in F18+, but is required to -# be present for install/image building. -echo "Removing firewalld." -dnf -C -y remove firewalld --setopt="clean_requirements_on_remove=1" - -# Another one needed at install time but not after that, and it pulls -# in some unneeded deps (like, newt and slang) -echo "Removing authconfig." -dnf -C -y remove authconfig --setopt="clean_requirements_on_remove=1" - -echo -n "Getty fixes" -# although we want console output going to the serial console, we don't -# actually have the opportunity to login there. FIX. -# we don't really need to auto-spawn _any_ gettys. -sed -i '/^#NAutoVTs=.*/ a\ -NAutoVTs=0' /etc/systemd/logind.conf - -echo -n "Network fixes" -# initscripts don't like this file to be missing. -cat > /etc/sysconfig/network << EOF -NETWORKING=yes -NOZEROCONF=yes -EOF - -# For cloud images, 'eth0' _is_ the predictable device name, since -# we don't want to be tied to specific virtual (!) hardware -rm -f /etc/udev/rules.d/70* -ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules - -# simple eth0 config, again not hard-coded to the build hardware -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF -DEVICE="eth0" -BOOTPROTO="dhcp" -ONBOOT="yes" -TYPE="Ethernet" -PERSISTENT_DHCLIENT="yes" -EOF - -# generic localhost names -cat > /etc/hosts << EOF -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 - -EOF -echo . - - -# Because memory is scarce resource in most cloud/virt environments, -# and because this impedes forensics, we are differing from the Fedora -# default of having /tmp on tmpfs. -echo "Disabling tmpfs for /tmp." -systemctl mask tmp.mount - -# make sure firstboot doesn't start -echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot - -# Uncomment this if you want to use cloud init but suppress the creation -# of an "ec2-user" account. This will, in the absence of further config, -# cause the ssh key from a metadata source to be put in the root account. -#cat < /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg -#users: [] -#disable_root: 0 -#EOF - -echo "Removing random-seed so it's not the same in every image." -rm -f /var/lib/systemd/random-seed - -echo "Cleaning old dnf repodata." -dnf history new -dnf clean all -truncate -c -s 0 /var/log/dnf.log - -echo "Import RPM GPG key" -releasever=$(rpm --eval '%{fedora}') -basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch - -echo "Packages within this cloud image:" -echo "-----------------------------------------------------------------------" -rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn -echo "-----------------------------------------------------------------------" -# Note that running rpm recreates the rpm db files which aren't needed/wanted -rm -f /var/lib/rpm/__db* - -# This is a temporary workaround for -# -# where sfdisk seems to be messing up the mbr. -# Long-term fix is to address this in anaconda directly and remove this. -# -dd if=/usr/share/syslinux/mbr.bin of=/dev/vda - - -echo "Fixing SELinux contexts." -touch /var/log/cron -touch /var/log/boot.log -mkdir -p /var/cache/dnf -/usr/sbin/fixfiles -R -a restore - -echo "Zeroing out empty space." -# This forces the filesystem to reclaim space from deleted files -dd bs=1M if=/dev/zero of=/var/tmp/zeros || : -rm -f /var/tmp/zeros -echo "(Don't worry -- that out-of-space error was expected.)" - -# Enable network service here, as doing it in the services line -# fails due to RHBZ #1369794 -/sbin/chkconfig network on - -%end - diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks deleted file mode 100644 index b616999..0000000 --- a/fedora-cloud-experimental.ks +++ /dev/null @@ -1,215 +0,0 @@ -# This is a spin of the Fedora cloud image designed for trying out new -# images in rawhide. It won't be built for non-rawhide trees, let alone -# actual releases. - -cmdline -lang en_US.UTF-8 -keyboard us -timezone --utc Etc/UTC - -auth --useshadow --passalgo=sha512 -selinux --enforcing -rootpw --lock --iscrypted locked -user --name=none - -firewall --disabled - -bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" - -network --bootproto=dhcp --device=eth0 --activate --onboot=on -services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final - -zerombr -clearpart --all -part / --size 3000 --fstype ext4 - -%include fedora-repo.ks - - -reboot - -# Package list. -%packages --excludedocs --instLangs=en_US - -fedora-release-cloud - -kernel-core -@core -@cloud-server - -# rescue mode generally isn't useful in the cloud context --dracut-config-rescue - -# Needed initially, but removed below. -firewalld - -# Some things from @core we can do without in a minimal install --biosdevname --plymouth --NetworkManager --iprutils --kbd --uboot-tools --kernel --grub2 - -%end - - - -%post --erroronfail - -# Create grub.conf for EC2. This used to be done by appliance creator but -# anaconda doesn't do it. And, in case appliance-creator is used, we're -# overriding it here so that both cases get the exact same file. -# Note that the console line is different -- that's because EC2 provides -# different virtual hardware, and this is a convenient way to act differently -echo -n "Creating grub.conf for pvgrub" -rootuuid=$( awk '$2=="/" { print $1 };' /etc/fstab ) -mkdir /boot/grub -echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf -for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do - echo "title Fedora ($kv)" >> /boot/grub/grub.conf - echo -e "\troot (hd0,0)" >> /boot/grub/grub.conf - echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf - echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf - echo -done - - -#link grub.conf to menu.lst for ec2 to work -echo -n "Linking menu.lst to old-style grub.conf for pv-grub" -ln -sf grub.conf /boot/grub/menu.lst -ln -sf /boot/grub/grub.conf /etc/grub.conf - -# older versions of livecd-tools do not follow "rootpw --lock" line above -# https://bugzilla.redhat.com/show_bug.cgi?id=964299 -passwd -l root -# remove the user anaconda forces us to make -userdel -r none - -# setup systemd to boot to the right runlevel -echo -n "Setting default runlevel to multiuser text mode" -rm -f /etc/systemd/system/default.target -ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target -echo . - -# this is installed by default but we don't need it in virt -# Commenting out the following for #1234504 -# rpm works just fine for removing this, no idea why dnf can't cope -echo "Removing linux-firmware package." -rpm -e linux-firmware - -# Remove firewalld; was supposed to be optional in F18+, but is required to -# be present for install/image building. -echo "Removing firewalld." -dnf -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1" - -# Another one needed at install time but not after that, and it pulls -# in some unneeded deps (like, newt and slang) -echo "Removing authconfig." -dnf -C -y remove authconfig --setopt="clean_requirements_on_remove=1" - -echo -n "Getty fixes" -# although we want console output going to the serial console, we don't -# actually have the opportunity to login there. FIX. -# we don't really need to auto-spawn _any_ gettys. -sed -i '/^#NAutoVTs=.*/ a\ -NAutoVTs=0' /etc/systemd/logind.conf - -echo -n "Network fixes" -# initscripts don't like this file to be missing. -cat > /etc/sysconfig/network << EOF -NETWORKING=yes -NOZEROCONF=yes -EOF - -# For cloud images, 'eth0' _is_ the predictable device name, since -# we don't want to be tied to specific virtual (!) hardware -rm -f /etc/udev/rules.d/70* -ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules - -# simple eth0 config, again not hard-coded to the build hardware -cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF -DEVICE="eth0" -BOOTPROTO="dhcp" -ONBOOT="yes" -TYPE="Ethernet" -PERSISTENT_DHCLIENT="yes" -EOF - -# generic localhost names -cat > /etc/hosts << EOF -127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 -::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 - -EOF -echo . - - -# Because memory is scarce resource in most cloud/virt environments, -# and because this impedes forensics, we are differing from the Fedora -# default of having /tmp on tmpfs. -echo "Disabling tmpfs for /tmp." -systemctl mask tmp.mount - -# make sure firstboot doesn't start -echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot - -# Uncomment this if you want to use cloud init but suppress the creation -# of an "ec2-user" account. This will, in the absence of further config, -# cause the ssh key from a metadata source to be put in the root account. -#cat < /etc/cloud/cloud.cfg.d/50_suppress_ec2-user_use_root.cfg -#users: [] -#disable_root: 0 -#EOF - -echo "Removing random-seed so it's not the same in every image." -rm -f /var/lib/systemd/random-seed - -echo "Cleaning old dnf repodata." -dnf history new -dnf clean all -truncate -c -s 0 /var/log/dnf.log - -echo "Import RPM GPG key" -releasever=$(rpm --eval '%{fedora}') -basearch=$(uname -i) -rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch - -echo "Packages within this cloud image:" -echo "-----------------------------------------------------------------------" -rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn -echo "-----------------------------------------------------------------------" -# Note that running rpm recreates the rpm db files which aren't needed/wanted -rm -f /var/lib/rpm/__db* - - -# This is a temporary workaround for -# -# where sfdisk seems to be messing up the mbr. -# Long-term fix is to address this in anaconda directly and remove this. -# -dd if=/usr/share/syslinux/mbr.bin of=/dev/vda - - -echo "Fixing SELinux contexts." -touch /var/log/cron -touch /var/log/boot.log -mkdir -p /var/cache/dnf -chattr -i /boot/extlinux/ldlinux.sys -/usr/sbin/fixfiles -R -a restore -chattr +i /boot/extlinux/ldlinux.sys - -echo "Zeroing out empty space." -# This forces the filesystem to reclaim space from deleted files -dd bs=1M if=/dev/zero of=/var/tmp/zeros || : -rm -f /var/tmp/zeros -echo "(Don't worry -- that out-of-space error was expected.)" - -# Enable network service here, as doing it in the services line -# fails due to RHBZ #1369794 -/sbin/chkconfig network on - -%end -