From 641a3d8fa2b06229024c19aad751192f439c727e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20Sch=C3=A4fer?= <ms@suse.de>
Date: Wed, 1 Apr 2020 14:31:58 +0200
Subject: [PATCH] Make build of filesystem image optional for pxe

Allow to build a kernel/initrd pair without a root
filesystem image. Related to Issue #1388
---
 kiwi/builder/pxe.py  | 48 ++++++++++++++++++++++++++------------------
 kiwi/schema/kiwi.rnc |  2 +-
 kiwi/schema/kiwi.rng |  2 +-
 3 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/kiwi/builder/pxe.py b/kiwi/builder/pxe.py
index 6548ce26..0887f5a8 100644
--- a/kiwi/builder/pxe.py
+++ b/kiwi/builder/pxe.py
@@ -54,9 +54,11 @@ class PxeBuilder:
         self.compressed = xml_state.build_type.get_compressed()
         self.xen_server = xml_state.is_xen_server()
         self.custom_cmdline = xml_state.build_type.get_kernelcmdline()
-        self.filesystem = FileSystemBuilder(
-            xml_state, target_dir, root_dir + '/'
-        )
+        self.filesystem = xml_state.build_type.get_filesystem()
+        if self.filesystem:
+            self.filesystem = FileSystemBuilder(
+                xml_state, target_dir, root_dir + '/'
+            )
         self.system_setup = SystemSetup(
             xml_state=xml_state, root_dir=root_dir
         )
@@ -80,6 +82,7 @@ class PxeBuilder:
                 '-' + xml_state.get_image_version()
             ]
         )
+        self.image = None
         self.append_file = ''.join([self.image_name, '.append'])
         self.archive_name = ''.join([self.image_name, '.tar'])
         self.checksum_name = ''.join([self.image_name, '.md5'])
@@ -105,21 +108,22 @@ class PxeBuilder:
 
         :rtype: instance of :class:`Result`
         """
-        log.info('Creating PXE root filesystem image')
-        self.filesystem.create()
-        os.rename(
-            self.filesystem.filename, self.image_name
-        )
-        self.image = self.image_name
-        if self.compressed:
-            log.info('xz compressing root filesystem image')
-            compress = Compress(self.image)
-            compress.xz(self.xz_options)
-            self.image = compress.compressed_filename
+        if self.filesystem:
+            log.info('Creating PXE root filesystem image')
+            self.filesystem.create()
+            os.rename(
+                self.filesystem.filename, self.image_name
+            )
+            self.image = self.image_name
+            if self.compressed:
+                log.info('xz compressing root filesystem image')
+                compress = Compress(self.image)
+                compress.xz(self.xz_options)
+                self.image = compress.compressed_filename
 
-        log.info('Creating PXE root filesystem MD5 checksum')
-        checksum = Checksum(self.image)
-        checksum.md5(self.checksum_name)
+            log.info('Creating PXE root filesystem MD5 checksum')
+            checksum = Checksum(self.image)
+            checksum.md5(self.checksum_name)
 
         # prepare boot(initrd) root system
         log.info('Creating PXE boot image')
@@ -177,7 +181,8 @@ class PxeBuilder:
 
         # create pxe config append information
         # this information helps to configure the boot server correctly
-        if self.filesystem.root_uuid and self.initrd_system == 'dracut':
+        if self.filesystem and self.filesystem.root_uuid \
+           and self.initrd_system == 'dracut':
             cmdline = 'root=UUID={}'.format(self.filesystem.root_uuid)
             if self.custom_cmdline:
                 cmdline += ' {}'.format(self.custom_cmdline)
@@ -191,11 +196,14 @@ class PxeBuilder:
         pxe_tarball_files = [
             self.kernel_filename,
             os.path.basename(self.boot_image_task.initrd_filename),
-            os.path.basename(self.image),
             os.path.basename(self.checksum_name),
         ]
 
-        if self.filesystem.root_uuid and self.initrd_system == 'dracut':
+        if self.image:
+            pxe_tarball_files.append(os.path.basename(self.image))
+
+        if self.filesystem and self.filesystem.root_uuid \
+           and self.initrd_system == 'dracut':
             pxe_tarball_files.append(os.path.basename(self.append_file))
 
         pxe_tarball = ArchiveTar(
diff --git a/kiwi/schema/kiwi.rnc b/kiwi/schema/kiwi.rnc
index 5741d6cf..7046a429 100644
--- a/kiwi/schema/kiwi.rnc
+++ b/kiwi/schema/kiwi.rnc
@@ -1405,7 +1405,7 @@ div {
         >> sch:pattern [
             id = "filesystem_mandatory" is-a = "image_type_requirement"
             sch:param [ name = "attr" value = "filesystem" ]
-            sch:param [ name = "types" value = "vmx oem pxe" ]
+            sch:param [ name = "types" value = "vmx oem" ]
         ]
 	k.type.squashfscompression.attribute = 
         ## Specifies the compression type for mksquashfs
diff --git a/kiwi/schema/kiwi.rng b/kiwi/schema/kiwi.rng
index 600965e3..91514f0a 100644
--- a/kiwi/schema/kiwi.rng
+++ b/kiwi/schema/kiwi.rng
@@ -2104,7 +2104,7 @@ structure</a:documentation>
       </sch:pattern>
       <sch:pattern id="filesystem_mandatory" is-a="image_type_requirement">
         <sch:param name="attr" value="filesystem"/>
-        <sch:param name="types" value="vmx oem pxe"/>
+        <sch:param name="types" value="vmx oem"/>
       </sch:pattern>
     </define>
     <define name="k.type.squashfscompression.attribute">