fix(live): Fix SLE 16 build and enable PXE

live/Makefile

@@ -24,7 +24,7 @@ ARCH = $(shell uname -m)
 # files to copy from src/
 COPY_FILES = $(patsubst $(SRCDIR)/%,$(DESTDIR)/%,$(wildcard $(SRCDIR)/*))
 
-all: $(DESTDIR) $(COPY_FILES) $(DESTDIR)/config-cdroot.tar.xz $(DESTDIR)/root.tar.xz $(DESTDIR)/root-openSUSE-PXE.tar.xz
+all: $(DESTDIR) $(COPY_FILES) $(DESTDIR)/config-cdroot.tar.xz $(DESTDIR)/root.tar.xz $(DESTDIR)/root-PXE.tar.xz
 
 # clean the destination directory (but keep the .osc directory if it is present)
 clean:

live/README.md

@@ -36,8 +36,8 @@ This directory contains a set of files that are used to build the Agama Live ISO
 - [src](src) subdirectory contains all source files which are copied unmodified to the OBS project
 - [root](root) subdirectory contains files which are added to the Live ISO root system (inside the
   squashfs image)
-- [root-openSUSE-PXE](root-openSUSE-PXE) subdirectory contains specific files for the openSUSE image used for the
-  PXE boot, see a separate [PXE documentation](PXE.md) for more details about the PXE boot
+- [root-PXE](root-PXE) subdirectory contains specific files for the image used for the PXE boot, see
+  a separate [PXE documentation](PXE.md) for more details about the PXE boot
 - [config-cdroot](config-cdroot) subdirectory contains file which are copied to the uncompressed
   root of the ISO image, the files can be accessed just by mounting the ISO file or the DVD medium
 

live/src/agama-installer.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb 18 13:14:30 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Rename kiwi profiles to avoid using dashes, using underscores
+  instead (gh#agama-project/agama#2014).
+- Enable PXE support for SLE 16 distributions.
+- Add Agama CLI Bash completion support.
+
 -------------------------------------------------------------------
 Tue Feb 18 11:10:22 UTC 2025 - Ladislav Slezák <lslezak@suse.com>
 

live/src/agama-installer.kiwi

@@ -11,12 +11,13 @@
     <profiles>
         <!-- use at most 16 characters for the profile name, it is used in the ISO Volume ID -->
         <!-- which is limited to max. 32 characters -->
-        <profile name="Leap-16.0" description="openSUSE Leap image" import="true" />
+        <profile name="Leap_16.0" description="openSUSE Leap image" import="true" />
         <profile name="openSUSE" description="openSUSE multiproduct image" import="true" />
         <!-- TODO: add SPx in the future -->
-        <profile name="SUSE-SLE-16" description="SLE-based image" import="true" />
-        <profile name="openSUSE-PXE" description="openSUSE OEM image for remote installation" import="true" />
-        <profile name="Leap-16.0-PXE" description="openSUSE Leap OEM image for remote installation" import="true" />
+        <profile name="SUSE_SLE_16" description="SLE-based image" import="true" />
+        <profile name="SUSE_SLE_16_PXE" description="SLE OEM image for remote installation" import="true" />
+        <profile name="openSUSE_PXE" description="openSUSE OEM image for remote installation" import="true" />
+        <profile name="Leap_16.0_PXE" description="openSUSE Leap OEM image for remote installation" import="true" />
     </profiles>
     <preferences>
         <version>11.0.0</version>
@@ -30,22 +31,22 @@
         <bootloader-theme>openSUSE</bootloader-theme>
     </preferences>
     <!-- the ISO Volume ID is set by the fix_bootconfig script -->
-    <preferences arch="ppc64le" profiles="openSUSE,SUSE-SLE-16,Leap-16.0">
-        <type image="iso" flags="dmsquash"  firmware="ofw" mediacheck="true" publisher="SUSE LLC" editbootconfig="fix_bootconfig">
+    <preferences arch="ppc64le" profiles="openSUSE,SUSE_SLE_16,Leap_16.0">
+        <type image="iso" flags="dmsquash"  firmware="ofw" mediacheck="true" editbootconfig="fix_bootconfig">
             <bootloader name="grub2" console="serial" timeout="10"/>
         </type>
     </preferences>
-    <preferences arch="aarch64,x86_64" profiles="openSUSE,SUSE-SLE-16,Leap-16.0">
-        <type image="iso" flags="dmsquash" firmware="uefi" mediacheck="true" publisher="SUSE LLC" editbootconfig="fix_bootconfig">
+    <preferences arch="aarch64,x86_64" profiles="openSUSE,SUSE_SLE_16,Leap_16.0">
+        <type image="iso" flags="dmsquash" firmware="uefi" mediacheck="true" editbootconfig="fix_bootconfig">
             <bootloader name="grub2" timeout="10"/>
         </type>
     </preferences>
-    <preferences arch="s390x" profiles="openSUSE,SUSE-SLE-16,Leap-16.0">
-        <type image="iso" flags="dmsquash" mediacheck="true" publisher="SUSE LLC" editbootconfig="fix_bootconfig">
+    <preferences arch="s390x" profiles="openSUSE,SUSE_SLE_16,Leap_16.0">
+        <type image="iso" flags="dmsquash" mediacheck="true" editbootconfig="fix_bootconfig">
             <bootloader name="custom" />
         </type>
     </preferences>
-    <preferences arch="ppc64le" profiles="openSUSE-PXE,Leap-16.0-PXE">
+    <preferences arch="ppc64le" profiles="openSUSE_PXE,Leap_16.0_PXE,SUSE_SLE_16_PXE">
         <!-- For some reason the compression results on ppc64le are not as good as on the other archs -->
         <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="ofw" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=3174400">
             <bootloader name="grub2" console="serial" timeout="1"/>
@@ -59,7 +60,7 @@
             <size unit="M">3000</size>
         </type>
     </preferences>
-    <preferences arch="s390x" profiles="openSUSE-PXE,Leap-16.0-PXE">
+    <preferences arch="s390x" profiles="openSUSE_PXE,Leap_16.0_PXE,SUSE_SLE_16_PXE">
         <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152">
             <bootloader name="custom"/>
             <oemconfig>
@@ -72,7 +73,7 @@
             <size unit="M">1900</size>
         </type>
     </preferences>
-    <preferences arch="aarch64,x86_64" profiles="openSUSE-PXE,Leap-16.0-PXE">
+    <preferences arch="aarch64,x86_64" profiles="openSUSE_PXE,Leap_16.0_PXE,SUSE_SLE_16_PXE">
         <type image="oem" filesystem="btrfs" fsmountoptions="compress=zstd:15" firmware="uefi" installiso="true" installpxe="true" installboot="install" kernelcmdline="rd.kiwi.ramdisk ramdisk_size=2097152">
             <bootloader name="grub2" timeout="1"/>
             <oemconfig>
@@ -92,10 +93,10 @@
     <repository type="rpm-md">
         <source path="obsrepositories:/"/>
     </repository>
-    <packages type="image" profiles="openSUSE-PXE,Leap-16.0-PXE">
+    <packages type="image" profiles="openSUSE_PXE,Leap_16.0_PXE,SUSE_SLE_16_PXE">
         <package name="dracut-kiwi-oem-repart"/>
         <package name="dracut-kiwi-oem-dump"/>
-        <archive name="root-openSUSE-PXE.tar.xz"/>
+        <archive name="root-PXE.tar.xz"/>
     </packages>
     <packages type="image">
         <package name="avahi"/>
@@ -145,6 +146,7 @@
         <package name="agama-yast"/>
         <package name="agama-web-ui"/>
         <package name="agama-cli"/>
+        <package name="agama-cli-bash-completion"/>
         <package name="agama-auto"/>
         <package name="agama-integration-tests"/>
         <package name="rubygem(agama-yast)"/>
@@ -166,7 +168,7 @@
         <archive name="root.tar.xz"/>
     </packages>
     <!-- additional packages for the Leap distributions -->
-    <packages type="image" profiles="Leap-16.0,Leap-16.0-PXE">
+    <packages type="image" profiles="Leap_16.0,Leap_16.0_PXE">
         <package name="agama-products-opensuse"/>
         <package name="grub2-branding-openSUSE" arch="aarch64,x86_64"/>
         <package name="openSUSE-repos-Leap"/>
@@ -176,7 +178,7 @@
         <package name="MozillaFirefox-branding-openSUSE"/>
     </packages>
     <!-- additional packages for the openSUSE distributions -->
-    <packages type="image" profiles="openSUSE,openSUSE-PXE">
+    <packages type="image" profiles="openSUSE,openSUSE_PXE">
         <package name="agama-products-opensuse"/>
         <package name="grub2-branding-openSUSE" arch="aarch64,x86_64"/>
         <package name="openSUSE-repos-Tumbleweed"/>
@@ -186,7 +188,7 @@
         <package name="MozillaFirefox-branding-openSUSE"/>
     </packages>
     <!-- additional packages for the SLE distributions -->
-    <packages type="image" profiles="SUSE-SLE-16">
+    <packages type="image" profiles="SUSE_SLE_16,SUSE_SLE_16_PXE">
         <package name="agama-products-sle"/>
         <package name="grub2-branding-SLE" arch="aarch64,x86_64"/>
         <package name="patterns-sles-base"/>
@@ -201,14 +203,14 @@
         <package name="ca-certificates"/>
         <package name="ca-certificates-mozilla"/>
     </packages>
-    <packages type="bootstrap" profiles="Leap-16.0,Leap-16.0-PXE">
+    <packages type="bootstrap" profiles="Leap_16.0,Leap_16.0_PXE">
         <package name="Leap-release"/>
     </packages>
-    <packages type="bootstrap" profiles="openSUSE,openSUSE-PXE">
+    <packages type="bootstrap" profiles="openSUSE,openSUSE_PXE">
         <package name="openSUSE-release"/>
         <package name="openSUSE-release-ftp"/>
     </packages>
-    <packages type="bootstrap" profiles="SUSE-SLE-16">
+    <packages type="bootstrap" profiles="SUSE_SLE_16,SUSE_SLE_16_PXE">
         <package name="SLES-release"/>
     </packages>
 </image>

live/src/config.sh

@@ -76,7 +76,8 @@ systemctl disable YaST2-Second-Stage.service
 ### setup dracut for live system
 arch=$(uname -m)
 # keep in sync with ISO Volume ID set in the fix_bootconfig script
-label="Install-$kiwi_profiles-$arch"
+profile=$(echo "$kiwi_profiles" | tr "_" "-")
+label="Install-$profile-$arch"
 
 echo "Setting default live root: live:LABEL=$label"
 mkdir /etc/cmdline.d

live/src/fix_bootconfig

@@ -55,8 +55,9 @@ for i in "\$@" ; do
   fi
 done
 
+profile=$(echo "$kiwi_profiles" | tr "_" "-")
 # keep in sync with ISO Volume ID set in the config.sh script
-volid="Install-$kiwi_profiles-$arch"
+volid="Install-\$profile-$arch"
 
 [ -x $bootfix ] && $bootfix $dst
 rm -f $dst/fix_bootconfig.* $dst/.profile