Diffstat (limited to 'teams/cloud')
| -rw-r--r-- | teams/cloud/cloud.xml | 161 | ||||
| -rw-r--r-- | teams/cloud/container.xml | 144 | ||||
| -rw-r--r-- | teams/cloud/vagrant.xml | 15 | ||||
| -rw-r--r-- | teams/cloud/wsl.xml | 67 |
4 files changed, 324 insertions, 63 deletions
diff --git a/teams/cloud/cloud.xml b/teams/cloud/cloud.xml index 03466b4..3a99ce7 100644 --- a/teams/cloud/cloud.xml +++ b/teams/cloud/cloud.xml @@ -28,17 +28,39 @@ <requires profile="Cloud-Base-Generic"/> </profile> </profiles> - <preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Azure" arch="x86_64"> <type image="oem" format="vhd-fixed" formatoptions="force_size" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" - kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0" + kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> + <systemdisk> + <volume name="@root=root"/> + <volume name="boot" parent="/"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-Azure" arch="aarch64"> + <type image="oem" format="vhd-fixed" formatoptions="force_size" + filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" console="serial" timeout="0"/> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -48,19 +70,62 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64"> + <type image="oem" + filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" + kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> + <size unit="G">5</size> + <systemdisk> + <volume name="@root=root"/> + <volume name="boot" parent="/"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-AmazonEC2" arch="aarch64"> <type image="oem" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" - kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > - <bootloader name="grub2" timeout="0"/> + <bootloader name="grub2" bls="true" timeout="0"/> + <size unit="G">5</size> + <systemdisk> + <volume name="@root=root"/> + <volume name="boot" parent="/"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-GCE" arch="x86_64"> + <type image="oem" format="gce" + filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" + kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> <!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G --> <size unit="G">10</size> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -69,18 +134,41 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-GCE" arch="aarch64"> <type image="oem" format="gce" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" - kernelcmdline="no_timer_check net.ifnames=0 console=ttyS0,38400n8d" + kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > - <bootloader name="grub2" timeout="0"/> + <bootloader name="grub2" bls="true" timeout="0"/> + <!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G --> + <size unit="G">10</size> + <systemdisk> + <volume name="@root=root"/> + <volume name="boot" parent="/"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-Generic" arch="x86_64,riscv64"> + <type image="oem" format="qcow2" + filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" + kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> <size unit="G">5</size> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -89,18 +177,19 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Generic" arch="aarch64"> <type image="oem" format="qcow2" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" - kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > - <bootloader name="grub2" timeout="0"/> + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> <size unit="G">5</size> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -112,12 +201,33 @@ <preferences profiles="Cloud-Base-Generic" arch="ppc64le"> <type image="oem" format="qcow2" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" - kernelcmdline="no_timer_check net.ifnames=0 console=tty1 console=ttyS0,115200n8" - devicepersistency="by-uuid" target_blocksize="4096" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw" + kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="false" firmware="ofw" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> + <size unit="G">5</size> + <systemdisk> + <volume name="@root=root"/> + <volume name="boot" parent="/"/> + <volume name="home" parent="/"/> + <volume name="var" parent="/"/> + </systemdisk> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-Generic" arch="s390x"> + <type image="oem" format="qcow2" + filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" + kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="ext4" rootfs_label="fedora" > - <bootloader name="grub2" timeout="0"/> + <bootloader name="zipl" timeout="1"/> <size unit="G">5</size> <systemdisk> <volume name="@root=root"/> @@ -129,11 +239,12 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-UEFI-UKI" arch="x86_64,aarch64,riscv64"> <type image="oem" format="qcow2" firmware="uefi" efipartsize="1000" bootpartition="false" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="true" + kernelcmdline="systemd.firstboot=off" devicepersistency="by-uuid" rootfs_label="fedora" initrd_system="none" @@ -158,11 +269,13 @@ <namedCollection name="cloud-server-environment"/> <ignore name="dracut-config-rescue"/> <ignore name="firewalld"/> + <ignore name="fwupd"/> <ignore name="kernel"/> <ignore name="*-firmware"/> <ignore name="geolite2-city"/> <ignore name="geolite2-country"/> <ignore name="plymouth"/> + <package name="btrfs-progs"/> <package name="python3-dnf-plugin-tracer"/> <package name="glibc-langpack-en"/> </packages> @@ -170,16 +283,24 @@ <namedCollection name="cloud-server-environment"/> <ignore name="dracut-config-rescue"/> <ignore name="firewalld"/> + <ignore name="fwupd"/> <ignore name="kernel"/> <ignore name="[a-oq-z]*-firmware"/> <ignore name="geolite2-city"/> <ignore name="geolite2-country"/> <ignore name="plymouth"/> + <package name="btrfs-progs"/> <package name="python3-dnf-plugin-tracer"/> <package name="glibc-langpack-en"/> </packages> + <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-AmazonEC2"> + <package name="amazon-ec2-utils"/> + <package name="awscli2"/> + <package name="ec2-instance-connect"/> + </packages> <packages type="image" patternType="plusRecommended" profiles="Cloud-Base-Azure"> <package name="WALinuxAgent"/> + <package name="azure-vm-utils"/> <package name="kernel-modules"/> <package name="hyperv-daemons"/> </packages> diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index c473bcf..25dcd49 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -8,28 +8,30 @@ <profile name="Container-Base-Generic" description="Generic Base Container Image"> <requires profile="ContainerCore"/> </profile> - <profile name="Container-Toolbox" description="Toolbox Container Image"> + <profile name="Container-Base-Generic-Init" description="Generic Init Base Container Image"> <requires profile="ContainerCore"/> </profile> + <profile name="Container-Toolbox" description="Toolbox Container Image"/> </profiles> <preferences profiles="Container-Base-Generic"> <type image="oci"> <containerconfig name="fedora" - tag="rawhide" + tag="45" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/bin/bash"/> <labels> <label name="org.opencontainers.image.vendor" value="Fedora Project"/> <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.license" value="MIT"/> - <label name="org.opencontainers.image.version" value="rawhide"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="version" value="rawhide"/> + <label name="org.opencontainers.image.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora"/> + <label name="org.opencontainers.image.version" value="45"/> </labels> + <environment> + <env name="container" value="oci"/> + <env name="PATH" value="/usr/local/bin:/usr/bin"/> + </environment> </containerconfig> </type> <timezone>Etc/UTC</timezone> @@ -41,20 +43,44 @@ <type image="oci"> <containerconfig name="fedora-minimal" - tag="rawhide" + tag="45" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/bin/bash"/> <labels> <label name="org.opencontainers.image.vendor" value="Fedora Project"/> <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.license" value="MIT"/> - <label name="org.opencontainers.image.version" value="rawhide"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="version" value="rawhide"/> + <label name="org.opencontainers.image.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora-minimal"/> + <label name="org.opencontainers.image.version" value="45"/> </labels> + <environment> + <env name="container" value="oci"/> + <env name="PATH" value="/usr/local/bin:/usr/bin"/> + </environment> + </containerconfig> + </type> + <timezone>Etc/UTC</timezone> + <locale>en_US</locale> + <rpm-locale-filtering>true</rpm-locale-filtering> + <rpm-excludedocs>true</rpm-excludedocs> + </preferences> + <preferences profiles="Container-Base-Generic-Init"> + <type image="oci"> + <containerconfig + name="fedora-init" + tag="45" + maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" + > + <subcommand execute="/sbin/init"/> + <labels> + <label name="org.opencontainers.image.vendor" value="Fedora Project"/> + <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> + <label name="org.opencontainers.image.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora-init"/> + <label name="org.opencontainers.image.version" value="45"/> + </labels> + <stopsignal>SIGRTMIN+3</stopsignal> </containerconfig> </type> <timezone>Etc/UTC</timezone> @@ -66,21 +92,22 @@ <type image="oci"> <containerconfig name="fedora-toolbox" - tag="rawhide" + tag="45" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/bin/bash"/> <labels> <label name="org.opencontainers.image.vendor" value="Fedora Project"/> <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.license" value="MIT"/> - <label name="org.opencontainers.image.version" value="rawhide"/> + <label name="org.opencontainers.image.licenses" value="MIT"/> + <label name="org.opencontainers.image.title" value="fedora-toolbox"/> + <label name="org.opencontainers.image.version" value="45"/> <label name="com.github.containers.toolbox" value="true"/> - <!-- Legacy attributes for backward compatibility --> - <label name="vendor" value="Fedora Project"/> - <label name="license" value="MIT"/> - <label name="version" value="rawhide"/> </labels> + <environment> + <env name="container" value="oci"/> + <env name="PATH" value="/usr/local/bin:/usr/bin"/> + </environment> </containerconfig> </type> <timezone>Etc/UTC</timezone> @@ -106,47 +133,80 @@ <ignore name="grubby"/> <ignore name="langpacks-en_GB"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1951111 --> - <ignore name="util-linux"/> <ignore name="sssd-client"/> <package name="fedora-release-container"/> <package name="bash"/> <package name="coreutils"/> <package name="rpm"/> + <package name="shadow-utils"/> + <package name="util-linux-core"/> + <package name="gawk"/> </packages> <packages type="bootstrap" profiles="Container-Base-Generic-Minimal"> <ignore name="glibc-langpack-en"/> <ignore name="langpacks-en"/> <ignore name="tzdata"/> - <package name="microdnf"/> + <package name="dnf5"/> <package name="glibc-minimal-langpack"/> + <package name="systemd-standalone-sysusers"/> </packages> <packages type="bootstrap" profiles="Container-Base-Generic"> + <package name="systemd-standalone-sysusers"/> + </packages> + <packages type="bootstrap" profiles="Container-Base-Generic,Container-Base-Generic-Init"> <ignore name="glibc-langpack-en"/> <ignore name="langpacks-en"/> + <package name="bzip2"/> + <package name="gzip"/> + <package name="sudo"/> <package name="rootfiles"/> <package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 --> <package name="vim-minimal"/> - <package name="dnf"/> - <package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 --> + <package name="dnf5"/> + <package name="dnf5-plugins"/> <package name="glibc-minimal-langpack"/> <package name="tzdata"/> + <package name="xz"/> + <package name="zstd"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="Container-Toolbox"> + <packages type="image" profiles="Container-Base-Generic-Init"> + <package name="glibc-langpack-en"/> + <package name="kbd"/> + <package name="systemd"/> + </packages> + <packages type="bootstrap" patternType="plusRecommended" profiles="Container-Toolbox"> + <ignore name="dosfstools"/> + <ignore name="e2fsprogs"/> + <ignore name="*-firmware"/> + <ignore name="fuse-libs"/> + <ignore name="geolite2-city"/> + <ignore name="geolite2-country"/> + <ignore name="grubby"/> + <ignore name="kernel"/> + <ignore name="libss"/> <!-- used by e2fsprogs --> + <ignore name="pinentry"/> + <ignore name="shared-mime-info"/> + <ignore name="sssd-client"/> <!-- This is a weak dep of systemd, we do not want this in the container; see: https://github.com/containers/toolbox/issues/1410 --> <ignore name="systemd-resolved"/> + <ignore name="trousers"/> + <ignore name="xkeyboard-config"/> <package name="acl"/> <package name="bash"/> <package name="bash-completion"/> <package name="bc"/> <package name="bzip2"/> + <package name="coreutils"/> <package name="coreutils-common"/> + <package name="cpio"/> <package name="curl"/> <package name="default-editor"/> <package name="diffutils"/> - <package name="dnf"/> - <package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 --> - <package name="dnf-plugins-core"/> + <package name="dnf5"/> + <package name="dnf5-plugins"/> + <package name="fedora-release-toolbx"/> + <package name="file"/> <package name="findutils"/> <package name="flatpak-spawn"/> <package name="fpaste"/> @@ -161,28 +221,30 @@ <package name="hostname"/> <package name="iproute"/> <package name="iputils"/> + <package name="kbd-misc"/> <package name="keyutils"/> <package name="krb5-libs"/> + <package name="langpacks-en"/> <package name="less"/> <package name="libcap"/> <package name="lsof"/> <package name="man-db"/> <package name="man-pages"/> <package name="mesa-dri-drivers"/> - <package name="mesa-va-drivers"/> <package name="mesa-vulkan-drivers"/> <package name="mtr"/> <package name="nss-mdns"/> <package name="openssh-clients"/> <package name="openssl"/> - <package name="p11-kit"/> + <package name="p11-kit-client"/> <package name="pam"/> - <package name="passwd"/> <package name="pigz"/> + <package name="policycoreutils"/> <package name="procps-ng"/> <package name="psmisc"/> <package name="python3"/> <package name="rootfiles"/> + <package name="rpm"/> <package name="rsync"/> <package name="sed"/> <package name="shadow-utils"/> @@ -195,8 +257,7 @@ <package name="tzdata"/> <package name="unzip"/> <package name="util-linux"/> - <package name="util-linux-core"/> - <package name="vim-enhanced"/> + <package name="vim-minimal"/> <package name="vte-profile"/> <package name="vulkan-loader"/> <package name="wget"/> @@ -206,6 +267,17 @@ <package name="xorg-x11-xauth"/> <package name="xz"/> <package name="zip"/> - <package name="zstd"/> + </packages> + <packages type="uninstall" profiles="Container-Toolbox"> + <package name="dracut"/> + <package name="pinentry"/> + <package name="systemd-resolved"/> + <package name="xkeyboard-config"/> + </packages> + <packages type="bootstrap" profiles="Container-Base-Generic-Minimal,Container-Base-Generic,Container-Toolbox"> + <package name="systemd-standalone-tmpfiles"/> + </packages> + <packages type="uninstall" profiles="Container-Base-Generic-Minimal,Container-Base-Generic,Container-Toolbox"> + <package name="systemd-standalone-tmpfiles"/> </packages> </image> diff --git a/teams/cloud/vagrant.xml b/teams/cloud/vagrant.xml index 68789c5..301b08c 100644 --- a/teams/cloud/vagrant.xml +++ b/teams/cloud/vagrant.xml @@ -13,16 +13,17 @@ <preferences profiles="Cloud-Base-Vagrant-libvirt" arch="x86_64,aarch64"> <type image="oem" format="vagrant" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" - kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" + kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > - <bootloader name="grub2" console="serial" timeout="1"/> + <bootloader name="grub2" bls="true" console="serial" timeout="1"/> <size unit="G">5</size> <vagrantconfig provider="libvirt" virtualsize="5"/> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -34,16 +35,17 @@ <preferences profiles="Cloud-Base-Vagrant-VirtualBox" arch="x86_64"> <type image="oem" format="vagrant" filesystem="btrfs" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" fsmountoptions="compress=zstd:1" - kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" + kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi" + bootpartition="false" efipartsize="100" firmware="uefi" rootfs_label="fedora" > - <bootloader name="grub2" console="serial" timeout="1"/> + <bootloader name="grub2" bls="true" console="serial" timeout="1"/> <size unit="G">5</size> <vagrantconfig provider="virtualbox" virtualbox_guest_additions_present="true" virtualsize="5"/> <systemdisk> <volume name="@root=root"/> + <volume name="boot" parent="/"/> <volume name="home" parent="/"/> <volume name="var" parent="/"/> </systemdisk> @@ -58,7 +60,6 @@ <user password="$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0" home="/root" name="root" groups="root"/> </users> <packages type="image" patternType="plusRecommended" profiles="VagrantCore"> - <package name="dnf-yum"/> <package name="rsync"/> <package name="fuse-sshfs"/> <package name="gdisk"/> diff --git a/teams/cloud/wsl.xml b/teams/cloud/wsl.xml new file mode 100644 index 0000000..ffafb79 --- /dev/null +++ b/teams/cloud/wsl.xml @@ -0,0 +1,67 @@ +<image> + <profiles> + <profile name="WSL-Base" description="Windows Subsystem for Linux Base"/> + </profiles> + <preferences profiles="WSL-Base"> + <type image="wsl"/> + <timezone>Etc/UTC</timezone> + <locale>en_US</locale> + <rpm-locale-filtering>false</rpm-locale-filtering> + <rpm-excludedocs>false</rpm-excludedocs> + </preferences> + <packages type="bootstrap" profiles="WSL-Base"> + <package name="bash"/> + <package name="coreutils"/> + <package name="dnf5"/> + <package name="dnf5-plugins"/> + <package name="fedora-release-wsl"/> + <package name="rpm"/> + </packages> + <packages type="image" patternType="plusRecommended" profiles="WSL-Base"> + <package name="attr"/> + <package name="acl"/> + <package name="bash-color-prompt"/> + <package name="bash-completion"/> + <package name="bind-utils"/> + <package name="bzip2"/> + <package name="curl"/> + <package name="dbus"/> + <package name="default-editor"/> + <package name="file"/> + <package name="glibc-langpack-en"/> + <package name="gnupg2"/> + <package name="iproute"/> + <package name="iputils"/> + <package name="less"/> + <package name="lsof"/> + <package name="man-db"/> + <package name="man-pages"/> + <package name="NetworkManager"/> + <package name="nmap-ncat"/> + <package name="openssh-clients"/> + <package name="passwd"/> + <package name="pciutils"/> + <package name="procps-ng"/> + <package name="rsync"/> + <package name="shadow-utils"/> + <package name="sudo"/> + <package name="symlinks"/> + <package name="systemd-udev"/> + <package name="systemd-resolved"/> + <package name="tar"/> + <package name="tcpdump"/> + <package name="time"/> + <package name="traceroute"/> + <package name="tree"/> + <package name="unzip"/> + <package name="usbutils"/> + <package name="util-linux"/> + <package name="vim-minimal"/> + <package name="wget"/> + <package name="which"/> + <package name="whois"/> + <package name="wsl-setup"/> + <package name="zip"/> + <package name="zram-generator-defaults"/> + </packages> +</image> |