More slimming, largely of variables.

include/build.ipp.yml

@@ -3,28 +3,6 @@ version: '2'
 mpp-vars:
   distro_name: cs9 # The default
 
-mpp-define-image:
-  size: $image_size
-  table:
-    uuid: $parttab_uuid
-    label: $partition_label
-    partitions:
-    - id: efi
-      start:
-        mpp-eval: "0 if partition_label == 'gpt' else 2048"
-      size: $efipart_size
-      type:
-        mpp-eval: "'C12A7328-F81F-11D2-BA4B-00A0C93EC93B' if partition_label == 'gpt' else 'ef'"
-      uuid: $efipart_uuid
-    - id: boot
-      size: $bootpart_size
-      type:
-        mpp-eval: "'0FC63DAF-8483-4772-8E79-3D69D8477DE4' if partition_label == 'gpt' else '83'"
-      uuid: $bootpart_uuid
-    - id: root
-      type:
-        mpp-eval: "'0FC63DAF-8483-4772-8E79-3D69D8477DE4' if partition_label == 'gpt' else '83'"
-      uuid: $rootpart_uuid
 pipelines:
 - mpp-import-pipelines:
     path: distro/$distro_name.ipp.yml

include/defaults.ipp.yml

@@ -5,36 +5,17 @@ mpp-vars:
   default_ostree_ref: $distro_name/$arch/$target-$name
   default_ostree_os_version: $distro_version
   default_osname: centos
-  default_uefi_vendor: centos
   default_kernel_rpm: kernel
   default_linux_firmware_rpm: linux-firmware
-  default_partition_label: gpt
   default_extra_rpms: []
   default_extra_build_rpms: []
   default_extra_repos: []
   default_target_repos: []
-  default_root_password: $6$xoLqEUz0cGGJRx01$H3H/bFm0myJPULNMtbSsOFd/2BnHqHkMD92Sfxd.EKM9hXTWSmELG8cf205l6dktomuTcgKGGtGDgtvHVXSWU.
-  default_guest_password: $6$xoLqEUz0cGGJRx01$H3H/bFm0myJPULNMtbSsOFd/2BnHqHkMD92Sfxd.EKM9hXTWSmELG8cf205l6dktomuTcgKGGtGDgtvHVXSWU.
-  default_root_ssh_key: ""
-  default_ssh_permit_root_login: false
-  default_image_size: '8589934592'
-  default_efipart_size: 204800
-  default_bootpart_size: 614400
-  default_kernel_loglevel: 4
   static_uuids:
     mpp-eval: locals().get('static_uuids', True)
   default_rootfs_uuid:
     mpp-eval: ('76a22bf4-f153-4541-b6c7-0332c0dfaeac' if static_uuids else str(__import__('uuid').uuid4()))
-  default_bootfs_uuid:
-    mpp-eval: ('156f0420-627b-4151-ae6f-fda298097515' if static_uuids else str(__import__('uuid').uuid4()))
-  default_parttab_uuid:
-    mpp-eval: ('d209c89e-ea5e-4fbd-b161-b461cce297e0' if static_uuids else str(__import__('uuid').uuid4()))
-  default_efipart_uuid:
-    mpp-eval: ('68b2905b-df3e-4fb3-80fa-49d1e773aa33' if static_uuids else str(__import__('uuid').uuid4()))
-  default_bootpart_uuid:
-    mpp-eval: ('61b2905b-df3e-4fb3-80fa-49d1e773aa32' if static_uuids else str(__import__('uuid').uuid4()))
-  default_rootpart_uuid:
-    mpp-eval: ('6264d520-3fb9-423f-8ab8-7a0a8e3d3562' if static_uuids else str(__import__('uuid').uuid4()))
+  default_kernel_loglevel: 4
   default_use_efi_runtime: true
   default_kernel_opts:
   - console=tty0
@@ -86,10 +67,6 @@ mpp-vars:
     mpp-eval: locals().get('ostree_os_version', default_ostree_os_version)
   osname:
     mpp-eval: locals().get('osname', default_osname)
-  uefi_vendor:
-    mpp-eval: locals().get('uefi_vendor', default_uefi_vendor)
-  partition_label:
-    mpp-eval: locals().get('partition_label', default_partition_label)
   extra_rpms:
     mpp-eval: locals().get('extra_rpms', default_extra_rpms)
   extra_build_rpms:
@@ -98,26 +75,10 @@ mpp-vars:
     mpp-eval: locals().get('extra_repos', default_extra_repos)
   target_repos:
     mpp-eval: locals().get('target_repos', default_target_repos)
-  image_size:
-    mpp-eval: locals().get('image_size', default_image_size)
   rootfs_uuid:
     mpp-eval: locals().get('rootfs_uuid', default_rootfs_uuid)
-  bootfs_uuid:
-    mpp-eval: locals().get('bootfs_uuid', default_bootfs_uuid)
-  parttab_uuid:
-    mpp-eval: locals().get('parttab_uuid', default_parttab_uuid)
-  rootpart_uuid:
-    mpp-eval: locals().get('rootpart_uuid', default_rootpart_uuid)
-  bootpart_uuid:
-    mpp-eval: locals().get('bootpart_uuid', default_bootpart_uuid)
-  efipart_uuid:
-    mpp-eval: locals().get('efipart_uuid', default_efipart_uuid)
   kernel_opts:
     mpp-eval: locals().get('kernel_opts', default_kernel_opts)
-  efipart_size:
-    mpp-eval: locals().get('efipart_size', default_efipart_size)
-  bootpart_size:
-    mpp-eval: locals().get('bootpart_size', default_bootpart_size)
   dracut_add_modules:
     mpp-eval: locals().get('dracut_add_modules', default_dracut_add_modules)
   dracut_omit_modules:
@@ -128,14 +89,6 @@ mpp-vars:
     mpp-eval: locals().get('dracut_add_drivers', default_dracut_add_drivers)
   dracut_install:
     mpp-eval: locals().get('dracut_install', default_dracut_install)
-  root_password:
-    mpp-eval: locals().get('root_password', default_root_password)
-  root_ssh_key:
-    mpp-eval: locals().get('root_ssh_key', default_root_ssh_key)
-  ssh_permit_root_login:
-    mpp-eval: locals().get('ssh_permit_root_login', default_ssh_permit_root_login)
-  guest_password:
-    mpp-eval: locals().get('guest_password', default_guest_password)
   ostree_repo_url:
     mpp-eval: locals().get('ostree_repo_url', default_ostree_repo_url)
   ostree_remote_name:
@@ -237,24 +190,6 @@ mpp-vars:
     iA==
     =+Gxh
     -----END PGP PUBLIC KEY BLOCK-----
-  fstab:
-    - uuid:
-        mpp-eval: rootfs_uuid
-      vfs_type: ext4
-      path: /
-      freq: 1
-      passno: 1
-    - label: ESP
-      vfs_type: vfat
-      path: /boot/efi
-      freq: 1
-      passno: 1
-    - uuid:
-        mpp-eval: bootfs_uuid
-      vfs_type: ext4
-      path: /boot
-      freq: 1
-      passno: 1
   build_rpms:
     - dnf
     - dosfstools

include/image.ipp.yml

@@ -11,7 +11,8 @@ mpp-vars:
           then: efi=runtime
       - mpp-eval: kernel_opts
 pipelines:
-# Import pipeline with ostree specifics.
+
+# ostree pipeline is in other file.
 - mpp-import-pipelines:
     path: image-ostree.ipp.yml