expose sysfs overlay option

debian/changelog

@@ -1,3 +1,11 @@
+ubuntu-image (3.2) UNRELEASED; urgency=medium
+
+  [Masahiro Nakagawa]
+  * Add sysfs-overlay option used with --presseed option.
+  * This option is required to generate a preseeding image which enhances the initial boot time of Ubuntu Core 20+.
+
+ -- Masahiro nakagawa <[email protected]> Thu, 8 Feb 2024 13:56:00 +0900
+
 ubuntu-image (3.2) UNRELEASED; urgency=medium
 
   [ Paul Mars ]

internal/commands/snap.go

@@ -15,6 +15,7 @@ type SnapOpts struct {
 	Snaps                     []string       `long:"snap" description:"Install extra snaps. These are passed through to \"snap prepare-image\". The snap argument can include additional information about the channel and/or risk with the following syntax: <snap>=<channel|risk>" value-name:"SNAP"`
 	CloudInit                 string         `long:"cloud-init" description:"cloud-config data to be copied to the image" value-name:"USER-DATA-FILE"`
 	Revisions                 map[string]int `long:"revision" description:"The revision of a specific snap to install in the image." value-name:"REVISION"`
+	SysfsOverlay              string         `long:"sysfs-overlay" description:"The optional sysfs overlay to used for preseeding. Directories from /sys/class/* and /sys/devices/platform will be bind-mounted to the chroot when preseeding"`
 }
 
 type SnapCommand struct {

internal/statemachine/snap_states.go

@@ -46,6 +46,7 @@ func (stateMachine *StateMachine) prepareImage() error {
 	// preseeding-related
 	imageOpts.Preseed = snapStateMachine.Opts.Preseed
 	imageOpts.PreseedSignKey = snapStateMachine.Opts.PreseedSignKey
+	imageOpts.SysfsOverlay = snapStateMachine.Opts.SysfsOverlay
 	imageOpts.AppArmorKernelFeaturesDir = snapStateMachine.Opts.AppArmorKernelFeaturesDir
 	imageOpts.SeedManifestPath = filepath.Join(stateMachine.commonFlags.OutputDir, "seed.manifest")
 

snapcraft.yaml

@@ -3,7 +3,7 @@ summary: Create Ubuntu images
 description: |
   Official tool for building Ubuntu images, currently supporing Ubuntu Core
   snap-based images and preinstalled Ubuntu classic images.
-version: "3.2+snap2"
+version: "3.2+snap3"
 grade: stable
 confinement: classic
 base: core22

ubuntu-image.rst

@@ -104,6 +104,15 @@ model_assertion
     both a revision and channel are provided, the revision specified will be
     installed in the image, and updates will come from the specified channel
 
+--preseed
+    Preseed the image (UC20+ only).
+
+--preseed-sign-key=<key> 
+    Name of the key to use to sign preseed assertion, otherwise use the default key
+
+--sysfs-overlay=<path to folder contains sysfs overlay>
+    specify folder contains sysfsoverlay directory. This options also requires --presseding options and --preseed-sign-key option.
+
 Classic command options
 -----------------------