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.
This commit is contained in:
Lukas Greve
2026-03-26 14:29:22 +01:00
parent d93e84cb09
commit 8f824cb977
55 changed files with 126 additions and 238 deletions
+1 -1
View File
@@ -807,7 +807,7 @@ ERROR: Missing fragment: fragments/shared/unknown/missing.ks
keyboard command is deprecated. Use keyboard --vckeymap instead. 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** **4. pykickstart validation fails**
@@ -37,9 +37,6 @@ clearpart --all --initlabel
# Disk partitioning information # Disk partitioning information
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi"
part /boot --fstype="ext4" --size=2048 --label="boot" 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" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit"
%post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log
@@ -37,9 +37,6 @@ clearpart --all --initlabel
# Disk partitioning information # Disk partitioning information
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi"
part /boot --fstype="ext4" --size=2048 --label="boot" 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" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit"
%post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log
@@ -36,9 +36,6 @@ clearpart --all --initlabel
# Disk partitioning information # Disk partitioning information
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi"
part /boot --fstype="ext4" --size=2048 --label="boot" 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" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit"
%post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log
@@ -36,9 +36,6 @@ clearpart --all --initlabel
# Disk partitioning information # Disk partitioning information
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi"
part /boot --fstype="ext4" --size=2048 --label="boot" 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" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit"
%post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log
@@ -37,9 +37,6 @@ clearpart --all --initlabel
# Disk partitioning information # Disk partitioning information
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi"
part /boot --fstype="ext4" --size=2048 --label="boot" 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" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit"
%post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log
@@ -37,9 +37,6 @@ clearpart --all --initlabel
# Disk partitioning information # Disk partitioning information
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi"
part /boot --fstype="ext4" --size=2048 --label="boot" 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" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit"
%post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log
@@ -36,9 +36,6 @@ clearpart --all --initlabel
# Disk partitioning information # Disk partitioning information
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi"
part /boot --fstype="ext4" --size=2048 --label="boot" 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" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit"
%post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log
@@ -36,9 +36,6 @@ clearpart --all --initlabel
# Disk partitioning information # Disk partitioning information
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi" part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label="efi"
part /boot --fstype="ext4" --size=2048 --label="boot" 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" part / --fstype="ext4" --grow --label="root" --encrypted --mkfsoptions="-O encrypt,fast_commit"
%post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log %post --nochroot --logfile=/mnt/sysimage/root/gnome-desktop-post.log
+11 -81
View File
@@ -15,41 +15,6 @@ from typing import Dict, List, Optional
import yaml import yaml
# Deprecated/removed command mappings for Fedora 43 (F42) and rawhide
DEPRECATED_COMMANDS: Dict[str, Dict[str, str]] = {
'authconfig': {
'status': 'removed',
'removed_in': 'F34',
'alternative': 'authselect',
'message': 'authconfig was removed in Fedora 34. Use authselect instead.'
},
'keyboard': {
'status': 'deprecated',
'deprecated_in': 'F18',
'alternative': 'keyboard --vckeymap',
'message': 'keyboard command is deprecated. Use keyboard --vckeymap instead.'
},
'langsupport': {
'status': 'deprecated',
'deprecated_in': 'F21',
'alternative': 'lang',
'message': 'langsupport is deprecated. Use lang command instead.'
},
'nfs': {
'status': 'deprecated',
'deprecated_in': 'F23',
'alternative': 'repo --name=nfs',
'message': 'nfs command is deprecated. Use repo command instead.'
},
'parted': {
'status': 'deprecated',
'deprecated_in': 'F13',
'alternative': 'part',
'message': 'parted command is deprecated. Use part command instead.'
},
}
def _import_pykickstart(): # noqa: PLC0415 - Import for optional dependency def _import_pykickstart(): # noqa: PLC0415 - Import for optional dependency
"""Import pykickstart modules, returns None if not available.""" """Import pykickstart modules, returns None if not available."""
try: try:
@@ -437,42 +402,6 @@ class RecipeGenerator:
except Exception as e: # noqa: BLE001 - Catch all for unexpected parser errors except Exception as e: # noqa: BLE001 - Catch all for unexpected parser errors
issues.append(f"Unexpected error during parsing: {str(e)}") issues.append(f"Unexpected error during parsing: {str(e)}")
# Check for deprecated commands in the content
if isinstance(source, str):
issues.extend(self._check_deprecated_commands(source))
return issues
def _check_deprecated_commands(self, content: str) -> 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 return issues
def extract_version(self, content: str, filename: str) -> Optional[str]: 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: def generate_filename(self, recipe_type: str, version: str, **modifiers) -> str:
"""Generate recipe filename from parameters.""" """Generate recipe filename from parameters."""
# Extract variant subname if present # Extract variant subname if present
variant_subname = modifiers.get('variant_subname', '') variant_subname = modifiers.get('variant_subname', '')
if not variant_subname: if not variant_subname:
@@ -513,7 +443,11 @@ class RecipeGenerator:
# Build base parts # Build base parts
parts = [recipe_type.replace('_', '-')] 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 # Add variant_subname for install variants
if variant_subname and variant_subname in ['desktop', 'server', 'hypervisor', 'hypervisor-desktop']: if variant_subname and variant_subname in ['desktop', 'server', 'hypervisor', 'hypervisor-desktop']:
parts.append(variant_subname) parts.append(variant_subname)
@@ -532,9 +466,6 @@ class RecipeGenerator:
if modifiers.get('desktop') and modifiers['desktop'] != 'gnome': if modifiers.get('desktop') and modifiers['desktop'] != 'gnome':
parts.append(modifiers['desktop']) parts.append(modifiers['desktop'])
# Add version
parts.append(str(version))
# Add security suffix (devel only, since secure is default) # Add security suffix (devel only, since secure is default)
if modifiers.get('security') == 'off': if modifiers.get('security') == 'off':
parts.append('devel') parts.append('devel')
@@ -543,14 +474,13 @@ class RecipeGenerator:
if modifiers.get('storage') == 'encrypted': if modifiers.get('storage') == 'encrypted':
parts.append('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: if modifiers.get('hardware-support') is True:
parts.append('hw') parts.append('hardware-support')
# Add guest-agents suffix (ga when enabled)
if modifiers.get('guest-agents') is True:
parts.append('ga')
# Add version
parts.append(str(version))
return '_'.join(parts) + '.cfg' return '_'.join(parts) + '.cfg'
+1 -1
View File
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -21,4 +20,5 @@
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/standard.ks
%include fragments/repo/fedora-43-mirrors.ks %include fragments/repo/fedora-43-mirrors.ks
-25
View File
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -22,4 +21,4 @@
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/encrypted.ks %include fragments/storage/encrypted.ks
%include fragments/repo/rawhide-mirrors.ks %include fragments/repo/fedora-43-mirrors.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -22,4 +21,4 @@
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/encrypted.ks %include fragments/storage/encrypted.ks
%include fragments/repo/rawhide-mirrors.ks %include fragments/repo/fedora-43-mirrors.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -21,4 +20,5 @@
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/standard.ks
%include fragments/repo/fedora-43-mirrors.ks %include fragments/repo/fedora-43-mirrors.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -21,4 +20,5 @@
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/standard.ks
%include fragments/repo/rawhide-mirrors.ks %include fragments/repo/rawhide-mirrors.ks
+1 -1
View File
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -21,4 +20,5 @@
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/standard.ks
%include fragments/repo/rawhide-mirrors.ks %include fragments/repo/rawhide-mirrors.ks
@@ -8,13 +8,13 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
%include fragments/packages/core-group.ks %include fragments/packages/core-group.ks
%include fragments/packages/fedora-remix.ks %include fragments/packages/fedora-remix.ks
%include fragments/packages/hand-picked.ks %include fragments/packages/hand-picked.ks
%include fragments/storage/standard.ks
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/hypervisor/base/packages.ks %include fragments/hypervisor/base/packages.ks
%include fragments/hypervisor/base/services.ks %include fragments/hypervisor/base/services.ks
@@ -8,13 +8,13 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
%include fragments/packages/core-group.ks %include fragments/packages/core-group.ks
%include fragments/packages/fedora-remix.ks %include fragments/packages/fedora-remix.ks
%include fragments/packages/hand-picked.ks %include fragments/packages/hand-picked.ks
%include fragments/storage/standard.ks
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/hypervisor/base/packages.ks %include fragments/hypervisor/base/packages.ks
%include fragments/hypervisor/base/services.ks %include fragments/hypervisor/base/services.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -21,4 +20,5 @@
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/standard.ks
%include fragments/repo/fedora-43-mirrors.ks %include fragments/repo/fedora-43-mirrors.ks
@@ -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
@@ -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
@@ -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
@@ -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
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -21,4 +20,5 @@
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/standard.ks
%include fragments/repo/fedora-43-mirrors.ks %include fragments/repo/fedora-43-mirrors.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -21,4 +20,5 @@
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/standard.ks
%include fragments/repo/rawhide-mirrors.ks %include fragments/repo/rawhide-mirrors.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -21,4 +20,5 @@
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
%include fragments/storage/standard.ks
%include fragments/repo/rawhide-mirrors.ks %include fragments/repo/rawhide-mirrors.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -18,6 +17,7 @@
%include fragments/desktop/gnome/config.ks %include fragments/desktop/gnome/config.ks
%include fragments/desktop/gnome/packages.ks %include fragments/desktop/gnome/packages.ks
%include fragments/desktop/gnome/post-scripts.ks %include fragments/desktop/gnome/post-scripts.ks
%include fragments/storage/standard.ks
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/packages/virtual-machine-manager/packages.ks %include fragments/packages/virtual-machine-manager/packages.ks
%include fragments/packages/virtual-machine-manager/post-scripts.ks %include fragments/packages/virtual-machine-manager/post-scripts.ks
@@ -8,7 +8,6 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
@@ -18,6 +17,7 @@
%include fragments/desktop/gnome/config.ks %include fragments/desktop/gnome/config.ks
%include fragments/desktop/gnome/packages.ks %include fragments/desktop/gnome/packages.ks
%include fragments/desktop/gnome/post-scripts.ks %include fragments/desktop/gnome/post-scripts.ks
%include fragments/storage/standard.ks
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/packages/virtual-machine-manager/packages.ks %include fragments/packages/virtual-machine-manager/packages.ks
%include fragments/packages/virtual-machine-manager/post-scripts.ks %include fragments/packages/virtual-machine-manager/post-scripts.ks
@@ -8,13 +8,13 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
%include fragments/packages/core-group.ks %include fragments/packages/core-group.ks
%include fragments/packages/fedora-remix.ks %include fragments/packages/fedora-remix.ks
%include fragments/packages/hand-picked.ks %include fragments/packages/hand-picked.ks
%include fragments/storage/standard.ks
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
@@ -8,13 +8,13 @@
# An install recipe for desktop, server, or hypervisor # An install recipe for desktop, server, or hypervisor
%include fragments/core/base.ks %include fragments/core/base.ks
%include fragments/storage/standard.ks
%include fragments/core/locale.ks %include fragments/core/locale.ks
%include fragments/core/services.ks %include fragments/core/services.ks
%include fragments/core/network.ks %include fragments/core/network.ks
%include fragments/packages/core-group.ks %include fragments/packages/core-group.ks
%include fragments/packages/fedora-remix.ks %include fragments/packages/fedora-remix.ks
%include fragments/packages/hand-picked.ks %include fragments/packages/hand-picked.ks
%include fragments/storage/standard.ks
%include fragments/bootloader/grub.ks %include fragments/bootloader/grub.ks
%include fragments/initial-setup/server/config.ks %include fragments/initial-setup/server/config.ks
%include fragments/core/security/enabled.ks %include fragments/core/security/enabled.ks
+2 -12
View File
@@ -167,7 +167,7 @@ class TestRecipeGenerator:
desktop='gnome', desktop='gnome',
storage='encrypted', storage='encrypted',
security='secure') security='secure')
assert filename == 'install_rawhide_encrypted.cfg' assert filename == 'install_encrypted_rawhide.cfg'
def test_filename_generation_devel(self): def test_filename_generation_devel(self):
"""Test filename generation for development mode.""" """Test filename generation for development mode."""
@@ -175,7 +175,7 @@ class TestRecipeGenerator:
desktop='gnome', desktop='gnome',
storage='standard', storage='standard',
security='off') security='off')
assert filename == 'install_43_devel.cfg' assert filename == 'install_devel_43.cfg'
def test_filename_generation_hypervisor(self): def test_filename_generation_hypervisor(self):
"""Test filename generation for hypervisor.""" """Test filename generation for hypervisor."""
@@ -246,13 +246,3 @@ part / --fstype="ext4" --grow
content = "" content = ""
issues = self.generator.validate_recipe_semantic(content, '43') issues = self.generator.validate_recipe_semantic(content, '43')
assert issues == [] 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)