Remove exclusions from lorax-composer templates
If a package is excluded in the template and later added by a blueprint
or dependency, anaconda will fail to finish the installation. So remove
the -dracut-config-rescue exclusion and instead remove the rescue
artifacts in %post
(cherry picked from commit 822bc7ac68
)
This commit is contained in:
parent
4f07db73a5
commit
85708340eb
@ -36,11 +36,13 @@ touch /etc/machine-id
|
|||||||
|
|
||||||
# tell cloud-init to create the ec2-user account
|
# tell cloud-init to create the ec2-user account
|
||||||
sed -i 's/cloud-user/ec2-user/' /etc/cloud/cloud.cfg
|
sed -i 's/cloud-user/ec2-user/' /etc/cloud/cloud.cfg
|
||||||
|
|
||||||
|
# Remove the rescue kernel and image to save space
|
||||||
|
rm -f /boot/*-rescue*
|
||||||
%end
|
%end
|
||||||
|
|
||||||
%packages
|
%packages
|
||||||
kernel
|
kernel
|
||||||
-dracut-config-rescue
|
|
||||||
selinux-policy-targeted
|
selinux-policy-targeted
|
||||||
|
|
||||||
chrony
|
chrony
|
||||||
|
@ -28,6 +28,9 @@ rm /var/lib/systemd/random-seed
|
|||||||
# Clear /etc/machine-id
|
# Clear /etc/machine-id
|
||||||
rm /etc/machine-id
|
rm /etc/machine-id
|
||||||
touch /etc/machine-id
|
touch /etc/machine-id
|
||||||
|
|
||||||
|
# Remove the rescue kernel and image to save space
|
||||||
|
rm -f /boot/*-rescue*
|
||||||
%end
|
%end
|
||||||
|
|
||||||
# NOTE Do NOT add any other sections after %packages
|
# NOTE Do NOT add any other sections after %packages
|
||||||
|
@ -33,11 +33,13 @@ rm /var/lib/systemd/random-seed
|
|||||||
# Clear /etc/machine-id
|
# Clear /etc/machine-id
|
||||||
rm /etc/machine-id
|
rm /etc/machine-id
|
||||||
touch /etc/machine-id
|
touch /etc/machine-id
|
||||||
|
|
||||||
|
# Remove the rescue kernel and image to save space
|
||||||
|
rm -f /boot/*-rescue*
|
||||||
%end
|
%end
|
||||||
|
|
||||||
%packages
|
%packages
|
||||||
kernel
|
kernel
|
||||||
-dracut-config-rescue
|
|
||||||
selinux-policy-targeted
|
selinux-policy-targeted
|
||||||
|
|
||||||
# Make sure virt guest agents are installed
|
# Make sure virt guest agents are installed
|
||||||
|
@ -30,11 +30,13 @@ rm /var/lib/systemd/random-seed
|
|||||||
# Clear /etc/machine-id
|
# Clear /etc/machine-id
|
||||||
rm /etc/machine-id
|
rm /etc/machine-id
|
||||||
touch /etc/machine-id
|
touch /etc/machine-id
|
||||||
|
|
||||||
|
# Remove the rescue kernel and image to save space
|
||||||
|
rm -f /boot/*-rescue*
|
||||||
%end
|
%end
|
||||||
|
|
||||||
%packages
|
%packages
|
||||||
kernel
|
kernel
|
||||||
-dracut-config-rescue
|
|
||||||
selinux-policy-targeted
|
selinux-policy-targeted
|
||||||
|
|
||||||
# NOTE lorax-composer will add the blueprint packages below here, including the final %end
|
# NOTE lorax-composer will add the blueprint packages below here, including the final %end
|
||||||
|
@ -30,11 +30,13 @@ rm /var/lib/systemd/random-seed
|
|||||||
# Clear /etc/machine-id
|
# Clear /etc/machine-id
|
||||||
rm /etc/machine-id
|
rm /etc/machine-id
|
||||||
touch /etc/machine-id
|
touch /etc/machine-id
|
||||||
|
|
||||||
|
# Remove the rescue kernel and image to save space
|
||||||
|
rm -f /boot/*-rescue*
|
||||||
%end
|
%end
|
||||||
|
|
||||||
%packages
|
%packages
|
||||||
kernel
|
kernel
|
||||||
-dracut-config-rescue
|
|
||||||
selinux-policy-targeted
|
selinux-policy-targeted
|
||||||
|
|
||||||
# Make sure virt guest agents are installed
|
# Make sure virt guest agents are installed
|
||||||
|
@ -28,6 +28,9 @@ rm /var/lib/systemd/random-seed
|
|||||||
# Clear /etc/machine-id
|
# Clear /etc/machine-id
|
||||||
rm /etc/machine-id
|
rm /etc/machine-id
|
||||||
touch /etc/machine-id
|
touch /etc/machine-id
|
||||||
|
|
||||||
|
# Remove the rescue kernel and image to save space
|
||||||
|
rm -f /boot/*-rescue*
|
||||||
%end
|
%end
|
||||||
|
|
||||||
# NOTE Do NOT add any other sections after %packages
|
# NOTE Do NOT add any other sections after %packages
|
||||||
|
@ -34,6 +34,9 @@ rm /var/lib/systemd/random-seed
|
|||||||
rm /etc/machine-id
|
rm /etc/machine-id
|
||||||
touch /etc/machine-id
|
touch /etc/machine-id
|
||||||
|
|
||||||
|
# Remove the rescue kernel and image to save space
|
||||||
|
rm -f /boot/*-rescue*
|
||||||
|
|
||||||
# This file is required by waagent in RHEL, but compatible with NetworkManager
|
# This file is required by waagent in RHEL, but compatible with NetworkManager
|
||||||
cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
|
cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
|
||||||
DEVICE=eth0
|
DEVICE=eth0
|
||||||
@ -59,7 +62,6 @@ dracut -f -v --persistent-policy by-uuid
|
|||||||
|
|
||||||
%packages
|
%packages
|
||||||
kernel
|
kernel
|
||||||
-dracut-config-rescue
|
|
||||||
selinux-policy-targeted
|
selinux-policy-targeted
|
||||||
|
|
||||||
chrony
|
chrony
|
||||||
|
@ -33,11 +33,13 @@ rm /var/lib/systemd/random-seed
|
|||||||
# Clear /etc/machine-id
|
# Clear /etc/machine-id
|
||||||
rm /etc/machine-id
|
rm /etc/machine-id
|
||||||
touch /etc/machine-id
|
touch /etc/machine-id
|
||||||
|
|
||||||
|
# Remove the rescue kernel and image to save space
|
||||||
|
rm -f /boot/*-rescue*
|
||||||
%end
|
%end
|
||||||
|
|
||||||
%packages
|
%packages
|
||||||
kernel
|
kernel
|
||||||
-dracut-config-rescue
|
|
||||||
selinux-policy-targeted
|
selinux-policy-targeted
|
||||||
|
|
||||||
chrony
|
chrony
|
||||||
|
Loading…
Reference in New Issue
Block a user