pool/openSUSE-MicroOS
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: pool:devel
Branches Tags
pool:devel
pool:factory
rpm:factory
rpm:devel
...
pull from: rpm:devel
Branches Tags
rpm:factory
rpm:devel
pool:devel
pool:factory

No commits in common. "devel" and "devel" have entirely different histories.
devel ... devel

4 changed files with 8 additions and 64 deletions
Show Stats Expand all files Collapse all files

11
config.sh
View File

@ -242,7 +242,6 @@ fi
# Configure Vagrant specifics
#--------------------------------------
if [[ "$kiwi_profiles" == *"Vagrant"* ]]; then
echo "Add user vagrant"
# create vagrant user
useradd vagrant
# allow password-less sudo
@ -255,10 +254,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7
EOF
chmod 0600 /home/vagrant/.ssh/authorized_keys
chown -R vagrant /home/vagrant
echo "Disable jeos-firstboot.service for Vagrant boxes"
systemctl disable jeos-firstboot.service
systemctl mask jeos-firstboot.service
fi
#======================================
@ -270,7 +265,7 @@ if rpm -q sdbootutil; then
test -d "$d" || continue
depmod -a "${d##*/}"
done
ENTRY_TOKEN=$(. /usr/lib/os-release; echo "$ID")
ENTRY_TOKEN=$(. /usr/lib/os-release; echo $ID)
mkdir -p /etc/kernel
echo "$ENTRY_TOKEN" > /etc/kernel/entry-token
# FIXME: kiwi needs /boot/efi to exist before syncing the disk image
@ -278,5 +273,7 @@ if rpm -q sdbootutil; then
echo "${cmdline[*]}" > /etc/kernel/cmdline
[ -e /var/lib/YaST2/reconfig_system ] && systemctl enable sdbootutil-enroll.service
rpm -q systemd-boot && loader_type="systemd-boot"
rpm -q grub2 && loader_type="grub2-bls"
echo "LOADER_TYPE=\"${loader_type}\"" >> /etc/sysconfig/bootloader
fi

10
disk.sh
View File

@ -6,6 +6,8 @@ echo "####### BOOTLOADER INSTALL (disk.sh)"
# [[ "$kiwi_profiles" == *"kvm-and-xen-"* ]]
if rpm -q sdbootutil; then
rootuuid=$(findmnt / -n --output uuid)
sed -i -e "s,\$, root=UUID=$rootuuid," /etc/kernel/cmdline
arch="$(uname -m)"
case "$arch" in
aarch64) arch=aa64 ;;
@ -14,15 +16,7 @@ if rpm -q sdbootutil; then
esac
echo "install boot loader"
loader_type="grub2-bls"
rpm -q systemd-boot && loader_type="systemd-boot"
if [ -f /etc/sysconfig/bootloader ]; then
sed -i "s/^LOADER_TYPE=.*$/LOADER_TYPE=\"$loader_type\"/g" /etc/sysconfig/bootloader
else
echo "LOADER_TYPE=\"${loader_type}\"" > /etc/sysconfig/bootloader
fi
sdbootutil -v --no-random-seed --arch "$arch" --esp-path /boot/efi --entry-token=auto --no-variables install
echo "add kernels"
export hostonly_l=no # for dracut
sdbootutil -v --arch "$arch" --esp-path /boot/efi --entry-token=auto add-all-kernels

42
openSUSE-MicroOS.changes
View File

@ -1,50 +1,8 @@
-------------------------------------------------------------------
Tue Nov 12 12:25:21 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com>
- Use the enrollment packages from sdbootutil
-------------------------------------------------------------------
Sat Nov 2 10:54:27 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
- disable and mask the jeos-firstboot.service on Vagrant boxes
-------------------------------------------------------------------
Wed Oct 9 09:15:28 UTC 2024 - Stefan Schubert <schubi@suse.com>
- Added package systemd-repart-dracut to kvm-and-xen-sdboot and
kvm-and-xen-grub-bls
-------------------------------------------------------------------
Thu Oct 3 09:42:47 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com>
- Move /etc/sysconfig/bootloader creation to disk.sh, as KIWI can
replace the one generated in config.sh (bsc#1231271)
-------------------------------------------------------------------
Tue Oct 1 16:07:08 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com>
- Requires systemd-boot in the sdboot flavor
-------------------------------------------------------------------
Thu Sep 5 13:55:46 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com>
- Remove root from /etc/kernel/cmdline during image creation
-------------------------------------------------------------------
Tue Aug 27 11:48:44 UTC 2024 - Guillaume GARDET <guillaume.gardet@opensuse.org>
- Grub package is grub2-arm64-efi, not grub2-arm-efi
-------------------------------------------------------------------
Tue Aug 13 13:53:32 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com>
- Use the new grub2-bls subpackage
-------------------------------------------------------------------
Fri Aug 9 08:45:16 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com>
- Enable disk-encryption-tool-enroll.service
-------------------------------------------------------------------
Wed Jul 31 13:38:18 UTC 2024 - Alberto Planas Dominguez <aplanas@suse.com>

9
openSUSE-MicroOS.kiwi
View File

@ -732,23 +732,18 @@
<package name="jeos-firstboot"/>
<package name="growpart-generator"/>
<package name="sdbootutil-snapper"/>
<package name="sdbootutil-jeos-firstboot-enroll"/>
<package name="disk-encryption-tool"/>
<package name="systemd-repart-dracut"/>
<package name="dracut-pcr-signature"/>
<package name="systemd-experimental"/>
<package name="shim"/>
<package name="efibootmgr"/>
<package name="uefi_mbr" arch="x86_64"/>
</packages>
<packages type="image" profiles="kvm-and-xen-sdboot">
<package name="systemd-boot"/>
</packages>
<packages type="image" profiles="kvm-and-xen-grub-bls">
<package name="patterns-base-bootloader"/>
<package name="uefi_mbr" arch="x86_64"/>
<package name="grub2-x86_64-efi-bls" arch="x86_64"/>
<package name="grub2-arm64-efi-bls" arch="aarch64"/>
<package name="grub2-x86_64-efi" arch="x86_64"/>
<package name="grub2-arm64-efi" arch="aarch64"/>
</packages>
<packages type="image" profiles="Pine64,RaspberryPi,RaspberryPi2,Rock64">
<package name="patterns-microos-hardware"/>