Move common live functionality to a new layer

os/build.py

@@ -138,6 +138,8 @@ def main():
 
     # Add our own configuration on top.
     run(["cp", "-rT", f"{script_dir}/layers/participant", "config"])
+    if args.variant != "training-installer":
+        run(["cp", "-rT", f"{script_dir}/layers/live", "config"])
     run(["cp", "-rT", f"{script_dir}/layers/{args.variant}", "config"])
 
     if args.variant == "training-installer":

os/layers/contestant/hooks/live/2010-contestant.hook.chroot

@@ -21,9 +21,6 @@ $DISABLE_DESKTOP /usr/share/applications/gnome-bluetooth-panel.desktop
 $DISABLE_DESKTOP /usr/share/applications/gnome-online-accounts-panel.desktop
 $DISABLE_DESKTOP /usr/share/applications/gnome-sharing-panel.desktop
 
-# Enable the live system configuration script at boot.
-systemctl enable live-config.service
-
 # Disable kexec-tools services.
 # We want to load kexec manually, and execution of kexec is already done by systemd.
 systemctl disable kexec-load.service

os/layers/training-live/includes.chroot/etc/dconf/db/local.d/00-disable-screensaver-lock

@@ -1,3 +0,0 @@
-# Disable lock on blank screen
-[org/gnome/desktop/screensaver]
-lock-enabled = false

os/layers/training-live/includes.chroot/etc/dconf/db/local.d/00-disallow-updates

@@ -1,5 +0,0 @@
-# Disable "Updates available" notifications and auto updates.
-# Updates which require reboot are useless on live systems,
-# and other updates would be installed on each boot.
-[org/gnome/software]
-allow-updates = false

os/layers/training-live/includes.chroot/etc/systemd/system/live-config.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=custom configuration of live system during boot.
-Before=basic.target
-After=local-fs.target systemd-tmpfiles-setup.service
-DefaultDependencies=no
-ConditionKernelCommandLine=boot=live
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/local/bin/live-config
-
-[Install]
-WantedBy=basic.target

os/readme.md

@@ -93,9 +93,10 @@ Here is a list of features.
   - timezone
   - list of locales
   - bootloader background image
-- `training-live`
+- `live` (all live variants)
   - disable lock on blank screen
   - disable software update notifications
+- `training-live`
   - automatic login
   - sudo without password
 - `training-installer`
@@ -111,8 +112,6 @@ Here is a list of features.
 - `contestant`
   - disable bluetooth
   - disable sleep
-  - disable lock on blank screen
-  - disable software update notifications
   - disable some panels in gnome-control-center
   - disable automatic mounting of storage media
   - polkit rules which block changing network settings and mounting storage media (it prompts for the root password)