cloud: remove a bunch of cruft
Pretty much all of it is obsolete or not needed any longer because bugs were fixed at one time or another.
This commit is contained in:
Dusty Mabe
parent
64e1747d7d
commit
c94861c9e8
|
|
@ -4,9 +4,6 @@
|
|||
# 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 Fedora install, this image has /tmp on disk
|
||||
# rather than in tmpfs, since memory is usually at a premium.
|
||||
#
|
||||
# This kickstart file is designed to be used with ImageFactory (in Koji).
|
||||
#
|
||||
# To do a local build, you'll need to install ImageFactory. See
|
||||
|
|
@ -92,38 +89,6 @@ which
|
|||
|
||||
%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
|
||||
|
||||
# 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
|
||||
|
|
@ -141,11 +106,6 @@ echo "Removing firewalld."
|
|||
# dnf -C -y remove "firewalld*" --setopt="clean_requirements_on_remove=1"
|
||||
dnf -C -y erase "firewalld*"
|
||||
|
||||
# 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 erase authconfig
|
||||
|
||||
# instlang hack. (Note! See bug referenced above package list)
|
||||
find /usr/share/locale -mindepth 1 -maxdepth 1 -type d -not -name en_US -exec rm -rf {} +
|
||||
localedef --list-archive | grep -v ^en_US | xargs localedef --delete-from-archive
|
||||
|
|
@ -155,12 +115,6 @@ build-locale-archive
|
|||
echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.image-language-conf
|
||||
|
||||
|
||||
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.
|
||||
|
|
@ -189,52 +143,14 @@ 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 <<EOF > /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."
|
||||
# FIXME: clear history?
|
||||
dnf clean all
|
||||
truncate -c -s 0 /var/log/dnf.log
|
||||
truncate -c -s 0 /var/log/dnf.rpm.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*
|
||||
|
||||
# FIXME: is this still needed?
|
||||
echo "Fixing SELinux contexts."
|
||||
touch /var/log/cron
|
||||
touch /var/log/boot.log
|
||||
# ignore return code because UEFI systems with vfat filesystems
|
||||
# that don't support selinux will give us errors
|
||||
/usr/sbin/fixfiles -R -a restore || true
|
||||
|
||||
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 || :
|
||||
|
|
@ -248,19 +164,10 @@ echo "(Don't worry -- that out-of-space error was expected.)"
|
|||
# The 'network' service can come up cleanly.
|
||||
rm -f /etc/sysconfig/network-scripts/ifcfg-en*
|
||||
|
||||
# Enable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
/sbin/chkconfig network on
|
||||
|
||||
# Remove machine-id on pre generated images
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
# Anaconda is writing an /etc/resolv.conf from the install environment.
|
||||
# The system should start out with an empty file, otherwise cloud-init
|
||||
# will try to use this information and may error:
|
||||
# https://bugs.launchpad.net/cloud-init/+bug/1670052
|
||||
truncate -s 0 /etc/resolv.conf
|
||||
|
||||
%end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue