Unverified Commit da28d3c7 authored by Neil Hanlon's avatar Neil Hanlon
Browse files

Don't install unnecessary packages and ensure correct boot modes for arm

parent 034a2531
......@@ -7,7 +7,7 @@ output_type=gpt_xfs
output_file="Rocky-${version}-${type}-${arch}.qcow2"
remove_packages="aic94xx-firmware alsa-firmware alsa-lib alsa-tools-firmware ivtv-firmware iwl100-firmware iwl1000-firmware iwl105-firmware iwl135-firmware iwl2000-firmware iwl2030-firmware iwl3160-firmware iwl3945-firmware iwl4965-firmware iwl5000-firmware iwl5150-firmware iwl6000-firmware iwl6000g2a-firmware iwl6000g2b-firmware iwl6050-firmware iwl7260-firmware libertas-sd8686-firmware libertas-sd8787-firmware libertas-usb8388-firmware biosdevname iputils plymouth langpacks-* langpacks-en"
remove_packages="!aic94xx-firmware !alsa-firmware !alsa-lib !alsa-tools-firmware !ivtv-firmware !iwl100-firmware !iwl1000-firmware !iwl105-firmware !iwl135-firmware !iwl2000-firmware !iwl2030-firmware !iwl3160-firmware !iwl3945-firmware !iwl4965-firmware !iwl5000-firmware !iwl5150-firmware !iwl6000-firmware !iwl6000g2a-firmware !iwl6000g2b-firmware !iwl6050-firmware !iwl7260-firmware !libertas-sd8686-firmware !libertas-sd8787-firmware !libertas-usb8388-firmware !biosdevname !iputils !plymouth !langpacks-*"
packages="@core chrony dnf yum cloud-init cloud-utils-growpart NetworkManager dracut-config-generic dracut-norescue firewalld gdisk grub2 kernel nfs-utils rsync tar dnf-utils yum-utils python3-jsonschema qemu-guest-agent dhcp-client cockpit-ws cockpit-system rocky-release rng-tools"
package_args=""
......@@ -15,9 +15,9 @@ for p in $packages; do
package_args="${package_args} --package=${p}"
done
remove_package_args=""
for p in $remove_packages; do
remove_package_args="${remove_package_args} --remove-package=${p}"
# remove_package_args=""
for p in $remove_packages; do
package_args="${package_args} --package=${p}"
done
......@@ -37,5 +37,5 @@ sudo mkosi -d rocky -r ${version} -m ${mirror} -t ${output_type} -o ${output_fil
--qcow2 --boot-protocols="$boot_protocols" \
--without-unified-kernel-images \
$package_args \
$remove_package_args \
$@
# $remove_package_args \
# $@
......@@ -11,6 +11,11 @@ output_file="Rocky-${version}-GenericCloud-${arch}.qcow2"
packages='NetworkManager,chrony,cloud-init,cloud-utils-growpart,coreutils,dhcp-client,dnf,dnf-utils,openssh-server,openssh-clients,python3-jsonschema,qemu-guest-agent,rng-tools,cockpit-system,cockpit-ws,dracut-config-generic,dracut-norescue,firewalld,gdisk,grub2,kernel,nfs-utils,rocky-release,rocky-repos,rootfiles,rsync,systemd,tar,yum,yum-utils'
boot_protocols="uefi"
if [[ $arch == x86_64 ]]; then
boot_protocols="${boot_protocols},bios"
fi
sudo mkosi -d rocky -r ${version} -m ${mirror} -t ${output_type} -o ${output_file} \
--architecture $arch \
--bootable \
......@@ -18,6 +23,6 @@ sudo mkosi -d rocky -r ${version} -m ${mirror} -t ${output_type} -o ${output_fil
--package "${packages}" \
--password=rocky \
--postinst-script=$(dirname $0)/genclo/common.sh \
--qcow2 --boot-protocols=uefi,bios \
--qcow2 --boot-protocols="$boot_protocols" \
--without-unified-kernel-images \
$@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment