Hello community,
here is the log from the commit of package openSUSE-MicroOS for
openSUSE:Factory checked in at 2019-11-04 16:57:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-MicroOS"
Mon Nov 4 16:57:23 2019 rev:8 rq:745221 version:16.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-MicroOS/openSUSE-MicroOS.changes
2019-11-04 10:21:37.965790820 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.2990/openSUSE-MicroOS.changes
2019-11-04 16:57:26.683685381 +0100
@@ -2,7 +1,0 @@
-Mon Nov 4 09:19:06 UTC 2019 - Fabian Vogt <[email protected]>
-
-- New kiwi uses grub2-mkconfig now, so drop the hack in replacebootconfig.sh
- and editbootinstall_*.sh
-- Now the kernel cmdline can be escaped properly as well
-
--------------------------------------------------------------------
New:
----
replacebootconfig.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-MicroOS.kiwi ++++++
--- /var/tmp/diff_new_pack.BqYaUR/_old 2019-11-04 16:57:27.415686165 +0100
+++ /var/tmp/diff_new_pack.BqYaUR/_new 2019-11-04 16:57:27.415686165 +0100
@@ -100,13 +100,14 @@
bootloader="grub2"
bootloader_console="gfxterm"
firmware="uefi"
- kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
net.ifnames=0 \$ignition_firstboot ignition.platform.id=qemu"
+ kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
net.ifnames=0 $ignition_firstboot ignition.platform.id=qemu"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
btrfs_quota_groups="false"
+ editbootinstall="replacebootconfig.sh"
>
<systemdisk>
<volume name="home"/>
@@ -136,13 +137,14 @@
bootloader="grub2"
bootloader_console="gfxterm"
firmware="uefi"
- kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
\$ignition_firstboot ignition.platform.id=vmware"
+ kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
$ignition_firstboot ignition.platform.id=vmware"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
btrfs_quota_groups="false"
+ editbootinstall="replacebootconfig.sh"
>
<systemdisk>
<volume name="home"/>
@@ -173,13 +175,14 @@
bootloader="grub2"
bootloader_console="gfxterm"
firmware="uefi"
- kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
net.ifnames=0 \$ignition_firstboot ignition.platform.id=openstack"
+ kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
net.ifnames=0 $ignition_firstboot ignition.platform.id=openstack"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
btrfs_quota_groups="false"
+ editbootinstall="replacebootconfig.sh"
>
<systemdisk>
<volume name="home"/>
@@ -210,13 +213,14 @@
bootloader="grub2"
bootloader_console="gfxterm"
firmware="uefi"
- kernelcmdline="plymouth.enable=0 rootdelay=300
console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200 \$ignition_firstboot
ignition.platform.id=metal"
+ kernelcmdline="plymouth.enable=0 rootdelay=300
console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200 $ignition_firstboot
ignition.platform.id=metal"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
btrfs_quota_groups="false"
+ editbootinstall="replacebootconfig.sh"
>
<systemdisk>
<volume name="home"/>
@@ -247,7 +251,7 @@
fsmountoptions="noatime,compress=lzo"
bootloader="grub2"
firmware="efi"
- kernelcmdline="loglevel=3 splash=silent plymouth.enable=0
console=ttyS0,115200n8 \$ignition_firstboot ignition.platform.id=metal"
+ kernelcmdline="loglevel=3 splash=silent plymouth.enable=0
console=ttyS0,115200n8 $ignition_firstboot ignition.platform.id=metal"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
@@ -283,7 +287,7 @@
bootloader="grub2"
bootloader_console="gfxterm"
firmware="efi"
- kernelcmdline="plymouth.enable=0 swiotlb=512 cma=64M
console=ttyS0,115200n8 console=tty \$ignition_firstboot
ignition.platform.id=metal"
+ kernelcmdline="plymouth.enable=0 swiotlb=512 cma=64M
console=ttyS0,115200n8 console=tty $ignition_firstboot
ignition.platform.id=metal"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
@@ -319,7 +323,7 @@
bootloader="grub2"
bootloader_console="gfxterm"
firmware="efi"
- kernelcmdline="plymouth.enable=0 swiotlb=512 cma=64M
console=ttyS0,115200n8 console=tty \$ignition_firstboot
ignition.platform.id=metal"
+ kernelcmdline="plymouth.enable=0 swiotlb=512 cma=64M
console=ttyS0,115200n8 console=tty $ignition_firstboot
ignition.platform.id=metal"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
@@ -354,13 +358,14 @@
bootloader="grub2"
bootloader_console="gfxterm"
firmware="uefi"
- kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
net.ifnames=0 \$ignition_firstboot ignition.platform.id=metal"
+ kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
net.ifnames=0 $ignition_firstboot ignition.platform.id=metal"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
btrfs_quota_groups="false"
+ editbootinstall="replacebootconfig.sh"
>
<systemdisk>
<volume name="home"/>
@@ -391,13 +396,14 @@
bootloader="grub2"
bootloader_console="gfxterm"
firmware="uefi"
- kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
\$ignition_firstboot ignition.platform.id=metal"
+ kernelcmdline="plymouth.enable=0 console=ttyS0,115200 console=tty0
$ignition_firstboot ignition.platform.id=metal"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
btrfs_root_is_snapshot="true"
btrfs_root_is_readonly_snapshot="true"
btrfs_quota_groups="false"
+ editbootinstall="replacebootconfig.sh"
>
<systemdisk>
<volume name="home"/>
++++++ editbootinstall_pine64.sh ++++++
--- /var/tmp/diff_new_pack.BqYaUR/_old 2019-11-04 16:57:27.555686315 +0100
+++ /var/tmp/diff_new_pack.BqYaUR/_new 2019-11-04 16:57:27.555686315 +0100
@@ -7,6 +7,41 @@
loopname="${devname%*p2}"
loopdev=/dev/${loopname#/dev/mapper/*}
+## Preparation for replacebootconfig.sh
+root=/tmp/kiwi_mount_manager.asdf
+mkdir ${root}
+mount ${devname} ${root}
+for i in proc dev sys; do mount --bind /${i} ${root}/${i}; done
+for i in tmp var boot/writable; do mount -o subvol=@/${i} ${devname}
${root}/${i}; done
+findmnt ||:
+# END
+
+## Same as replacebootconfig.sh
+echo "Recreating the bootloader config"
+
+# This is fragile, but better fail hard than silently
+root="$(echo /tmp/kiwi_mount_manager.*/usr)"
+root=${root%/usr}
+rootdev=$(findmnt -nrvo SOURCE "${root}")
+
+# Needed by the snapper integration
+mount -osubvol=@/.snapshots "${rootdev}" "${root}/.snapshots"
+
+# KIWI does not escape the variable
+sed -i 's/ $ig/ \\$ig/g' "${root}/etc/default/grub"
+
+# Make sure the link exists
+ln -s "${rootdev}" "/dev/disk/by-uuid/$(chroot "${root}" grub2-probe /
--target=fs_uuid)"
+
+chroot "${root}" grub2-mkconfig -o /boot/grub2/grub.cfg
+
+umount "${root}/.snapshots"
+## END Same as replacebootconfig.sh
+
+## Clean up after preparations
+for i in boot/writable proc dev sys tmp var .; do umount ${root}/$i; done
+# END
+
#==========================================
# The GPT spans the first 33 sectors, but we need to write our
# at sector 16. Shrink the GPT to only span 5 sectors
++++++ editbootinstall_rpi.sh ++++++
--- /var/tmp/diff_new_pack.BqYaUR/_old 2019-11-04 16:57:27.579686341 +0100
+++ /var/tmp/diff_new_pack.BqYaUR/_new 2019-11-04 16:57:27.579686341 +0100
@@ -7,6 +7,41 @@
loopname="${devname%*p2}"
loopdev=/dev/${loopname#/dev/mapper/*}
+## Preparation for replacebootconfig.sh
+root=/tmp/kiwi_mount_manager.asdf
+mkdir ${root}
+mount ${devname} ${root}
+for i in proc dev sys; do mount --bind /${i} ${root}/${i}; done
+for i in tmp var boot/writable; do mount -o subvol=@/${i} ${devname}
${root}/${i}; done
+findmnt ||:
+# END
+
+## Same as replacebootconfig.sh
+echo "Recreating the bootloader config"
+
+# This is fragile, but better fail hard than silently
+root="$(echo /tmp/kiwi_mount_manager.*/usr)"
+root=${root%/usr}
+rootdev=$(findmnt -nrvo SOURCE "${root}")
+
+# Needed by the snapper integration
+mount -osubvol=@/.snapshots "${rootdev}" "${root}/.snapshots"
+
+# KIWI does not escape the variable
+sed -i 's/ $ig/ \\$ig/g' "${root}/etc/default/grub"
+
+# Make sure the link exists
+ln -s "${rootdev}" "/dev/disk/by-uuid/$(chroot "${root}" grub2-probe /
--target=fs_uuid)"
+
+chroot "${root}" grub2-mkconfig -o /boot/grub2/grub.cfg
+
+umount "${root}/.snapshots"
+## END Same as replacebootconfig.sh
+
+## Clean up after preparations
+for i in boot/writable proc dev sys tmp var .; do umount ${root}/$i; done
+# END
+
#==========================================
# copy Raspberry Pi firmware to EFI partition
#------------------------------------------
++++++ replacebootconfig.sh ++++++
#!/bin/bash
set -euxo pipefail
# Note: There is a copy of this in editbootinstall_{rpi,pine64}.sh!
echo "Recreating the bootloader config"
# This is fragile, but better fail hard than silently
root="$(echo /tmp/kiwi_mount_manager.*/usr)"
root=${root%/usr}
rootdev=$(findmnt -nrvo SOURCE "${root}")
# Needed by the snapper integration
mount -osubvol=@/.snapshots "${rootdev}" "${root}/.snapshots"
# KIWI does not escape the variable
sed -i 's/ $ig/ \\$ig/g' "${root}/etc/default/grub"
# Make sure the link exists
ln -s "${rootdev}" "/dev/disk/by-uuid/$(chroot "${root}" grub2-probe /
--target=fs_uuid)"
chroot "${root}" grub2-mkconfig -o /boot/grub2/grub.cfg
umount "${root}/.snapshots"
