Remove more luks stuff. Add sudo.

osbuild-manifests/distro/cs9.ipp.yml

@@ -8,10 +8,6 @@ mpp-vars:
     baseurl: $distro_baseurl/BaseOS/$arch/os/
   - id: appstream
     baseurl: $distro_baseurl/AppStream/$arch/os/
-  - id: automotive
-    baseurl: https://buildlogs.centos.org/9-stream/automotive/$arch/packages-main/
-  - id: autosd
-    baseurl: https://buildlogs.centos.org/9-stream/autosd/$arch/packages-main/
   distro_devel_repos:
   - id: crb
     baseurl: $distro_baseurl/CRB/$arch/os/
@@ -22,8 +18,6 @@ mpp-vars:
     baseurl: $distro_baseurl/AppStream/$arch/debug/tree/
   - id: crb-debug
     baseurl: $distro_baseurl/CRB/$arch/debug/tree/
-  - id: autosd-debug
-    baseurl: https://buildlogs.centos.org/9-stream/autosd/$arch/packages-main/debug/
   distro_module_id: platform:el9
   ostree_repo_url: http://192.168.1.107:8080/repo
   ostree_ref: c9s/x86_64/edge

osbuild-manifests/include/defaults.ipp.yml

@@ -35,15 +35,6 @@ mpp-vars:
     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_luks_uuid:
-    mpp-eval: ('aedd1eef-f24e-425e-a9f3-bb5a1c996a95' if static_uuids else str(__import__('uuid').uuid4()))
-  default_use_luks: false
-  use_luks:
-    mpp-eval: locals().get('use_luks', default_use_luks)
-  default_luks_use_integrity: false
-  default_luks_auto_unlock: false
-  luks_auto_unlock:
-    mpp-eval: locals().get('luks_auto_unlock', default_luks_auto_unlock)
   default_use_efi_runtime: true
   default_kernel_opts:
   - console=tty0
@@ -66,8 +57,7 @@ mpp-vars:
       - udev-rules
       - usrmount
   default_dracut_omit_modules:
-      - mpp-if: not use_luks
-        then: dm
+      - dm
       - lunmask
       - mdraid
       - memstrack
@@ -82,7 +72,6 @@ mpp-vars:
   default_dracut_install: []
   default_ostree_repo_url: http://10.0.2.100/
   default_ostree_remote_name: auto-sig
-  default_luks_passphrase: password
   target:
     mpp-eval: locals().get('target', default_target)
   image_type:
@@ -123,8 +112,6 @@ mpp-vars:
     mpp-eval: locals().get('bootpart_uuid', default_bootpart_uuid)
   efipart_uuid:
     mpp-eval: locals().get('efipart_uuid', default_efipart_uuid)
-  luks_uuid:
-    mpp-eval: locals().get('luks_uuid', default_luks_uuid)
   kernel_opts:
     mpp-eval: locals().get('kernel_opts', default_kernel_opts)
   efipart_size:
@@ -153,10 +140,6 @@ mpp-vars:
     mpp-eval: locals().get('ostree_repo_url', default_ostree_repo_url)
   ostree_remote_name:
     mpp-eval: locals().get('ostree_remote_name', default_ostree_remote_name)
-  luks_passphrase:
-    mpp-eval: locals().get('luks_passphrase', default_luks_passphrase)
-  luks_use_integrity:
-    mpp-eval: locals().get('luks_use_integrity', default_luks_use_integrity)
   use_efi_runtime:
     mpp-eval: locals().get('use_efi_runtime', default_use_efi_runtime)
   kernel_loglevel:
@@ -273,16 +256,12 @@ mpp-vars:
       freq: 1
       passno: 1
   build_rpms:
-    - mpp-if: use_luks
-      then: cryptsetup
     - dnf
     - dosfstools
     - e2fsprogs
     - efibootmgr
     - grub2-tools
     - grub2-tools-minimal
-    - mpp-if: use_luks
-      then: lvm2
     - policycoreutils
     - python3-iniparse
     - python3
@@ -311,5 +290,4 @@ mpp-vars:
     - rootfiles
     - selinux-policy-targeted
     - systemd-udev
-    - mpp-if: use_luks
-      then: lvm2
+    - sudo