Add Ubuntu EMF template (#384)

* Add ubuntu24 EMF template

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>

* Update ubuntu24 server cloud template for EMF
 - Update imagedisc.go to support FAT32 and FAT16 when specified

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>

* Update ubuntu24-server-cloud-amd64.yml

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>

---------

Signed-off-by: Teoh Suh Haw <suh.haw.teoh@intel.com>

Author: elvin03

image-templates/ubuntu24-server-cloud-amd64.yml

@@ -0,0 +1,153 @@
+# Image metadata describing template identity
+# this template attempt to create ubuntu cloud server in qcow2 
+# based on https://cloud-images.ubuntu.com/server/releases/noble/release-20250429/ubuntu-24.04-server-cloudimg-amd64.img
+image:
+  name: ubuntu-server-cloud-amd64
+  version: "24.04"
+
+# Target platform that the image builder should produce
+target:
+  # Provider family
+  os: ubuntu
+  # Distribution release within provider family
+  dist: ubuntu24
+  # CPU architecture for artifacts
+  arch: x86_64
+  # Artifact format expected from build pipeline
+  imageType: raw
+
+# Disk layout and output artifact definition
+disk:
+  # Human friendly name logged by builders
+  name: ubuntu-server-cloud-raw
+  artifacts:
+    # Request conversion to qcow2
+    - type: raw
+      compression: gz
+  size: 3500MiB
+  # GPT partition table per installer spec
+  partitionTableType: gpt
+  partitions:
+    # BIOS boot partition for GRUB compatibility - first partition
+    - id: BIOSBOOT
+      type: bios-boot
+      # GPT type GUID for BIOS boot partition
+      typeUUID: 21686148-6449-6e6f-744e-656564454649
+      fsType: ext2
+      start: 1MiB
+      end: 5MiB
+      flags:
+        - bios_grub
+    # EFI system partition for bootloaders - second partition
+    - id: EFI
+      type: esp
+      # GPT type GUID for EFI system partition
+      typeUUID: c12a7328-f81f-11d2-ba4b-00a0c93ec93b
+      fsType: fat32
+      fsLabel: UEFI
+      start: 5MiB
+      end: 116MiB
+      mountPoint: /boot/efi
+      mountOptions: defaults
+      flags:
+        - boot
+        - esp
+    # Dedicated /boot to host kernels and bootloader assets - third partition
+    - id: BOOT
+      type: linux
+      # GPT GUID for Linux /boot partition
+      typeUUID: bc13c2ff-59e6-4262-a352-b275fd6f7172
+      fsType: ext4
+      fsLabel: BOOT
+      start: 116MiB
+      end: 1073MiB
+      mountPoint: /boot
+      mountOptions: defaults
+      flags: []
+    # Root filesystem - last partition for easy expansion
+    - id: rootfs
+      name: cloudimg-rootfs
+      type: linux-root-amd64
+      # Standard Linux root filesystem GUID for x86_64
+      typeUUID: 4f68bce3-e8cd-4db1-96e7-fbcaf984b709
+      fsType: ext4
+      fsLabel: cloudimg-rootfs
+      start: 1073MiB
+      end: "0"
+      mountPoint: /
+      mountOptions: defaults
+      flags: []
+
+# Host OS configuration applied within the image
+systemConfig:
+  # Name reused by logging and validation output
+  name: ubuntu-server-cloud-amd64
+  # High-level description surfaced in manifests
+  description: server Ubuntu 24.04 cloud image for x86_64
+
+  immutability:
+    enabled: false # default is true, overridden to false here
+    
+  # Bootloader settings; grub following ubuntu defaults
+  bootloader:
+    bootType: efi
+    provider: grub
+  # Packages derived from ubuntu server cloud image
+  packages:
+  - base-files
+  - bash
+  - bsdutils
+  - cloud-init
+  - dash
+  - diffutils
+  - eatmydata
+  - findutils
+  - grep
+  - grub-pc
+  - gzip
+  - hostname
+  - init
+  - libeatmydata1
+  - libwrap0
+  - linux-virtual
+  - login
+  - ncurses-base
+  - ncurses-bin
+  - ncurses-term
+  - openssh-server
+  - openssh-sftp-server
+  - python-babel-localedata
+  - python3-babel
+  - python3-jinja2
+  - python3-json-pointer
+  - python3-jsonpatch
+  - python3-jsonschema
+  - python3-markupsafe
+  - python3-pyrsistent
+  - python3-serial
+  - python3-tz
+  - shim-signed
+  - ssh-import-id
+  - ubuntu-minimal
+  - ubuntu-server
+  - ubuntu-standard
+  - util-linux
+  
+  ## other top level package 
+  - snapd
+  - systemd-resolved
+  
+  ## Packages required by installer.sh (services that must pre-exist)
+  - systemd-timesyncd
+  - rsyslog
+  - ufw
+  - cron
+  - logrotate
+  - unattended-upgrades
+
+  # Kernel metadata used by builder to set cmdline and module hints
+  kernel:
+    version: "6.11"
+    cmdline: "root=LABEL=cloudimg-rootfs ro console=tty1 console=ttyS0"
+    packages:
+      - linux-image-6.11.0-17-generic

internal/config/config.go

@@ -176,6 +176,7 @@ type PartitionInfo struct {
 	Type         string   `yaml:"type"`         // Type: partition type (e.g., "esp", "linux-root-amd64")
 	TypeGUID     string   `yaml:"typeUUID"`     // TypeGUID: GPT type GUID for the partition (e.g., "8300" for Linux filesystem)
 	FsType       string   `yaml:"fsType"`       // FsType: filesystem type (e.g., "ext4", "xfs", etc.);
+	FsLabel      string   `yaml:"fsLabel"`      // FsLabel: filesystem label (e.g., "cloudimg-rootfs")
 	Start        string   `yaml:"start"`        // Start: start offset of the partition; can be a absolute size (e.g., "512MiB")
 	End          string   `yaml:"end"`          // End: end offset of the partition; can be a absolute size (e.g., "2GiB") or "0" for the end of the disk
 	MountPoint   string   `yaml:"mountPoint"`   // MountPoint: optional mount point for the partition (e.g., "/boot", "/rootfs")

internal/config/schema/os-image-template.schema.json

@@ -116,6 +116,7 @@
               "type": { "type": "string", "description": "Partition type" },
               "typeUUID": { "type": "string", "description": "Partition type UUID" },
               "fsType": { "type": "string", "description": "Filesystem type" },
+              "fsLabel": { "type": "string", "description": "Filesystem label" },
               "start": { "type": "string", "description": "Partition start offset" },
               "end": { "type": "string", "description": "Partition end offset (0 = rest of disk)" },
               "mountPoint": { "type": "string", "description": "Mount point path" },

internal/image/imagedisc/imagedisc.go

@@ -574,7 +574,29 @@ func diskPartitionCreate(
 	}
 
 	if partitionInfo.FsType == "fat32" || partitionInfo.FsType == "fat16" || partitionInfo.FsType == "vfat" {
-		cmdStr = fmt.Sprintf("mkfs -t vfat %s", diskPartDev)
+		var fatTypeFlag string
+		switch partitionInfo.FsType {
+		case "fat32":
+			fatTypeFlag = "-F 32"
+		case "fat16":
+			fatTypeFlag = "-F 16"
+		default: // "vfat"
+			fatTypeFlag = "" // Let mkfs.vfat auto-decide
+		}
+
+		if partitionInfo.FsLabel != "" {
+			if fatTypeFlag != "" {
+				cmdStr = fmt.Sprintf("mkfs -t vfat %s -n %s %s", fatTypeFlag, partitionInfo.FsLabel, diskPartDev)
+			} else {
+				cmdStr = fmt.Sprintf("mkfs -t vfat -n %s %s", partitionInfo.FsLabel, diskPartDev)
+			}
+		} else {
+			if fatTypeFlag != "" {
+				cmdStr = fmt.Sprintf("mkfs -t vfat %s %s", fatTypeFlag, diskPartDev)
+			} else {
+				cmdStr = fmt.Sprintf("mkfs -t vfat %s", diskPartDev)
+			}
+		}
 		_, err := shell.ExecCmd(cmdStr, true, shell.HostPath, nil)
 		if err != nil {
 			log.Errorf("Failed to format partition %d with fs type %s: %v", partitionNum, partitionInfo.FsType, err)
@@ -590,8 +612,16 @@ func diskPartitionCreate(
 		case "ext4":
 			additionalFlags = "-b 4096 -O none,sparse_super,large_file,filetype,resize_inode,dir_index,ext_attr,has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize"
 		}
-		if additionalFlags != "" {
+		var labelFlag string
+		if partitionInfo.FsLabel != "" {
+			labelFlag = fmt.Sprintf("-L %s", partitionInfo.FsLabel)
+		}
+		if additionalFlags != "" && labelFlag != "" {
+			cmdStr = fmt.Sprintf("mkfs -t %s %s %s %s", partitionInfo.FsType, labelFlag, additionalFlags, diskPartDev)
+		} else if additionalFlags != "" {
 			cmdStr = fmt.Sprintf("mkfs -t %s %s %s", partitionInfo.FsType, additionalFlags, diskPartDev)
+		} else if labelFlag != "" {
+			cmdStr = fmt.Sprintf("mkfs -t %s %s %s", partitionInfo.FsType, labelFlag, diskPartDev)
 		} else {
 			cmdStr = fmt.Sprintf("mkfs -t %s %s", partitionInfo.FsType, diskPartDev)
 		}
@@ -601,7 +631,11 @@ func diskPartitionCreate(
 			return "", fmt.Errorf("failed to format partition %d with fs type %s: %w", partitionNum, partitionInfo.FsType, err)
 		}
 	} else if partitionInfo.FsType == "linux-swap" {
-		cmdStr = fmt.Sprintf("mkswap %s", diskPartDev)
+		if partitionInfo.FsLabel != "" {
+			cmdStr = fmt.Sprintf("mkswap -L %s %s", partitionInfo.FsLabel, diskPartDev)
+		} else {
+			cmdStr = fmt.Sprintf("mkswap %s", diskPartDev)
+		}
 		_, err := shell.ExecCmd(cmdStr, true, shell.HostPath, nil)
 		if err != nil {
 			log.Errorf("Failed to format partition %d with fs type %s: %v", partitionNum, partitionInfo.FsType, err)