Compare commits
20 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
848b29bfaf | ||
|
aa89e5e004 | ||
|
00cafda86f | ||
|
9d578c30b5 | ||
|
e4481149f4 | ||
|
72083f7ba0 | ||
|
3668bfa9c6 | ||
|
7316ac278f | ||
|
5c131992d0 | ||
|
cf376d1721 | ||
|
875d1c3dd1 | ||
|
34aafd9f09 | ||
|
571f7e79d4 | ||
|
436e9d6e48 | ||
|
64e5cf610e | ||
|
64b3ca0b20 | ||
|
08243564f3 | ||
|
319e5e8153 | ||
|
92b028992c | ||
|
ac559c73fd |
@ -3,13 +3,11 @@
|
||||
<profile name="DesktopCommon" description="Common desktop packages"/>
|
||||
</profiles>
|
||||
<packages type="image" patternType="plusRecommended" profiles="DesktopCommon">
|
||||
<namedCollection name="internet-browser"/>
|
||||
<namedCollection name="fonts"/>
|
||||
<namedCollection name="multimedia"/>
|
||||
<namedCollection name="networkmanager-submodules"/>
|
||||
<namedCollection name="office-suite"/>
|
||||
<namedCollection name="hardware-support"/>
|
||||
<namedCollection name="print-client"/>
|
||||
<namedCollection name="printing"/>
|
||||
<namedCollection name="guest-desktop-agents"/>
|
||||
<namedCollection name="standard"/>
|
||||
<ignore name="gfs2-utils"/>
|
||||
|
@ -11,6 +11,10 @@
|
||||
<namedCollection name="kde-apps"/>
|
||||
<namedCollection name="kde-media"/>
|
||||
<namedCollection name="kde-spin-initial-setup"/>
|
||||
<namedCollection name="firefox"/>
|
||||
<namedCollection name="libreoffice"/>
|
||||
<package name="libreoffice-draw"/>
|
||||
<package name="libreoffice-math"/>
|
||||
<package name="fuse"/>
|
||||
<package name="kde-l10n"/>
|
||||
<ignore name="@admin-tools"/>
|
||||
|
@ -147,6 +147,13 @@ EOKEYS
|
||||
chmod 600 ~vagrant/.ssh/authorized_keys
|
||||
chown -R vagrant:vagrant ~vagrant/.ssh/
|
||||
|
||||
cat > /etc/sudoers.d/vagrant << EOSUDOER
|
||||
## Ensure the vagrant user always can use sudo
|
||||
Defaults:vagrant !requiretty
|
||||
vagrant ALL=(ALL) NOPASSWD: ALL
|
||||
EOSUDOER
|
||||
chmod 600 /etc/sudoers.d/vagrant
|
||||
|
||||
cat > /etc/ssh/sshd_config.d/10-vagrant-insecure-rsa-key.conf <<EOF
|
||||
# For now the vagrant insecure key is an rsa key
|
||||
# https://github.com/hashicorp/vagrant/issues/11783
|
||||
|
@ -31,7 +31,7 @@
|
||||
<preferences profiles="Cloud-Base-Azure" arch="x86_64,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 net.ifnames=0 console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0"
|
||||
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0"
|
||||
devicepersistency="by-uuid"
|
||||
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
|
||||
rootfs_label="fedora"
|
||||
@ -51,7 +51,27 @@
|
||||
<preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,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=ttyS0,115200n8"
|
||||
devicepersistency="by-uuid"
|
||||
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
|
||||
rootfs_label="fedora"
|
||||
>
|
||||
<bootloader name="grub2" timeout="0"/>
|
||||
<size unit="G">5</size>
|
||||
<systemdisk>
|
||||
<volume name="@root=root"/>
|
||||
<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,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 console=ttyS0,38400n8d"
|
||||
devicepersistency="by-uuid"
|
||||
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
|
||||
rootfs_label="fedora"
|
||||
@ -69,35 +89,15 @@
|
||||
</oemconfig>
|
||||
</type>
|
||||
</preferences>
|
||||
<preferences profiles="Cloud-Base-GCE" arch="x86_64,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"
|
||||
devicepersistency="by-uuid"
|
||||
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
|
||||
rootfs_label="fedora"
|
||||
>
|
||||
<bootloader name="grub2" timeout="0"/>
|
||||
<size unit="G">5</size>
|
||||
<systemdisk>
|
||||
<volume name="@root=root"/>
|
||||
<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,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=ttyS0,115200n8"
|
||||
devicepersistency="by-uuid"
|
||||
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" efipartsize="100" firmware="uefi"
|
||||
rootfs_label="fedora"
|
||||
>
|
||||
<bootloader name="grub2" timeout="0"/>
|
||||
<bootloader name="grub2" console="serial" timeout="0"/>
|
||||
<size unit="G">5</size>
|
||||
<systemdisk>
|
||||
<volume name="@root=root"/>
|
||||
@ -112,12 +112,12 @@
|
||||
<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"
|
||||
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8"
|
||||
devicepersistency="by-uuid" target_blocksize="4096"
|
||||
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4" firmware="ofw"
|
||||
rootfs_label="fedora"
|
||||
>
|
||||
<bootloader name="grub2" timeout="0"/>
|
||||
<bootloader name="grub2" console="serial" timeout="0"/>
|
||||
<size unit="G">5</size>
|
||||
<systemdisk>
|
||||
<volume name="@root=root"/>
|
||||
@ -132,7 +132,7 @@
|
||||
<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 net.ifnames=0 console=tty1 console=ttyS0,115200n8 dasd_mod.dasd=ipldev"
|
||||
kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 dasd_mod.dasd=ipldev"
|
||||
devicepersistency="by-uuid" target_blocksize="4096"
|
||||
bootpartition="true" bootpartsize="1000" bootfilesystem="ext4"
|
||||
rootfs_label="fedora"
|
||||
@ -178,6 +178,7 @@
|
||||
<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"/>
|
||||
@ -190,6 +191,7 @@
|
||||
<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"/>
|
||||
|
@ -22,10 +22,12 @@
|
||||
<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.name" value="fedora"/>
|
||||
<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="name" value="fedora"/>
|
||||
<label name="version" value="rawhide"/>
|
||||
</labels>
|
||||
</containerconfig>
|
||||
@ -47,10 +49,12 @@
|
||||
<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.name" value="fedora-minimal"/>
|
||||
<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="name" value="fedora-minimal"/>
|
||||
<label name="version" value="rawhide"/>
|
||||
</labels>
|
||||
</containerconfig>
|
||||
@ -72,11 +76,13 @@
|
||||
<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.name" value="fedora-toolbox"/>
|
||||
<label name="org.opencontainers.image.version" value="rawhide"/>
|
||||
<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="name" value="fedora-toolbox"/>
|
||||
<label name="version" value="rawhide"/>
|
||||
</labels>
|
||||
</containerconfig>
|
||||
@ -104,12 +110,12 @@
|
||||
<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="util-linux-core"/>
|
||||
</packages>
|
||||
<packages type="bootstrap" profiles="Container-Base-Generic-Minimal">
|
||||
<ignore name="glibc-langpack-en"/>
|
||||
@ -121,6 +127,9 @@
|
||||
<packages type="bootstrap" profiles="Container-Base-Generic">
|
||||
<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"/>
|
||||
@ -128,6 +137,8 @@
|
||||
<package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 -->
|
||||
<package name="glibc-minimal-langpack"/>
|
||||
<package name="tzdata"/>
|
||||
<package name="xz"/>
|
||||
<package name="zstd"/>
|
||||
</packages>
|
||||
<packages type="bootstrap" patternType="plusRecommended" profiles="Container-Toolbox">
|
||||
<ignore name="dosfstools"/>
|
||||
@ -154,6 +165,7 @@
|
||||
<package name="bzip2"/>
|
||||
<package name="coreutils"/>
|
||||
<package name="coreutils-common"/>
|
||||
<package name="cpio"/>
|
||||
<package name="curl"/>
|
||||
<package name="default-editor"/>
|
||||
<package name="diffutils"/>
|
||||
@ -161,6 +173,7 @@
|
||||
<package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 -->
|
||||
<package name="dnf-plugins-core"/>
|
||||
<package name="fedora-release-toolbx"/>
|
||||
<package name="file"/>
|
||||
<package name="findutils"/>
|
||||
<package name="flatpak-spawn"/>
|
||||
<package name="fpaste"/>
|
||||
@ -178,6 +191,7 @@
|
||||
<package name="kbd-misc"/>
|
||||
<package name="keyutils"/>
|
||||
<package name="krb5-libs"/>
|
||||
<package name="langpacks-en"/>
|
||||
<package name="less"/>
|
||||
<package name="libcap"/>
|
||||
<package name="lsof"/>
|
||||
@ -192,7 +206,6 @@
|
||||
<package name="openssl"/>
|
||||
<package name="p11-kit"/>
|
||||
<package name="pam"/>
|
||||
<package name="passwd"/>
|
||||
<package name="pigz"/>
|
||||
<package name="procps-ng"/>
|
||||
<package name="psmisc"/>
|
||||
@ -211,7 +224,6 @@
|
||||
<package name="tzdata"/>
|
||||
<package name="unzip"/>
|
||||
<package name="util-linux"/>
|
||||
<package name="util-linux-core"/>
|
||||
<package name="vim-minimal"/>
|
||||
<package name="vte-profile"/>
|
||||
<package name="vulkan-loader"/>
|
||||
@ -224,7 +236,7 @@
|
||||
<package name="zip"/>
|
||||
</packages>
|
||||
<packages type="uninstall" profiles="Container-Toolbox">
|
||||
<package name="kbd-misc"/>
|
||||
<package name="dracut"/>
|
||||
<package name="pinentry"/>
|
||||
<package name="systemd-resolved"/>
|
||||
<package name="xkeyboard-config"/>
|
||||
|
@ -13,7 +13,7 @@
|
||||
<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"
|
||||
rootfs_label="fedora"
|
||||
@ -34,7 +34,7 @@
|
||||
<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"
|
||||
rootfs_label="fedora"
|
||||
|
@ -3,8 +3,8 @@ echo "###" "$0" "$@"
|
||||
|
||||
# set arch-specific variables
|
||||
case "$(uname -m)" in
|
||||
aarch64) arch="aa64"; ARCH="AA64"; uuid="b921b045-1df0-41c3-af44-4c6f280d3fae";;
|
||||
x86_64) arch="x64"; ARCH="X64"; uuid="4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709";;
|
||||
aarch64) arch="aa64"; ARCH="AA64";;
|
||||
x86_64) arch="x64"; ARCH="X64";;
|
||||
esac
|
||||
|
||||
# figure where shim.efi and BOOT.CSV are located
|
||||
@ -25,15 +25,6 @@ for uki in lib/modules/*/vmlinuz*.efi; do
|
||||
| iconv -f utf-8 -t ucs-2le >> "$csv"
|
||||
done
|
||||
|
||||
# kiwi doesn't setup discoverable partitions, so fixup after the fact
|
||||
# here. The UKI depends on that to find the root filesystem.
|
||||
# * The image is loop-mounted.
|
||||
# - partition #1 is biosboot (can this be disabled?).
|
||||
# - partition #2 is the EFI ESP.
|
||||
# - partition #3 is the root filesystem (this needs fixup).
|
||||
echo "# hack: rootfs: $uuid"
|
||||
sfdisk --part-type /dev/loop0 3 "$uuid"
|
||||
|
||||
# bz2240989: shim has a hard dependency on grub. grub has a hard
|
||||
# dependency on dracut. Ideally we would simply not install
|
||||
# grub+dracut, but given we can't until the shim bug is fixed disable
|
||||
|
Loading…
x
Reference in New Issue
Block a user