From 4e495bc918525ac5d14ba84f494eece54b0001ef Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 22 Mar 2016 12:05:13 -0700 Subject: [PATCH] livemedia-creator: Update example kickstarts Update the URL, add network command where needed, make sure all auth commands are using sha512 now. Removed the fedora-livemedia-ec2 example, Fedora doesn't have grub and it has never really been tested. --- docs/fedora-docker.ks | 4 +- docs/fedora-livemedia-ec2.ks | 124 ----------------------------------- docs/fedora-livemedia.ks | 6 +- docs/fedora-minimal.ks | 6 +- docs/fedora-minimized.ks | 12 +++- docs/fedora-openstack.ks | 4 +- docs/fedora-vagrant.ks | 6 +- 7 files changed, 26 insertions(+), 136 deletions(-) delete mode 100644 docs/fedora-livemedia-ec2.ks diff --git a/docs/fedora-docker.ks b/docs/fedora-docker.ks index 9b03ea37..ea0fd3f0 100644 --- a/docs/fedora-docker.ks +++ b/docs/fedora-docker.ks @@ -1,14 +1,14 @@ # Minimal Disk Image # Use network installation -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/" +url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/" # Root password rootpw --plaintext replace-this-pw # Network information network --bootproto=dhcp --activate # System authorization information -auth --useshadow --enablemd5 +auth --useshadow --passalgo=sha512 # System keyboard keyboard --xlayouts=us --vckeymap=us # System language diff --git a/docs/fedora-livemedia-ec2.ks b/docs/fedora-livemedia-ec2.ks deleted file mode 100644 index 1eef480a..00000000 --- a/docs/fedora-livemedia-ec2.ks +++ /dev/null @@ -1,124 +0,0 @@ -# Build a basic Fedora AMI using livemedia-creator -lang en_US.UTF-8 -keyboard us -timezone --utc America/New_York -auth --useshadow --enablemd5 -selinux --enforcing -firewall --service=ssh -bootloader --location=none -services --enabled=network,sshd,rsyslog -shutdown - -# By default the root password is emptied -rootpw --plaintext removethispw - -# -# Define how large you want your rootfs to be -# NOTE: S3-backed AMIs have a limit of 10G -# -clearpart --all --initlabel -part / --size 10000 --fstype ext4 -part swap --size=512 - -# -# Repositories -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/" - -# -# -# Add all the packages after the base packages -# -%packages --nobase -@core -system-config-securitylevel-tui -audit -pciutils -bash -coreutils -kernel -# Make sure that DNF doesn't pull in debug kernel to satisfy kmod() requires -kernel-modules -kernel-modules-extra - -e2fsprogs -passwd -policycoreutils -chkconfig -rootfiles -yum -vim-minimal -acpid -openssh-clients -openssh-server -curl -sudo - -#Allow for dhcp access -dhclient -iputils - --firstboot --biosdevname - -# package to setup cloudy bits for us -cloud-init - -grub --dracut-config-rescue -%end - -# more ec2-ify -%post --erroronfail - -# create ec2-user -/usr/sbin/useradd ec2-user -/bin/echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers - -# fstab mounting is different for x86_64 and i386 -cat < /etc/fstab -/dev/xvda1 / ext4 defaults 1 1 -/dev/xvda2 /mnt ext3 defaults 0 0 -/dev/xvda3 swap swap defaults 0 0 -EOL - -if [ ! -d /lib64 ] ; then -# workaround xen performance issue (bz 651861) -echo "hwcap 1 nosegneg" > /etc/ld.so.conf.d/libc6-xen.conf -fi - -# Install grub.conf -# idle=nomwait is to allow xen images to boot and not try use cpu features that are not supported -INITRD=`ls /boot/initramfs-* | head -n1` -KERNEL=`ls /boot/vmlinuz-* | head -n1` -mkdir /boot/grub -pushd /boot/grub -cat < grub.conf -default 0 -timeout 0 - -title Fedora Linux - root (hd0) - kernel $KERNEL root=/dev/xvda1 idle=halt - initrd $INITRD -EOL -# symlink grub.conf to menu.lst for use by EC2 pv-grub -ln -s grub.conf menu.lst -popd - -# the firewall rules get saved as .old without this we end up not being able -# ssh in as iptables blocks access -rename -v .old "" /etc/sysconfig/*old - -# setup systemd to boot to the right runlevel -rm /etc/systemd/system/default.target -ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target - -# remove the root password -passwd -d root > /dev/null - -%end - -%post -# Remove random-seed -rm /var/lib/systemd/random-seed -%end diff --git a/docs/fedora-livemedia.ks b/docs/fedora-livemedia.ks index c7198e56..fc735c39 100644 --- a/docs/fedora-livemedia.ks +++ b/docs/fedora-livemedia.ks @@ -286,6 +286,10 @@ echo 'File created by kickstart. See systemd-update-done.service(8).' \ # Remove random-seed rm /var/lib/systemd/random-seed + +# Remove the rescue kernel and image to save space +# Installation will recreate these on the target +rm -f /boot/*-rescue* %end %post --nochroot @@ -374,6 +378,7 @@ EOF @networkmanager-submodules @printing @workstation-product +gnome-terminal aajohan-comfortaa-fonts anaconda dracut-config-generic @@ -390,7 +395,6 @@ syslinux -@dial-up -@input-methods -@standard --dracut-config-rescue -gfs2-utils -reiserfs-utils diff --git a/docs/fedora-minimal.ks b/docs/fedora-minimal.ks index 849d5b56..333bcc07 100644 --- a/docs/fedora-minimal.ks +++ b/docs/fedora-minimal.ks @@ -4,12 +4,14 @@ sshpw --username=root --plaintext randOmStrinGhERE # Firewall configuration firewall --enabled # Use network installation -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/" +url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/" +# Network information +network --bootproto=dhcp --device=link --activate # Root password rootpw --plaintext removethispw # System authorization information -auth --useshadow --enablemd5 +auth --useshadow --passalgo=sha512 # System keyboard keyboard --xlayouts=us --vckeymap=us # System language diff --git a/docs/fedora-minimized.ks b/docs/fedora-minimized.ks index d89a8d3f..4b968d4d 100644 --- a/docs/fedora-minimized.ks +++ b/docs/fedora-minimized.ks @@ -4,12 +4,14 @@ sshpw --username=root --plaintext randOmStrinGhERE # Firewall configuration firewall --enabled # Use network installation -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/" +url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/" +# Network information +network --bootproto=dhcp --device=link --activate # Root password rootpw --plaintext removethispw # System authorization information -auth --useshadow --enablemd5 +auth --useshadow --passalgo=sha512 # System keyboard keyboard --xlayouts=us --vckeymap=us # System language @@ -55,6 +57,9 @@ syslinux # dracut needs these included dracut-network tar + +# lorax for image-minimizer +lorax %end # @@ -107,5 +112,6 @@ droprpm sgpio droprpm syslinux droprpm system-config-firewall-base droprpm usermode - +# Not needed after image-minimizer is done +droprpm lorax %end diff --git a/docs/fedora-openstack.ks b/docs/fedora-openstack.ks index 6eda712a..2ee9c8bd 100644 --- a/docs/fedora-openstack.ks +++ b/docs/fedora-openstack.ks @@ -3,14 +3,14 @@ # Firewall configuration firewall --enabled # Use network installation -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/" +url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/" # Root password rootpw --plaintext replace-this-pw # Network information network --bootproto=dhcp --activate # System authorization information -auth --useshadow --enablemd5 +auth --useshadow --passalgo=sha512 # System keyboard keyboard --xlayouts=us --vckeymap=us # System language diff --git a/docs/fedora-vagrant.ks b/docs/fedora-vagrant.ks index 3f351241..3ce7b2a0 100644 --- a/docs/fedora-vagrant.ks +++ b/docs/fedora-vagrant.ks @@ -4,7 +4,9 @@ # Firewall configuration firewall --enabled # Use network installation -url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/x86_64/os/" +url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/" +# Network information +network --bootproto=dhcp --activate # Root account is locked, access via sudo from vagrant user rootpw --lock @@ -14,7 +16,7 @@ user --name=vagrant sshkey --username=vagrant "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key" # System authorization information -auth --useshadow --enablemd5 +auth --useshadow --passalgo=sha512 # System keyboard keyboard --xlayouts=us --vckeymap=us # System language