From 8f824cb97737e738e2d5a1d0b09190a698e2c18b Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Thu, 26 Mar 2026 14:29:22 +0100 Subject: [PATCH] Remove deprecated command tracking from generate_recipe - Remove DEPRECATED_COMMANDS dictionary - Remove _check_deprecated_commands() method - Remove deprecated command checks from validation - Remove test methods for deprecated commands - Remove DEPRECATED_COMMANDS documentation reference This shifts responsibility for tracking deprecated kickstart commands away from the recipe generator, as this is not its primary role. --- DEVELOPMENT.md | 2 +- ...d.cfg => install_desktop_encrypted_43.cfg} | 3 - ...desktop_encrypted_hardware-support_43.cfg} | 3 - ...op_encrypted_hardware-support_rawhide.cfg} | 3 - ... => install_desktop_encrypted_rawhide.cfg} | 3 - ...> install_desktop_hardware-support_43.cfg} | 0 ...tall_desktop_hardware-support_rawhide.cfg} | 0 ...hypervisor_amdcpu_hardware-support_43.cfg} | 0 ...pervisor_intelcpu_hardware-support_43.cfg} | 0 ..._hw.cfg => install_virtual_desktop_43.cfg} | 0 ... install_virtual_desktop_encrypted_43.cfg} | 3 - ...desktop_encrypted_hardware-support_43.cfg} | 3 - ...op_encrypted_hardware-support_rawhide.cfg} | 3 - ...all_virtual_desktop_encrypted_rawhide.cfg} | 3 - ...l_virtual_desktop_hardware-support_43.cfg} | 0 ...tual_desktop_hardware-support_rawhide.cfg} | 0 ...fg => install_virtual_desktop_rawhide.cfg} | 0 ..._virtual_hypervisor-desktop_amdcpu_43.cfg} | 0 ...irtual_hypervisor-desktop_intelcpu_43.cfg} | 0 ...3_ga.cfg => install_virtual_server_43.cfg} | 0 ...cfg => install_virtual_server_rawhide.cfg} | 0 ...g => live_desktop_hardware-support_43.cfg} | 0 ...fg => live_server_hardware-support_43.cfg} | 0 .../generate_recipe.cpython-314.pyc | Bin 41809 -> 39257 bytes recipe-generator/generate_recipe.py | 92 +++--------------- recipes/install_desktop_43.cfg | 2 +- recipes/install_desktop_43_encrypted.cfg | 25 ----- recipes/install_desktop_43_encrypted_ga.cfg | 25 ----- recipes/install_desktop_43_encrypted_hw.cfg | 25 ----- .../install_desktop_43_encrypted_hw_ga.cfg | 25 ----- ...d.cfg => install_desktop_encrypted_43.cfg} | 3 +- ...desktop_encrypted_hardware-support_43.cfg} | 3 +- ...op_encrypted_hardware-support_rawhide.cfg} | 1 - ... => install_desktop_encrypted_rawhide.cfg} | 1 - ...> install_desktop_hardware-support_43.cfg} | 2 +- ...tall_desktop_hardware-support_rawhide.cfg} | 2 +- recipes/install_desktop_rawhide.cfg | 2 +- ...hypervisor_amdcpu_hardware-support_43.cfg} | 2 +- ...pervisor_intelcpu_hardware-support_43.cfg} | 2 +- ..._hw.cfg => install_virtual_desktop_43.cfg} | 2 +- .../install_virtual_desktop_encrypted_43.cfg | 24 +++++ ..._desktop_encrypted_hardware-support_43.cfg | 24 +++++ ...top_encrypted_hardware-support_rawhide.cfg | 24 +++++ ...tall_virtual_desktop_encrypted_rawhide.cfg | 24 +++++ ...l_virtual_desktop_hardware-support_43.cfg} | 2 +- ...tual_desktop_hardware-support_rawhide.cfg} | 2 +- ...fg => install_virtual_desktop_rawhide.cfg} | 2 +- ..._virtual_hypervisor-desktop_amdcpu_43.cfg} | 2 +- ...irtual_hypervisor-desktop_intelcpu_43.cfg} | 2 +- ...3_ga.cfg => install_virtual_server_43.cfg} | 2 +- ...cfg => install_virtual_server_rawhide.cfg} | 2 +- ...g => live_desktop_hardware-support_43.cfg} | 0 ...fg => live_server_hardware-support_43.cfg} | 0 ...ipe_generator.cpython-314-pytest-8.4.2.pyc | Bin 42509 -> 40201 bytes tests/test_recipe_generator.py | 14 +-- 55 files changed, 126 insertions(+), 238 deletions(-) rename dishes/{install_desktop_43_encrypted.cfg => install_desktop_encrypted_43.cfg} (94%) rename dishes/{install_desktop_43_encrypted_ga.cfg => install_desktop_encrypted_hardware-support_43.cfg} (94%) rename dishes/{install_desktop_rawhide_encrypted.cfg => install_desktop_encrypted_hardware-support_rawhide.cfg} (94%) rename dishes/{install_desktop_rawhide_encrypted_ga.cfg => install_desktop_encrypted_rawhide.cfg} (94%) rename dishes/{install_desktop_43_ga.cfg => install_desktop_hardware-support_43.cfg} (100%) rename dishes/{install_desktop_rawhide_ga.cfg => install_desktop_hardware-support_rawhide.cfg} (100%) rename dishes/{install_hypervisor_amdcpu_43_hw.cfg => install_hypervisor_amdcpu_hardware-support_43.cfg} (100%) rename dishes/{install_hypervisor_intelcpu_43_hw.cfg => install_hypervisor_intelcpu_hardware-support_43.cfg} (100%) rename dishes/{install_desktop_43_hw.cfg => install_virtual_desktop_43.cfg} (100%) rename dishes/{install_desktop_43_encrypted_hw.cfg => install_virtual_desktop_encrypted_43.cfg} (94%) rename dishes/{install_desktop_43_encrypted_hw_ga.cfg => install_virtual_desktop_encrypted_hardware-support_43.cfg} (94%) rename dishes/{install_desktop_rawhide_encrypted_hw.cfg => install_virtual_desktop_encrypted_hardware-support_rawhide.cfg} (94%) rename dishes/{install_desktop_rawhide_encrypted_hw_ga.cfg => install_virtual_desktop_encrypted_rawhide.cfg} (94%) rename dishes/{install_desktop_43_hw_ga.cfg => install_virtual_desktop_hardware-support_43.cfg} (100%) rename dishes/{install_desktop_rawhide_hw.cfg => install_virtual_desktop_hardware-support_rawhide.cfg} (100%) rename dishes/{install_desktop_rawhide_hw_ga.cfg => install_virtual_desktop_rawhide.cfg} (100%) rename dishes/{install_hypervisor-desktop_amdcpu_43_ga.cfg => install_virtual_hypervisor-desktop_amdcpu_43.cfg} (100%) rename dishes/{install_hypervisor-desktop_intelcpu_43_ga.cfg => install_virtual_hypervisor-desktop_intelcpu_43.cfg} (100%) rename dishes/{install_server_43_ga.cfg => install_virtual_server_43.cfg} (100%) rename dishes/{install_server_rawhide_ga.cfg => install_virtual_server_rawhide.cfg} (100%) rename dishes/{live_desktop_43_hw.cfg => live_desktop_hardware-support_43.cfg} (100%) rename dishes/{live_server_43_hw.cfg => live_server_hardware-support_43.cfg} (100%) delete mode 100644 recipes/install_desktop_43_encrypted.cfg delete mode 100644 recipes/install_desktop_43_encrypted_ga.cfg delete mode 100644 recipes/install_desktop_43_encrypted_hw.cfg delete mode 100644 recipes/install_desktop_43_encrypted_hw_ga.cfg rename recipes/{install_desktop_rawhide_encrypted.cfg => install_desktop_encrypted_43.cfg} (92%) rename recipes/{install_desktop_rawhide_encrypted_ga.cfg => install_desktop_encrypted_hardware-support_43.cfg} (92%) rename recipes/{install_desktop_rawhide_encrypted_hw.cfg => install_desktop_encrypted_hardware-support_rawhide.cfg} (92%) rename recipes/{install_desktop_rawhide_encrypted_hw_ga.cfg => install_desktop_encrypted_rawhide.cfg} (92%) rename recipes/{install_desktop_43_ga.cfg => install_desktop_hardware-support_43.cfg} (95%) rename recipes/{install_desktop_rawhide_hw.cfg => install_desktop_hardware-support_rawhide.cfg} (95%) rename recipes/{install_hypervisor_amdcpu_43_hw.cfg => install_hypervisor_amdcpu_hardware-support_43.cfg} (96%) rename recipes/{install_hypervisor_intelcpu_43_hw.cfg => install_hypervisor_intelcpu_hardware-support_43.cfg} (95%) rename recipes/{install_desktop_43_hw.cfg => install_virtual_desktop_43.cfg} (95%) create mode 100644 recipes/install_virtual_desktop_encrypted_43.cfg create mode 100644 recipes/install_virtual_desktop_encrypted_hardware-support_43.cfg create mode 100644 recipes/install_virtual_desktop_encrypted_hardware-support_rawhide.cfg create mode 100644 recipes/install_virtual_desktop_encrypted_rawhide.cfg rename recipes/{install_desktop_43_hw_ga.cfg => install_virtual_desktop_hardware-support_43.cfg} (95%) rename recipes/{install_desktop_rawhide_hw_ga.cfg => install_virtual_desktop_hardware-support_rawhide.cfg} (95%) rename recipes/{install_desktop_rawhide_ga.cfg => install_virtual_desktop_rawhide.cfg} (95%) rename recipes/{install_hypervisor-desktop_amdcpu_43_ga.cfg => install_virtual_hypervisor-desktop_amdcpu_43.cfg} (96%) rename recipes/{install_hypervisor-desktop_intelcpu_43_ga.cfg => install_virtual_hypervisor-desktop_intelcpu_43.cfg} (96%) rename recipes/{install_server_43_ga.cfg => install_virtual_server_43.cfg} (95%) rename recipes/{install_server_rawhide_ga.cfg => install_virtual_server_rawhide.cfg} (95%) rename recipes/{live_desktop_43_hw.cfg => live_desktop_hardware-support_43.cfg} (100%) rename recipes/{live_server_43_hw.cfg => live_server_hardware-support_43.cfg} (100%) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 2f4a4b4..d0a4956 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -807,7 +807,7 @@ ERROR: Missing fragment: fragments/shared/unknown/missing.ks keyboard command is deprecated. Use keyboard --vckeymap instead. ``` -**Fix:** Update fragment to use modern syntax (see `DEPRECATED_COMMANDS` in `generate_recipe.py`) + **4. pykickstart validation fails** diff --git a/dishes/install_desktop_43_encrypted.cfg b/dishes/install_desktop_encrypted_43.cfg similarity index 94% rename from dishes/install_desktop_43_encrypted.cfg rename to dishes/install_desktop_encrypted_43.cfg index c1c880b..43d4c36 100644 --- a/dishes/install_desktop_43_encrypted.cfg +++ b/dishes/install_desktop_encrypted_43.cfg @@ -37,9 +37,6 @@ clearpart --all --initlabel # Disk partitioning information part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot --fstype="ext4" --size=2048 --label="boot" -part / --fstype="ext4" --grow --label="root" --mkfsoptions="-O encrypt,fast_commit" -part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" -part /boot --fstype="ext4" --size=2048 --label="boot" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit" %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log diff --git a/dishes/install_desktop_43_encrypted_ga.cfg b/dishes/install_desktop_encrypted_hardware-support_43.cfg similarity index 94% rename from dishes/install_desktop_43_encrypted_ga.cfg rename to dishes/install_desktop_encrypted_hardware-support_43.cfg index c1c880b..43d4c36 100644 --- a/dishes/install_desktop_43_encrypted_ga.cfg +++ b/dishes/install_desktop_encrypted_hardware-support_43.cfg @@ -37,9 +37,6 @@ clearpart --all --initlabel # Disk partitioning information part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot --fstype="ext4" --size=2048 --label="boot" -part / --fstype="ext4" --grow --label="root" --mkfsoptions="-O encrypt,fast_commit" -part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" -part /boot --fstype="ext4" --size=2048 --label="boot" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit" %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log diff --git a/dishes/install_desktop_rawhide_encrypted.cfg b/dishes/install_desktop_encrypted_hardware-support_rawhide.cfg similarity index 94% rename from dishes/install_desktop_rawhide_encrypted.cfg rename to dishes/install_desktop_encrypted_hardware-support_rawhide.cfg index c86a4c2..ec040fa 100644 --- a/dishes/install_desktop_rawhide_encrypted.cfg +++ b/dishes/install_desktop_encrypted_hardware-support_rawhide.cfg @@ -36,9 +36,6 @@ clearpart --all --initlabel # Disk partitioning information part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot --fstype="ext4" --size=2048 --label="boot" -part / --fstype="ext4" --grow --label="root" --mkfsoptions="-O encrypt,fast_commit" -part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" -part /boot --fstype="ext4" --size=2048 --label="boot" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit" %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log diff --git a/dishes/install_desktop_rawhide_encrypted_ga.cfg b/dishes/install_desktop_encrypted_rawhide.cfg similarity index 94% rename from dishes/install_desktop_rawhide_encrypted_ga.cfg rename to dishes/install_desktop_encrypted_rawhide.cfg index c86a4c2..ec040fa 100644 --- a/dishes/install_desktop_rawhide_encrypted_ga.cfg +++ b/dishes/install_desktop_encrypted_rawhide.cfg @@ -36,9 +36,6 @@ clearpart --all --initlabel # Disk partitioning information part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot --fstype="ext4" --size=2048 --label="boot" -part / --fstype="ext4" --grow --label="root" --mkfsoptions="-O encrypt,fast_commit" -part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" -part /boot --fstype="ext4" --size=2048 --label="boot" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit" %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log diff --git a/dishes/install_desktop_43_ga.cfg b/dishes/install_desktop_hardware-support_43.cfg similarity index 100% rename from dishes/install_desktop_43_ga.cfg rename to dishes/install_desktop_hardware-support_43.cfg diff --git a/dishes/install_desktop_rawhide_ga.cfg b/dishes/install_desktop_hardware-support_rawhide.cfg similarity index 100% rename from dishes/install_desktop_rawhide_ga.cfg rename to dishes/install_desktop_hardware-support_rawhide.cfg diff --git a/dishes/install_hypervisor_amdcpu_43_hw.cfg b/dishes/install_hypervisor_amdcpu_hardware-support_43.cfg similarity index 100% rename from dishes/install_hypervisor_amdcpu_43_hw.cfg rename to dishes/install_hypervisor_amdcpu_hardware-support_43.cfg diff --git a/dishes/install_hypervisor_intelcpu_43_hw.cfg b/dishes/install_hypervisor_intelcpu_hardware-support_43.cfg similarity index 100% rename from dishes/install_hypervisor_intelcpu_43_hw.cfg rename to dishes/install_hypervisor_intelcpu_hardware-support_43.cfg diff --git a/dishes/install_desktop_43_hw.cfg b/dishes/install_virtual_desktop_43.cfg similarity index 100% rename from dishes/install_desktop_43_hw.cfg rename to dishes/install_virtual_desktop_43.cfg diff --git a/dishes/install_desktop_43_encrypted_hw.cfg b/dishes/install_virtual_desktop_encrypted_43.cfg similarity index 94% rename from dishes/install_desktop_43_encrypted_hw.cfg rename to dishes/install_virtual_desktop_encrypted_43.cfg index c1c880b..43d4c36 100644 --- a/dishes/install_desktop_43_encrypted_hw.cfg +++ b/dishes/install_virtual_desktop_encrypted_43.cfg @@ -37,9 +37,6 @@ clearpart --all --initlabel # Disk partitioning information part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot --fstype="ext4" --size=2048 --label="boot" -part / --fstype="ext4" --grow --label="root" --mkfsoptions="-O encrypt,fast_commit" -part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" -part /boot --fstype="ext4" --size=2048 --label="boot" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit" %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log diff --git a/dishes/install_desktop_43_encrypted_hw_ga.cfg b/dishes/install_virtual_desktop_encrypted_hardware-support_43.cfg similarity index 94% rename from dishes/install_desktop_43_encrypted_hw_ga.cfg rename to dishes/install_virtual_desktop_encrypted_hardware-support_43.cfg index c1c880b..43d4c36 100644 --- a/dishes/install_desktop_43_encrypted_hw_ga.cfg +++ b/dishes/install_virtual_desktop_encrypted_hardware-support_43.cfg @@ -37,9 +37,6 @@ clearpart --all --initlabel # Disk partitioning information part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot --fstype="ext4" --size=2048 --label="boot" -part / --fstype="ext4" --grow --label="root" --mkfsoptions="-O encrypt,fast_commit" -part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" -part /boot --fstype="ext4" --size=2048 --label="boot" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit" %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log diff --git a/dishes/install_desktop_rawhide_encrypted_hw.cfg b/dishes/install_virtual_desktop_encrypted_hardware-support_rawhide.cfg similarity index 94% rename from dishes/install_desktop_rawhide_encrypted_hw.cfg rename to dishes/install_virtual_desktop_encrypted_hardware-support_rawhide.cfg index c86a4c2..ec040fa 100644 --- a/dishes/install_desktop_rawhide_encrypted_hw.cfg +++ b/dishes/install_virtual_desktop_encrypted_hardware-support_rawhide.cfg @@ -36,9 +36,6 @@ clearpart --all --initlabel # Disk partitioning information part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot --fstype="ext4" --size=2048 --label="boot" -part / --fstype="ext4" --grow --label="root" --mkfsoptions="-O encrypt,fast_commit" -part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" -part /boot --fstype="ext4" --size=2048 --label="boot" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit" %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log diff --git a/dishes/install_desktop_rawhide_encrypted_hw_ga.cfg b/dishes/install_virtual_desktop_encrypted_rawhide.cfg similarity index 94% rename from dishes/install_desktop_rawhide_encrypted_hw_ga.cfg rename to dishes/install_virtual_desktop_encrypted_rawhide.cfg index c86a4c2..ec040fa 100644 --- a/dishes/install_desktop_rawhide_encrypted_hw_ga.cfg +++ b/dishes/install_virtual_desktop_encrypted_rawhide.cfg @@ -36,9 +36,6 @@ clearpart --all --initlabel # Disk partitioning information part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot --fstype="ext4" --size=2048 --label="boot" -part / --fstype="ext4" --grow --label="root" --mkfsoptions="-O encrypt,fast_commit" -part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" -part /boot --fstype="ext4" --size=2048 --label="boot" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit" %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log diff --git a/dishes/install_desktop_43_hw_ga.cfg b/dishes/install_virtual_desktop_hardware-support_43.cfg similarity index 100% rename from dishes/install_desktop_43_hw_ga.cfg rename to dishes/install_virtual_desktop_hardware-support_43.cfg diff --git a/dishes/install_desktop_rawhide_hw.cfg b/dishes/install_virtual_desktop_hardware-support_rawhide.cfg similarity index 100% rename from dishes/install_desktop_rawhide_hw.cfg rename to dishes/install_virtual_desktop_hardware-support_rawhide.cfg diff --git a/dishes/install_desktop_rawhide_hw_ga.cfg b/dishes/install_virtual_desktop_rawhide.cfg similarity index 100% rename from dishes/install_desktop_rawhide_hw_ga.cfg rename to dishes/install_virtual_desktop_rawhide.cfg diff --git a/dishes/install_hypervisor-desktop_amdcpu_43_ga.cfg b/dishes/install_virtual_hypervisor-desktop_amdcpu_43.cfg similarity index 100% rename from dishes/install_hypervisor-desktop_amdcpu_43_ga.cfg rename to dishes/install_virtual_hypervisor-desktop_amdcpu_43.cfg diff --git a/dishes/install_hypervisor-desktop_intelcpu_43_ga.cfg b/dishes/install_virtual_hypervisor-desktop_intelcpu_43.cfg similarity index 100% rename from dishes/install_hypervisor-desktop_intelcpu_43_ga.cfg rename to dishes/install_virtual_hypervisor-desktop_intelcpu_43.cfg diff --git a/dishes/install_server_43_ga.cfg b/dishes/install_virtual_server_43.cfg similarity index 100% rename from dishes/install_server_43_ga.cfg rename to dishes/install_virtual_server_43.cfg diff --git a/dishes/install_server_rawhide_ga.cfg b/dishes/install_virtual_server_rawhide.cfg similarity index 100% rename from dishes/install_server_rawhide_ga.cfg rename to dishes/install_virtual_server_rawhide.cfg diff --git a/dishes/live_desktop_43_hw.cfg b/dishes/live_desktop_hardware-support_43.cfg similarity index 100% rename from dishes/live_desktop_43_hw.cfg rename to dishes/live_desktop_hardware-support_43.cfg diff --git a/dishes/live_server_43_hw.cfg b/dishes/live_server_hardware-support_43.cfg similarity index 100% rename from dishes/live_server_43_hw.cfg rename to dishes/live_server_hardware-support_43.cfg diff --git a/recipe-generator/__pycache__/generate_recipe.cpython-314.pyc b/recipe-generator/__pycache__/generate_recipe.cpython-314.pyc index a4a84ccbf2764dccd4ddad0be7a18f24aba0029b..4f7c87bf561c11ef77f62c668bec41f1864721e6 100644 GIT binary patch delta 5295 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 S#@x#$+aomtM#+>XR{jt4KG41Z delta 7427 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 List[str]: - """Check for deprecated and removed commands with suggestions.""" - issues = [] - - for line_num, line in enumerate(content.split('\n'), start=1): - # Skip comments and empty lines - stripped = line.strip() - if not stripped or stripped.startswith('#'): - continue - - # Extract command (first word after % if in section, or just the first word) - if stripped.startswith('%'): - continue # Skip section headers - - parts = stripped.split() - if not parts: - continue - - cmd = parts[0] - - if cmd in DEPRECATED_COMMANDS: - cmd_info = DEPRECATED_COMMANDS[cmd] - status = cmd_info['status'] - msg = cmd_info['message'] - - if status == 'removed': - issues.append(f"ERROR: Line {line_num}: {msg}") - else: - issues.append(f"Warning: Line {line_num}: {msg}") - return issues def extract_version(self, content: str, filename: str) -> Optional[str]: @@ -506,6 +435,7 @@ class RecipeGenerator: def generate_filename(self, recipe_type: str, version: str, **modifiers) -> str: """Generate recipe filename from parameters.""" + # Extract variant subname if present variant_subname = modifiers.get('variant_subname', '') if not variant_subname: @@ -513,7 +443,11 @@ class RecipeGenerator: # Build base parts parts = [recipe_type.replace('_', '-')] - + + # Add guest-agents suffix (virtual when enabled) + if modifiers.get('guest-agents') is True: + parts.append('virtual') + # Add variant_subname for install variants if variant_subname and variant_subname in ['desktop', 'server', 'hypervisor', 'hypervisor-desktop']: parts.append(variant_subname) @@ -532,9 +466,6 @@ class RecipeGenerator: if modifiers.get('desktop') and modifiers['desktop'] != 'gnome': parts.append(modifiers['desktop']) - # Add version - parts.append(str(version)) - # Add security suffix (devel only, since secure is default) if modifiers.get('security') == 'off': parts.append('devel') @@ -543,14 +474,13 @@ class RecipeGenerator: if modifiers.get('storage') == 'encrypted': parts.append('encrypted') - # Add hardware-support suffix (hw when enabled) + # Add hardware-support suffix (hardware when enabled) if modifiers.get('hardware-support') is True: - parts.append('hw') - - # Add guest-agents suffix (ga when enabled) - if modifiers.get('guest-agents') is True: - parts.append('ga') + parts.append('hardware-support') + # Add version + parts.append(str(version)) + return '_'.join(parts) + '.cfg' diff --git a/recipes/install_desktop_43.cfg b/recipes/install_desktop_43.cfg index 3151b28..3897012 100644 --- a/recipes/install_desktop_43.cfg +++ b/recipes/install_desktop_43.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -21,4 +20,5 @@ %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks +%include fragments/storage/standard.ks %include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_43_encrypted.cfg b/recipes/install_desktop_43_encrypted.cfg deleted file mode 100644 index 68174b2..0000000 --- a/recipes/install_desktop_43_encrypted.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# An install recipe for desktop, server, or hypervisor - -%include fragments/core/base.ks -%include fragments/storage/standard.ks -%include fragments/core/locale.ks -%include fragments/core/services.ks -%include fragments/core/network.ks -%include fragments/packages/core-group.ks -%include fragments/packages/fedora-remix.ks -%include fragments/packages/hand-picked.ks -%include fragments/desktop/gnome/config.ks -%include fragments/desktop/gnome/packages.ks -%include fragments/desktop/gnome/post-scripts.ks -%include fragments/bootloader/grub.ks -%include fragments/initial-setup/server/config.ks -%include fragments/core/security/enabled.ks -%include fragments/storage/encrypted.ks -%include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_43_encrypted_ga.cfg b/recipes/install_desktop_43_encrypted_ga.cfg deleted file mode 100644 index 68174b2..0000000 --- a/recipes/install_desktop_43_encrypted_ga.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# An install recipe for desktop, server, or hypervisor - -%include fragments/core/base.ks -%include fragments/storage/standard.ks -%include fragments/core/locale.ks -%include fragments/core/services.ks -%include fragments/core/network.ks -%include fragments/packages/core-group.ks -%include fragments/packages/fedora-remix.ks -%include fragments/packages/hand-picked.ks -%include fragments/desktop/gnome/config.ks -%include fragments/desktop/gnome/packages.ks -%include fragments/desktop/gnome/post-scripts.ks -%include fragments/bootloader/grub.ks -%include fragments/initial-setup/server/config.ks -%include fragments/core/security/enabled.ks -%include fragments/storage/encrypted.ks -%include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_43_encrypted_hw.cfg b/recipes/install_desktop_43_encrypted_hw.cfg deleted file mode 100644 index 68174b2..0000000 --- a/recipes/install_desktop_43_encrypted_hw.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# An install recipe for desktop, server, or hypervisor - -%include fragments/core/base.ks -%include fragments/storage/standard.ks -%include fragments/core/locale.ks -%include fragments/core/services.ks -%include fragments/core/network.ks -%include fragments/packages/core-group.ks -%include fragments/packages/fedora-remix.ks -%include fragments/packages/hand-picked.ks -%include fragments/desktop/gnome/config.ks -%include fragments/desktop/gnome/packages.ks -%include fragments/desktop/gnome/post-scripts.ks -%include fragments/bootloader/grub.ks -%include fragments/initial-setup/server/config.ks -%include fragments/core/security/enabled.ks -%include fragments/storage/encrypted.ks -%include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_43_encrypted_hw_ga.cfg b/recipes/install_desktop_43_encrypted_hw_ga.cfg deleted file mode 100644 index 68174b2..0000000 --- a/recipes/install_desktop_43_encrypted_hw_ga.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# An install recipe for desktop, server, or hypervisor - -%include fragments/core/base.ks -%include fragments/storage/standard.ks -%include fragments/core/locale.ks -%include fragments/core/services.ks -%include fragments/core/network.ks -%include fragments/packages/core-group.ks -%include fragments/packages/fedora-remix.ks -%include fragments/packages/hand-picked.ks -%include fragments/desktop/gnome/config.ks -%include fragments/desktop/gnome/packages.ks -%include fragments/desktop/gnome/post-scripts.ks -%include fragments/bootloader/grub.ks -%include fragments/initial-setup/server/config.ks -%include fragments/core/security/enabled.ks -%include fragments/storage/encrypted.ks -%include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_rawhide_encrypted.cfg b/recipes/install_desktop_encrypted_43.cfg similarity index 92% rename from recipes/install_desktop_rawhide_encrypted.cfg rename to recipes/install_desktop_encrypted_43.cfg index 6fbd956..71209b9 100644 --- a/recipes/install_desktop_rawhide_encrypted.cfg +++ b/recipes/install_desktop_encrypted_43.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -22,4 +21,4 @@ %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks %include fragments/storage/encrypted.ks -%include fragments/repo/rawhide-mirrors.ks \ No newline at end of file +%include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_rawhide_encrypted_ga.cfg b/recipes/install_desktop_encrypted_hardware-support_43.cfg similarity index 92% rename from recipes/install_desktop_rawhide_encrypted_ga.cfg rename to recipes/install_desktop_encrypted_hardware-support_43.cfg index 6fbd956..71209b9 100644 --- a/recipes/install_desktop_rawhide_encrypted_ga.cfg +++ b/recipes/install_desktop_encrypted_hardware-support_43.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -22,4 +21,4 @@ %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks %include fragments/storage/encrypted.ks -%include fragments/repo/rawhide-mirrors.ks \ No newline at end of file +%include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_rawhide_encrypted_hw.cfg b/recipes/install_desktop_encrypted_hardware-support_rawhide.cfg similarity index 92% rename from recipes/install_desktop_rawhide_encrypted_hw.cfg rename to recipes/install_desktop_encrypted_hardware-support_rawhide.cfg index 6fbd956..8de4589 100644 --- a/recipes/install_desktop_rawhide_encrypted_hw.cfg +++ b/recipes/install_desktop_encrypted_hardware-support_rawhide.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks diff --git a/recipes/install_desktop_rawhide_encrypted_hw_ga.cfg b/recipes/install_desktop_encrypted_rawhide.cfg similarity index 92% rename from recipes/install_desktop_rawhide_encrypted_hw_ga.cfg rename to recipes/install_desktop_encrypted_rawhide.cfg index 6fbd956..8de4589 100644 --- a/recipes/install_desktop_rawhide_encrypted_hw_ga.cfg +++ b/recipes/install_desktop_encrypted_rawhide.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks diff --git a/recipes/install_desktop_43_ga.cfg b/recipes/install_desktop_hardware-support_43.cfg similarity index 95% rename from recipes/install_desktop_43_ga.cfg rename to recipes/install_desktop_hardware-support_43.cfg index 3151b28..3897012 100644 --- a/recipes/install_desktop_43_ga.cfg +++ b/recipes/install_desktop_hardware-support_43.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -21,4 +20,5 @@ %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks +%include fragments/storage/standard.ks %include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_rawhide_hw.cfg b/recipes/install_desktop_hardware-support_rawhide.cfg similarity index 95% rename from recipes/install_desktop_rawhide_hw.cfg rename to recipes/install_desktop_hardware-support_rawhide.cfg index 168184b..78a7410 100644 --- a/recipes/install_desktop_rawhide_hw.cfg +++ b/recipes/install_desktop_hardware-support_rawhide.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -21,4 +20,5 @@ %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks +%include fragments/storage/standard.ks %include fragments/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_rawhide.cfg b/recipes/install_desktop_rawhide.cfg index 168184b..78a7410 100644 --- a/recipes/install_desktop_rawhide.cfg +++ b/recipes/install_desktop_rawhide.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -21,4 +20,5 @@ %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks +%include fragments/storage/standard.ks %include fragments/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/install_hypervisor_amdcpu_43_hw.cfg b/recipes/install_hypervisor_amdcpu_hardware-support_43.cfg similarity index 96% rename from recipes/install_hypervisor_amdcpu_43_hw.cfg rename to recipes/install_hypervisor_amdcpu_hardware-support_43.cfg index be6999e..2dbac46 100644 --- a/recipes/install_hypervisor_amdcpu_43_hw.cfg +++ b/recipes/install_hypervisor_amdcpu_hardware-support_43.cfg @@ -8,13 +8,13 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks %include fragments/packages/core-group.ks %include fragments/packages/fedora-remix.ks %include fragments/packages/hand-picked.ks +%include fragments/storage/standard.ks %include fragments/bootloader/grub.ks %include fragments/hypervisor/base/packages.ks %include fragments/hypervisor/base/services.ks diff --git a/recipes/install_hypervisor_intelcpu_43_hw.cfg b/recipes/install_hypervisor_intelcpu_hardware-support_43.cfg similarity index 95% rename from recipes/install_hypervisor_intelcpu_43_hw.cfg rename to recipes/install_hypervisor_intelcpu_hardware-support_43.cfg index a0413fd..61016cf 100644 --- a/recipes/install_hypervisor_intelcpu_43_hw.cfg +++ b/recipes/install_hypervisor_intelcpu_hardware-support_43.cfg @@ -8,13 +8,13 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks %include fragments/packages/core-group.ks %include fragments/packages/fedora-remix.ks %include fragments/packages/hand-picked.ks +%include fragments/storage/standard.ks %include fragments/bootloader/grub.ks %include fragments/hypervisor/base/packages.ks %include fragments/hypervisor/base/services.ks diff --git a/recipes/install_desktop_43_hw.cfg b/recipes/install_virtual_desktop_43.cfg similarity index 95% rename from recipes/install_desktop_43_hw.cfg rename to recipes/install_virtual_desktop_43.cfg index 3151b28..3897012 100644 --- a/recipes/install_desktop_43_hw.cfg +++ b/recipes/install_virtual_desktop_43.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -21,4 +20,5 @@ %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks +%include fragments/storage/standard.ks %include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_virtual_desktop_encrypted_43.cfg b/recipes/install_virtual_desktop_encrypted_43.cfg new file mode 100644 index 0000000..71209b9 --- /dev/null +++ b/recipes/install_virtual_desktop_encrypted_43.cfg @@ -0,0 +1,24 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# An install recipe for desktop, server, or hypervisor + +%include fragments/core/base.ks +%include fragments/core/locale.ks +%include fragments/core/services.ks +%include fragments/core/network.ks +%include fragments/packages/core-group.ks +%include fragments/packages/fedora-remix.ks +%include fragments/packages/hand-picked.ks +%include fragments/desktop/gnome/config.ks +%include fragments/desktop/gnome/packages.ks +%include fragments/desktop/gnome/post-scripts.ks +%include fragments/bootloader/grub.ks +%include fragments/initial-setup/server/config.ks +%include fragments/core/security/enabled.ks +%include fragments/storage/encrypted.ks +%include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_virtual_desktop_encrypted_hardware-support_43.cfg b/recipes/install_virtual_desktop_encrypted_hardware-support_43.cfg new file mode 100644 index 0000000..71209b9 --- /dev/null +++ b/recipes/install_virtual_desktop_encrypted_hardware-support_43.cfg @@ -0,0 +1,24 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# An install recipe for desktop, server, or hypervisor + +%include fragments/core/base.ks +%include fragments/core/locale.ks +%include fragments/core/services.ks +%include fragments/core/network.ks +%include fragments/packages/core-group.ks +%include fragments/packages/fedora-remix.ks +%include fragments/packages/hand-picked.ks +%include fragments/desktop/gnome/config.ks +%include fragments/desktop/gnome/packages.ks +%include fragments/desktop/gnome/post-scripts.ks +%include fragments/bootloader/grub.ks +%include fragments/initial-setup/server/config.ks +%include fragments/core/security/enabled.ks +%include fragments/storage/encrypted.ks +%include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_virtual_desktop_encrypted_hardware-support_rawhide.cfg b/recipes/install_virtual_desktop_encrypted_hardware-support_rawhide.cfg new file mode 100644 index 0000000..8de4589 --- /dev/null +++ b/recipes/install_virtual_desktop_encrypted_hardware-support_rawhide.cfg @@ -0,0 +1,24 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# An install recipe for desktop, server, or hypervisor + +%include fragments/core/base.ks +%include fragments/core/locale.ks +%include fragments/core/services.ks +%include fragments/core/network.ks +%include fragments/packages/core-group.ks +%include fragments/packages/fedora-remix.ks +%include fragments/packages/hand-picked.ks +%include fragments/desktop/gnome/config.ks +%include fragments/desktop/gnome/packages.ks +%include fragments/desktop/gnome/post-scripts.ks +%include fragments/bootloader/grub.ks +%include fragments/initial-setup/server/config.ks +%include fragments/core/security/enabled.ks +%include fragments/storage/encrypted.ks +%include fragments/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/install_virtual_desktop_encrypted_rawhide.cfg b/recipes/install_virtual_desktop_encrypted_rawhide.cfg new file mode 100644 index 0000000..8de4589 --- /dev/null +++ b/recipes/install_virtual_desktop_encrypted_rawhide.cfg @@ -0,0 +1,24 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# An install recipe for desktop, server, or hypervisor + +%include fragments/core/base.ks +%include fragments/core/locale.ks +%include fragments/core/services.ks +%include fragments/core/network.ks +%include fragments/packages/core-group.ks +%include fragments/packages/fedora-remix.ks +%include fragments/packages/hand-picked.ks +%include fragments/desktop/gnome/config.ks +%include fragments/desktop/gnome/packages.ks +%include fragments/desktop/gnome/post-scripts.ks +%include fragments/bootloader/grub.ks +%include fragments/initial-setup/server/config.ks +%include fragments/core/security/enabled.ks +%include fragments/storage/encrypted.ks +%include fragments/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_43_hw_ga.cfg b/recipes/install_virtual_desktop_hardware-support_43.cfg similarity index 95% rename from recipes/install_desktop_43_hw_ga.cfg rename to recipes/install_virtual_desktop_hardware-support_43.cfg index 3151b28..3897012 100644 --- a/recipes/install_desktop_43_hw_ga.cfg +++ b/recipes/install_virtual_desktop_hardware-support_43.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -21,4 +20,5 @@ %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks +%include fragments/storage/standard.ks %include fragments/repo/fedora-43-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_rawhide_hw_ga.cfg b/recipes/install_virtual_desktop_hardware-support_rawhide.cfg similarity index 95% rename from recipes/install_desktop_rawhide_hw_ga.cfg rename to recipes/install_virtual_desktop_hardware-support_rawhide.cfg index 168184b..78a7410 100644 --- a/recipes/install_desktop_rawhide_hw_ga.cfg +++ b/recipes/install_virtual_desktop_hardware-support_rawhide.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -21,4 +20,5 @@ %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks +%include fragments/storage/standard.ks %include fragments/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/install_desktop_rawhide_ga.cfg b/recipes/install_virtual_desktop_rawhide.cfg similarity index 95% rename from recipes/install_desktop_rawhide_ga.cfg rename to recipes/install_virtual_desktop_rawhide.cfg index 168184b..78a7410 100644 --- a/recipes/install_desktop_rawhide_ga.cfg +++ b/recipes/install_virtual_desktop_rawhide.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -21,4 +20,5 @@ %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks +%include fragments/storage/standard.ks %include fragments/repo/rawhide-mirrors.ks \ No newline at end of file diff --git a/recipes/install_hypervisor-desktop_amdcpu_43_ga.cfg b/recipes/install_virtual_hypervisor-desktop_amdcpu_43.cfg similarity index 96% rename from recipes/install_hypervisor-desktop_amdcpu_43_ga.cfg rename to recipes/install_virtual_hypervisor-desktop_amdcpu_43.cfg index 8baeed7..dd10c46 100644 --- a/recipes/install_hypervisor-desktop_amdcpu_43_ga.cfg +++ b/recipes/install_virtual_hypervisor-desktop_amdcpu_43.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -18,6 +17,7 @@ %include fragments/desktop/gnome/config.ks %include fragments/desktop/gnome/packages.ks %include fragments/desktop/gnome/post-scripts.ks +%include fragments/storage/standard.ks %include fragments/bootloader/grub.ks %include fragments/packages/virtual-machine-manager/packages.ks %include fragments/packages/virtual-machine-manager/post-scripts.ks diff --git a/recipes/install_hypervisor-desktop_intelcpu_43_ga.cfg b/recipes/install_virtual_hypervisor-desktop_intelcpu_43.cfg similarity index 96% rename from recipes/install_hypervisor-desktop_intelcpu_43_ga.cfg rename to recipes/install_virtual_hypervisor-desktop_intelcpu_43.cfg index 9c32372..414df2b 100644 --- a/recipes/install_hypervisor-desktop_intelcpu_43_ga.cfg +++ b/recipes/install_virtual_hypervisor-desktop_intelcpu_43.cfg @@ -8,7 +8,6 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks @@ -18,6 +17,7 @@ %include fragments/desktop/gnome/config.ks %include fragments/desktop/gnome/packages.ks %include fragments/desktop/gnome/post-scripts.ks +%include fragments/storage/standard.ks %include fragments/bootloader/grub.ks %include fragments/packages/virtual-machine-manager/packages.ks %include fragments/packages/virtual-machine-manager/post-scripts.ks diff --git a/recipes/install_server_43_ga.cfg b/recipes/install_virtual_server_43.cfg similarity index 95% rename from recipes/install_server_43_ga.cfg rename to recipes/install_virtual_server_43.cfg index 2247500..50cd5e4 100644 --- a/recipes/install_server_43_ga.cfg +++ b/recipes/install_virtual_server_43.cfg @@ -8,13 +8,13 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks %include fragments/packages/core-group.ks %include fragments/packages/fedora-remix.ks %include fragments/packages/hand-picked.ks +%include fragments/storage/standard.ks %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks diff --git a/recipes/install_server_rawhide_ga.cfg b/recipes/install_virtual_server_rawhide.cfg similarity index 95% rename from recipes/install_server_rawhide_ga.cfg rename to recipes/install_virtual_server_rawhide.cfg index d87c5e3..ffa8881 100644 --- a/recipes/install_server_rawhide_ga.cfg +++ b/recipes/install_virtual_server_rawhide.cfg @@ -8,13 +8,13 @@ # An install recipe for desktop, server, or hypervisor %include fragments/core/base.ks -%include fragments/storage/standard.ks %include fragments/core/locale.ks %include fragments/core/services.ks %include fragments/core/network.ks %include fragments/packages/core-group.ks %include fragments/packages/fedora-remix.ks %include fragments/packages/hand-picked.ks +%include fragments/storage/standard.ks %include fragments/bootloader/grub.ks %include fragments/initial-setup/server/config.ks %include fragments/core/security/enabled.ks diff --git a/recipes/live_desktop_43_hw.cfg b/recipes/live_desktop_hardware-support_43.cfg similarity index 100% rename from recipes/live_desktop_43_hw.cfg rename to recipes/live_desktop_hardware-support_43.cfg diff --git a/recipes/live_server_43_hw.cfg b/recipes/live_server_hardware-support_43.cfg similarity index 100% rename from recipes/live_server_43_hw.cfg rename to recipes/live_server_hardware-support_43.cfg diff --git a/tests/__pycache__/test_recipe_generator.cpython-314-pytest-8.4.2.pyc b/tests/__pycache__/test_recipe_generator.cpython-314-pytest-8.4.2.pyc index 04fff7b08bec62163d60c9885b441714fe789d60..1d1a0e493f25d082ed7dbcbf038f6786f976a462 100644 GIT binary patch delta 175 zcmeA@!_>KpiBFr4mx}=i+)R#Us_Sp$%VlJ|G`WWHG*5|A7(pol?5fKDe*;#loIMw!nHAQG$=0A}Pe+W-In delta 1456 zcmb_cUr19?7(Zv*)w}67uPdr)b8SspniN`~nb2ew1XjbOq*&|jsKdEy=U%fvqAPl+ zC`!&lkReGy2nB{OrB6Qel#n@@wV-D>0xmc5x>GhL8Ehl1 zxb&XBNER@&P`v9MZ}GKD&|R#}NPM_OdeYfKLV ztmW{`?gwz8A{0jrsBS$%9XJ3P9a?@iO{rK|YfvQ^XHi@zLI>;!8Ic18up8~vN3d6y z%1-A{KZH|4ROupgNJr~|krE=R+DX{kc6@GxgE=e{{<+cvgqZkAVd$?3xE_(eN= z-z^r{gBhWI_lC`NdjkT^0SX=AP|M*Mhb91304R3Cpk}aA9u2ykdE2VQQ34_O_$XF(XyIlB%9oC#3yXvfl9W68XMK(RW>iS`$`oCau01am7q< z|Khu;#hu5O6n(&3a7}}qK?N5(*i-Odgjk#@#HCNWOp9V0Id@74(eVFKBFOizN;EAc zQBOq>G&N!NCSKN*@pZaFG!}`q{6&2_pf6LO|5@|!kz3XGc0SxaxcmN|q;30H^Bgr} z)^u^>UJDPE#|i%?p;giUB%xKue*Q^9RSBt%O9*mIYou;%mnu@ zzMERyRrr&lA9xF{X|OY>;G%hug%?x)_pJ98GsB&i*;L~7uV<5Yj^d}x+yB7xHP;{% ze$CYjwfLJ!FVx{Lh~qq&@*a8DPzU?iKWZukDoms{v7x(%rA|Gr!?S39nLqstou0Tk diff --git a/tests/test_recipe_generator.py b/tests/test_recipe_generator.py index 1ff1302..2c4bbff 100644 --- a/tests/test_recipe_generator.py +++ b/tests/test_recipe_generator.py @@ -167,7 +167,7 @@ class TestRecipeGenerator: desktop='gnome', storage='encrypted', security='secure') - assert filename == 'install_rawhide_encrypted.cfg' + assert filename == 'install_encrypted_rawhide.cfg' def test_filename_generation_devel(self): """Test filename generation for development mode.""" @@ -175,7 +175,7 @@ class TestRecipeGenerator: desktop='gnome', storage='standard', security='off') - assert filename == 'install_43_devel.cfg' + assert filename == 'install_devel_43.cfg' def test_filename_generation_hypervisor(self): """Test filename generation for hypervisor.""" @@ -246,13 +246,3 @@ part / --fstype="ext4" --grow content = "" issues = self.generator.validate_recipe_semantic(content, '43') assert issues == [] - - def test_check_deprecated_removed_command(self): - """Test detection of removed commands.""" - issues = self.generator._check_deprecated_commands("authconfig") - assert any('removed' in issue.lower() for issue in issues) - - def test_check_deprecated_warning_command(self): - """Test detection of deprecated commands.""" - issues = self.generator._check_deprecated_commands("keyboard") - assert any('deprecated' in issue.lower() for issue in issues)