Kiwi recipe slightly behind upstream JeOS template

FroggyFlox commented 3 years ago

The upstream kiwi templates for various versions of JeOS Leap have now seen several small updates that might deserve some attention to see whether these should be merged (in an attempt to follow upstream as much as possible). In particular, several of these changes target the Raspberry Pi4 profile, as mentioned in https://github.com/rockstor/rockstor-installer/pull/48#issuecomment-828590660

@phillxnet, I am using the following Leap 15.3 JeOS kiwi template as reference (as this one seems to be the upstream repo for their appliances images, if I'm correct): https://build.opensuse.org/package/show/openSUSE:Leap:15.3/kiwi-templates-JeOS

Changes would include updates to:

kiwi recipe itself (rockstor.kiwi)
config.sh

@phillxnet, before discussing the changes themselves, I wanted to make sure we were on the same page with regards to which repo to use as reference. Even thought they don't really differ in their contents, it seems important to cautiously choose our "reference" to track so that we stay coherent. The Leap 15.3 JeOS template above includes profiles for all the openSUSE "appliance types" and is the upstream repo (apparently) so it seems like a good choice.

phillxnet commented 3 years ago

@FroggyFlox Thanks for watching these upstream changes and creating this issue.

Re:

it seems important to cautiously choose our "reference" to track so that we stay coherent. The Leap 15.3 JeOS template ... is the upstream repo (apparently) so it seems like a good choice.

Agreed. We then skate to where the puck is going as it were. Would be great if we don't break our Leap 15.2 profiles of course, but that should be a fairly obvious failure.

FroggyFlox commented 1 year ago

A few potentially important updates were made in the JeOS kiwi templates for Leap 15.4: https://build.opensuse.org/package/revisions/openSUSE:Leap:15.4/kiwi-templates-JeOS

It may be worth investigating these; just noting for reference.

phillxnet commented 1 year ago

@FroggyFlox Of the linked indicated changes we have already removed the now redundant:

suseConfig (from config.sh)
We don't yet have a echo " reset machine settings"** in config.sh, not sure if this is actually needed by our target images.
[ ] "Add rw to the default boot options to fix /etc/machine-id setup" we do have differing "kernelcmdline=..." entries for our profiles.

Typically we have:

ARM64EFI

kernelcmdline="plymouth.enable=0 rd.kiwi.oem.maxdisk=5000G earlycon"

RaspberryPi4

kernelcmdline="plymouth.enable=0 rd.kiwi.oem.maxdisk=5000G console=ttyS0,115200 console=tty"

x86_64 (generic)

kernelcmdline="nomodeset plymouth.enable=0 rd.kiwi.oem.maxdisk=5000G"

and in the upstream for 15.4 JeOS images we now see:

kernelcmdline="rw systemd.show_status=1 console=ttyS0,115200 console=tty0 quiet"

However their profiles are as follows:

<profiles>
    <profile name="kvm-and-xen" description="JeOS for KVM and Xen" arch="x86_64"/>
    <profile name="kvm" description="JeOS for KVM" arch="aarch64"/>
    <profile name="VMware" description="JeOS for VMware" arch="x86_64"/>
    <profile name="MS-HyperV" description="JeOS for Hyper-V" arch="x86_64"/>
    <profile name="OpenStack-Cloud" description="JeOS for OpenStack Cloud" arch="x86_64"/>
    <profile name="RaspberryPi" description="JeOS for the Raspberry Pi" arch="aarch64"/>
</profiles>

Which except for the Pi profile are all VM based. Where-as ours are all exclusively aimed at real-hardware.

Noting after a quick look into the changes linked by @FroggyFlox .

rockstor / rockstor-installer