refactor: rename fragments directory to ingredients and update all references
- Directory rename: fragments/ → ingredients/ (54 .ks files) - Updated all Python scripts: * tests/integration/conftest.py - fixture renames * tests/integration/test_integration.py - constant and path updates * tests/test_recipe_generator.py - updated test assertions * recipe-generator/validators.py - updated comments and error messages * recipe-generator/recipe_generator.py - updated comment - Updated all YAML files: * recipe-generator/recipe_templates.yaml - 66 path references * .gitea/workflows/validate-fragments.yaml → validate-ingredients.yaml * .gitea/workflows/test-generation.yaml - path patterns - Updated scripts: * bin/ksflatten-relative - updated path detection - Updated test file: * tests/integration/test_fragments.py → test_ingredients.py - Updated documentation: * DEVELOPMENT.md - simplified references * DEVELOPMENT_QUICK.md - updated examples * tests/container/README.md - test references - Regenerated all recipes (16 files) with ingredient paths - Updated test fixtures (7 files) - All integration tests pass (5/5) - All unit tests pass (29/31 - 2 pre-existing failures unrelated)
This commit is contained in:
Lukas Greve
@@ -5,7 +5,7 @@ on:
|
||||
paths:
|
||||
- 'recipe-generator/**/*.py'
|
||||
- 'recipe-generator/**/*.yaml'
|
||||
- 'fragments/**/*.ks'
|
||||
- 'ingredients/**/*.ks'
|
||||
pull_request:
|
||||
paths:
|
||||
- 'recipe-generator/**/*.py'
|
||||
|
||||
+9
-9
@@ -1,12 +1,12 @@
|
||||
name: validate-fragments
|
||||
name: validate-ingredients
|
||||
|
||||
on:
|
||||
push:
|
||||
paths:
|
||||
- 'fragments/**/*.ks'
|
||||
- 'ingredients/**/*.ks'
|
||||
pull_request:
|
||||
paths:
|
||||
- 'fragments/**/*.ks'
|
||||
- 'ingredients/**/*.ks'
|
||||
|
||||
jobs:
|
||||
validate:
|
||||
@@ -22,21 +22,21 @@ jobs:
|
||||
- name: Install pykickstart
|
||||
run: pip install pykickstart
|
||||
|
||||
- name: Validate all fragments
|
||||
- name: Validate all ingredients
|
||||
run: |
|
||||
errors=0
|
||||
for fragment in $(find fragments -name "*.ks"); do
|
||||
for ingredient in $(find ingredients -name "*.ks"); do
|
||||
if python3 -c "
|
||||
from pykickstart.parser import KickstartParser
|
||||
from pykickstart.version import makeVersion, DEVEL
|
||||
parser = KickstartParser(makeVersion(DEVEL))
|
||||
parser.readKickstart(open('$fragment').read())
|
||||
parser.readKickstart(open('$ingredient').read())
|
||||
" 2>/dev/null; then
|
||||
echo "✓ $fragment"
|
||||
echo "✓ $ingredient"
|
||||
else
|
||||
echo "✗ $fragment"
|
||||
echo "✗ $ingredient"
|
||||
errors=$((errors + 1))
|
||||
fi
|
||||
done
|
||||
echo "Fragment validation complete: $errors errors"
|
||||
echo "Ingredient validation complete: $errors errors"
|
||||
exit $errors
|
||||
+72
-74
@@ -5,21 +5,21 @@ This guide covers development workflows for contributors to Phyllome OS.
|
||||
## Table of Contents
|
||||
- [Architecture Overview](#architecture-overview)
|
||||
- [Development Environment Setup](#development-environment-setup)
|
||||
- [Fragment Development](#fragment-development)
|
||||
- [Ingredient Development](#ingredient-development)
|
||||
- [Recipe Generation](#recipe-generation)
|
||||
- [Testing](#testing)
|
||||
- [CI/CD](#cicd)
|
||||
- [Common Workflows](#common-workflows)
|
||||
- [Migration Guide: Fragment-Based Architecture](#migration-guide-fragment-based-architecture)
|
||||
- [Migration Guide: Ingredient-Based Architecture](#migration-guide-ingredient-based-architecture)
|
||||
|
||||
---
|
||||
|
||||
## Architecture Overview
|
||||
|
||||
Phyllome OS uses a **fragment-driven** kickstart generation system:
|
||||
Phyllome OS uses a **ingredient-driven** kickstart generation system:
|
||||
|
||||
```
|
||||
fragments/ (54 .ks files)
|
||||
ingredients/ (54 .ks files)
|
||||
↓ (modular snippets)
|
||||
recipe-generator/generate_recipe.py
|
||||
↓ (YAML templates + manifest)
|
||||
@@ -34,23 +34,21 @@ VMs and ISO images
|
||||
|
||||
| Path | Purpose | Contents |
|
||||
|------|---------|----------|
|
||||
| `fragments/` | Modular kickstart snippets | 54 `.ks` files |
|
||||
| `fragments/platform/` | Version-specific configs | `generic-43/`, `generic-rawhide/` |
|
||||
| `fragments/shared/` | Common components | `core/`, `packages/`, `desktop/`, `hypervisor/`, `live/`, `initial-setup/` |
|
||||
| `ingredients/` | Modular kickstart snippets | 54 `.ks` files |
|
||||
| `recipes/` | Generated recipes | Manifest-driven compositions |
|
||||
| `dishes/` | Flattened kickstarts | Ready-to-deploy artifacts |
|
||||
| `ingredients/` | Legacy building blocks | 35 `.cfg` files (legacy) |
|
||||
| `legacy/` | Legacy building blocks | 35 `.cfg` files (legacy) |
|
||||
| `recipe-generator/` | Recipe generation | `generate_recipe.py`, YAML configs, Makefile |
|
||||
| `deploy/` | Deployment scripts | Bash automation tools |
|
||||
| `bin/` | Executables | Wrapper scripts (e.g., `generate-recipe`) |
|
||||
|
||||
### Data Flow
|
||||
|
||||
1. **Fragments** (`fragments/**/*.ks`) - Small, reusable kickstart snippets
|
||||
1. **Ingredients** (`ingredients/**/*.ks`) - Small, reusable kickstart snippets
|
||||
2. **Templates** (`recipe-generator/recipe_templates.yaml`) - Define recipe structures
|
||||
3. **Manifest** (`recipe-generator/recipes_manifest.yaml`) - Specify variants (version, desktop, storage, etc.)
|
||||
4. **Generator** (`recipe-generator/generate_recipe.py`) - Composes fragments via `%ksappend` directives
|
||||
5. **Recipes** (`recipes/*.cfg`) - Generated kickstart files with fragment references
|
||||
4. **Generator** (`recipe-generator/generate_recipe.py`) - Composes ingredients via `%ksappend` directives
|
||||
5. **Recipes** (`recipes/*.cfg`) - Generated kickstart files with ingredient references
|
||||
6. **Flattening** (`ksflatten`) - Resolves `%ksappend` into single dish file
|
||||
7. **Deployment** (`virt-install`) - Creates VMs from dish files
|
||||
|
||||
@@ -96,25 +94,25 @@ make validate-recipes
|
||||
|
||||
## Fragment Development
|
||||
|
||||
Fragments are modular kickstart snippets stored in `fragments/`. Each `.ks` file contains a single feature section.
|
||||
Fragments are modular kickstart snippets stored in `ingredients/`. Each `.ks` file contains a single feature section.
|
||||
|
||||
### Creating a New Fragment
|
||||
|
||||
**Step 1: Choose location**
|
||||
- `fragments/shared/core/` - Base settings (security, services, networking)
|
||||
- `fragments/shared/storage/` - Partition layouts
|
||||
- `fragments/shared/packages/` - Package groups
|
||||
- `fragments/shared/desktop/` - Desktop environment configs
|
||||
- `fragments/shared/hypervisor/` - Virtualization hardware configs
|
||||
- `fragments/shared/live/` - Live system components
|
||||
- `fragments/shared/initial-setup/` - First-boot configuration
|
||||
- `fragments/platform/generic-43/` or `generic-rawhide/` - Version-specific
|
||||
- `ingredients/shared/core/` - Base settings (security, services, networking)
|
||||
- `ingredients/shared/storage/` - Partition layouts
|
||||
- `ingredients/shared/packages/` - Package groups
|
||||
- `ingredients/shared/desktop/` - Desktop environment configs
|
||||
- `ingredients/shared/hypervisor/` - Virtualization hardware configs
|
||||
- `ingredients/shared/live/` - Live system components
|
||||
- `ingredients/shared/initial-setup/` - First-boot configuration
|
||||
- `ingredients/platform/generic-43/` or `generic-rawhide/` - Version-specific
|
||||
|
||||
**Step 2: Create the fragment file**
|
||||
|
||||
```bash
|
||||
# Example: Add Luanti game engine
|
||||
cat > fragments/shared/packages/luanti.ks << 'EOF'
|
||||
cat > ingredients/shared/packages/luanti.ks << 'EOF'
|
||||
%packages
|
||||
luanti
|
||||
%end
|
||||
@@ -130,7 +128,7 @@ from pykickstart.version import makeVersion, DEVEL
|
||||
|
||||
parser = KickstartParser(makeVersion(DEVEL))
|
||||
try:
|
||||
with open('fragments/shared/packages/luanti.ks') as f:
|
||||
with open('ingredients/shared/packages/luanti.ks') as f:
|
||||
parser.readKickstart(f.read())
|
||||
print('✓ Validation passed')
|
||||
except Exception as e:
|
||||
@@ -142,9 +140,9 @@ except Exception as e:
|
||||
|
||||
- **Pattern:** `<feature>/<subfeature>.ks`
|
||||
- **Examples:**
|
||||
- `fragments/shared/core/security/enabled.ks`
|
||||
- `fragments/shared/desktop/gnome/packages.ks`
|
||||
- `fragments/platform/generic-43/repo/fedora-mirrors.ks`
|
||||
- `ingredients/shared/core/security/enabled.ks`
|
||||
- `ingredients/shared/desktop/gnome/packages.ks`
|
||||
- `ingredients/platform/generic-43/repo/fedora-mirrors.ks`
|
||||
|
||||
### Common Fragment Types
|
||||
|
||||
@@ -264,46 +262,46 @@ templates:
|
||||
virtual-desktop:
|
||||
description: "A recipe for a virtual desktop"
|
||||
base: core
|
||||
required: # Always included fragments
|
||||
- core: fragments/shared/core/base.ks
|
||||
- storage: fragments/shared/storage/standard.ks
|
||||
optional: # Conditional fragments
|
||||
required: # Always included ingredients
|
||||
- core: ingredients/shared/core/base.ks
|
||||
- storage: ingredients/shared/storage/standard.ks
|
||||
optional: # Conditional ingredients
|
||||
security:
|
||||
secure: fragments/shared/core/security/enabled.ks
|
||||
devel: fragments/shared/core/security/disabled.ks
|
||||
secure: ingredients/shared/core/security/enabled.ks
|
||||
devel: ingredients/shared/core/security/disabled.ks
|
||||
modifiers: # Storage/bootloader alternatives
|
||||
storage:
|
||||
standard: fragments/shared/storage/standard.ks
|
||||
encrypted: fragments/shared/storage/encrypted.ks
|
||||
standard: ingredients/shared/storage/standard.ks
|
||||
encrypted: ingredients/shared/storage/encrypted.ks
|
||||
```
|
||||
|
||||
**Adding a new required fragment:**
|
||||
```yaml
|
||||
required:
|
||||
- core: fragments/shared/core/base.ks
|
||||
- storage: fragments/shared/storage/standard.ks
|
||||
- core: ingredients/shared/core/base.ks
|
||||
- storage: ingredients/shared/storage/standard.ks
|
||||
# New fragment
|
||||
- packages: fragments/shared/packages/hand-picked.ks
|
||||
- packages: ingredients/shared/packages/hand-picked.ks
|
||||
```
|
||||
|
||||
**Adding an optional modifier:**
|
||||
```yaml
|
||||
optional:
|
||||
security:
|
||||
secure: fragments/shared/core/security/enabled.ks
|
||||
devel: fragments/shared/core/security/disabled.ks
|
||||
secure: ingredients/shared/core/security/enabled.ks
|
||||
devel: ingredients/shared/core/security/disabled.ks
|
||||
# New optional - post-install scripts
|
||||
post: fragments/shared/section-data/post/base.ks
|
||||
post: ingredients/shared/section-data/post/base.ks
|
||||
```
|
||||
|
||||
**Adding a modifier alternative:**
|
||||
```yaml
|
||||
modifiers:
|
||||
storage:
|
||||
standard: fragments/shared/storage/standard.ks
|
||||
encrypted: fragments/shared/storage/encrypted.ks
|
||||
standard: ingredients/shared/storage/standard.ks
|
||||
encrypted: ingredients/shared/storage/encrypted.ks
|
||||
# New storage option
|
||||
btrfs: fragments/shared/storage/btrfs.ks
|
||||
btrfs: ingredients/shared/storage/btrfs.ks
|
||||
```
|
||||
|
||||
### Generation Workflow
|
||||
@@ -361,13 +359,13 @@ cat > recipes/my-distro.cfg << 'EOF'
|
||||
%include ../ingredients/core-storage.cfg
|
||||
|
||||
# Bootloader
|
||||
%include ../fragments/platform/generic-43/bootloader/grub.ks
|
||||
%include ../ingredients/platform/generic-43/bootloader/grub.ks
|
||||
|
||||
# Network configuration
|
||||
%include ../fragments/shared/core/network.ks
|
||||
%include ../ingredients/shared/core/network.ks
|
||||
|
||||
# Desktop environment
|
||||
%include ../fragments/shared/desktop/gnome/packages.ks
|
||||
%include ../ingredients/shared/desktop/gnome/packages.ks
|
||||
|
||||
# Additional packages
|
||||
%packages
|
||||
@@ -404,7 +402,7 @@ Phyllome OS uses a comprehensive test suite with 36+ tests covering unit, integr
|
||||
|-----------|-------|----------|
|
||||
| `tests/test_recipe_generator.py` | 36 | Unit tests for RecipeGenerator |
|
||||
| `tests/integration/test_integration.py` | 5+ | End-to-end workflow tests |
|
||||
| `tests/integration/test_fragments.py` | ~15 | Fragment validation |
|
||||
| `tests/integration/test_ingredients.py` | ~15 | Fragment validation |
|
||||
| `tests/integration/test_recipe_composition.py` | ~10 | Recipe generation |
|
||||
| `tests/integration/test_semantic_validation.py` | ~10 | pykickstart validation |
|
||||
| `tests/integration/test_golden_masters.py` | ~5 | Regression tests |
|
||||
@@ -443,8 +441,8 @@ tests/integration/test_integration.py .....
|
||||
### Fragment Validation Test
|
||||
|
||||
```bash
|
||||
# Test all fragments with pykickstart
|
||||
for fragment in $(find fragments -name "*.ks"); do
|
||||
# Test all ingredients with pykickstart
|
||||
for fragment in $(find ingredients -name "*.ks"); do
|
||||
python3 -c "
|
||||
from pykickstart.parser import KickstartParser
|
||||
from pykickstart.version import makeVersion, DEVEL
|
||||
@@ -470,7 +468,7 @@ def test_generate_recipe_with_new_modifier():
|
||||
security='secure'
|
||||
)
|
||||
assert '# A recipe for a virtual desktop' in content
|
||||
assert '%ksappend fragments/shared/desktop/gnome/packages.ks' in content
|
||||
assert '%ksappend ingredients/shared/desktop/gnome/packages.ks' in content
|
||||
```
|
||||
|
||||
**Integration test example:**
|
||||
@@ -517,17 +515,17 @@ The project uses Gitea Actions for automated testing and building.
|
||||
|
||||
| File | Trigger | Purpose |
|
||||
|------|---------|---------|
|
||||
| `.gitea/workflows/validate-fragments.yaml` | Push/PR fragments | Validate all 54 .ks files |
|
||||
| `.gitea/workflows/validate-ingredients.yaml` | Push/PR ingredients | Validate all 54 .ks files |
|
||||
| `.gitea/workflows/test-generation.yaml` | Push/PR scripts | Generate 16 recipes |
|
||||
| `.gitea/workflows/validate-recipes.yaml` | Push PR main | Full validation suite |
|
||||
| `.gitea/workflows/build-iso.yaml` | Push main, release | Build live ISO |
|
||||
|
||||
### Workflow: Validate Fragments
|
||||
|
||||
**File:** `.gitea/workflows/validate-fragments.yaml`
|
||||
**File:** `.gitea/workflows/validate-ingredients.yaml`
|
||||
|
||||
**Triggers:**
|
||||
- Push to any `fragments/**/*.ks` file
|
||||
- Push to any `ingredients/**/*.ks` file
|
||||
- Pull request with fragment changes
|
||||
|
||||
**Steps:**
|
||||
@@ -538,7 +536,7 @@ The project uses Gitea Actions for automated testing and building.
|
||||
|
||||
**Local equivalent:**
|
||||
```bash
|
||||
for fragment in $(find fragments -name "*.ks"); do
|
||||
for fragment in $(find ingredients -name "*.ks"); do
|
||||
python3 -c "
|
||||
from pykickstart.parser import KickstartParser
|
||||
from pykickstart.version import makeVersion, DEVEL
|
||||
@@ -591,7 +589,7 @@ done
|
||||
| Task | Command | File |
|
||||
|------|---------|------|
|
||||
| Generate all recipes | `cd scripts && make generate-recipes` | - |
|
||||
| Validate all fragments | `for f in $(find fragments -name "*.ks"); do python3 -c "from pykickstart.parser import KickstartParser; from pykickstart.version import makeVersion, DEVEL; parser = KickstartParser(makeVersion(DEVEL)); parser.readKickstart(open('$f').read())" && echo "✓ $f"; done` | - |
|
||||
| Validate all ingredients | `for f in $(find ingredients -name "*.ks"); do python3 -c "from pykickstart.parser import KickstartParser; from pykickstart.version import makeVersion, DEVEL; parser = KickstartParser(makeVersion(DEVEL)); parser.readKickstart(open('$f').read())" && echo "✓ $f"; done` | - |
|
||||
| Run all tests | `cd scripts && make test` | - |
|
||||
| Flatten recipe to dish | `ksflatten -c recipes/X.cfg -o dishes/X.cfg` | - |
|
||||
| Deploy VM from dish | `./deploy-vm.sh` | `deploy.sh`, `deploy-distro.sh` |
|
||||
@@ -604,7 +602,7 @@ done
|
||||
|
||||
```bash
|
||||
# Step 1: Create fragment
|
||||
cat > fragments/shared/packages/luanti.ks << 'EOF'
|
||||
cat > ingredients/shared/packages/luanti.ks << 'EOF'
|
||||
%packages
|
||||
luanti
|
||||
%end
|
||||
@@ -613,7 +611,7 @@ EOF
|
||||
# Step 2: Add to recipe template
|
||||
# Edit recipe-generator/recipe_templates.yaml
|
||||
# Add to 'required' section:
|
||||
# - luanti: fragments/shared/packages/luanti.ks
|
||||
# - luanti: ingredients/shared/packages/luanti.ks
|
||||
|
||||
# Step 3: Regenerate recipes
|
||||
cd recipe-generator
|
||||
@@ -632,7 +630,7 @@ ksflatten -c ../recipes/virtual-desktop_43.cfg -o ../dishes/virtual-desktop_43.c
|
||||
|
||||
```bash
|
||||
# Step 1: Create desktop fragment
|
||||
cat > fragments/shared/desktop/kde/packages.ks << 'EOF'
|
||||
cat > ingredients/shared/desktop/kde/packages.ks << 'EOF'
|
||||
%packages
|
||||
@kde-desktop
|
||||
plasma-workspace
|
||||
@@ -641,7 +639,7 @@ EOF
|
||||
# Step 2: Add to template
|
||||
# Edit recipe-generator/recipe_templates.yaml
|
||||
# Add to optional/desktop section:
|
||||
# kde: fragments/shared/desktop/kde/packages.ks
|
||||
# kde: ingredients/shared/desktop/kde/packages.ks
|
||||
|
||||
# Step 3: Add variant to manifest
|
||||
# Edit recipe-generator/recipes_manifest.yaml
|
||||
@@ -668,18 +666,18 @@ cat >> recipe-generator/recipe_templates.yaml << 'EOF'
|
||||
description: "A minimal server recipe"
|
||||
base: core
|
||||
required:
|
||||
- core: fragments/shared/core/base.ks
|
||||
- storage: fragments/shared/storage/standard.ks
|
||||
- bootloader: fragments/platform/generic-43/bootloader/grub.ks
|
||||
- packages: fragments/shared/packages/core-group.ks
|
||||
- fedora-remix: fragments/shared/packages/fedora-remix.ks
|
||||
- core: ingredients/shared/core/base.ks
|
||||
- storage: ingredients/shared/storage/standard.ks
|
||||
- bootloader: ingredients/platform/generic-43/bootloader/grub.ks
|
||||
- packages: ingredients/shared/packages/core-group.ks
|
||||
- fedora-remix: ingredients/shared/packages/fedora-remix.ks
|
||||
optional:
|
||||
security:
|
||||
secure: fragments/shared/core/security/enabled.ks
|
||||
devel: fragments/shared/core/security/disabled.ks
|
||||
secure: ingredients/shared/core/security/enabled.ks
|
||||
devel: ingredients/shared/core/security/disabled.ks
|
||||
version:
|
||||
"43": fragments/platform/generic-43/repo/fedora-mirrors.ks
|
||||
"rawhide": fragments/platform/generic-rawhide/repo/rawhide-mirrors.ks
|
||||
"43": ingredients/platform/generic-43/repo/fedora-mirrors.ks
|
||||
"rawhide": ingredients/platform/generic-rawhide/repo/rawhide-mirrors.ks
|
||||
EOF
|
||||
|
||||
# Step 2: Add variant to recipes_manifest.yaml
|
||||
@@ -724,7 +722,7 @@ luanti
|
||||
|
||||
### After: Fragment-Based
|
||||
|
||||
**Fragment:** `fragments/shared/packages/luanti.ks`
|
||||
**Fragment:** `ingredients/shared/packages/luanti.ks`
|
||||
```bash
|
||||
%packages
|
||||
luanti
|
||||
@@ -736,14 +734,14 @@ luanti
|
||||
templates:
|
||||
virtual-desktop:
|
||||
required:
|
||||
- luanti: fragments/shared/packages/luanti.ks
|
||||
- luanti: ingredients/shared/packages/luanti.ks
|
||||
```
|
||||
|
||||
**Recipe:** `recipes/virtual-desktop_43.cfg`
|
||||
```bash
|
||||
# Generated automatically
|
||||
%ksappend fragments/shared/core/base.ks
|
||||
%ksappend fragments/shared/packages/luanti.ks
|
||||
%ksappend ingredients/shared/core/base.ks
|
||||
%ksappend ingredients/shared/packages/luanti.ks
|
||||
```
|
||||
|
||||
### Migration Benefits
|
||||
@@ -770,7 +768,7 @@ templates:
|
||||
|
||||
- [ ] Review all `ingredients/*.cfg` files
|
||||
- [ ] Identify reusable patterns
|
||||
- [ ] Create `fragments/shared/` for common components
|
||||
- [ ] Create `ingredients/shared/` for common components
|
||||
- [ ] Update `recipe_templates.yaml` with new structure
|
||||
- [ ] Update `recipes_manifest.yaml` for variants
|
||||
- [ ] Regenerate recipes with `make generate-recipes`
|
||||
@@ -796,10 +794,10 @@ grep "^%ksappend" recipes/*.cfg | sort | uniq -d
|
||||
**2. Missing fragment error**
|
||||
|
||||
```
|
||||
ERROR: Missing fragment: fragments/shared/unknown/missing.ks
|
||||
ERROR: Missing fragment: ingredients/shared/unknown/missing.ks
|
||||
```
|
||||
|
||||
**Fix:** Verify fragment exists in `fragments/shared/`
|
||||
**Fix:** Verify fragment exists in `ingredients/shared/`
|
||||
|
||||
**3. Deprecated command warning**
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ cd recipe-generator && make generate-recipes && make test
|
||||
|
||||
```bash
|
||||
# Create new kickstart snippet
|
||||
cat > fragments/shared/packages/new-package.ks << 'EOF'
|
||||
cat > ingredients/shared/packages/new-package.ks << 'EOF'
|
||||
%packages
|
||||
new-package
|
||||
%end
|
||||
@@ -47,7 +47,7 @@ make test-container # Containerized
|
||||
### Validate Fragments
|
||||
|
||||
```bash
|
||||
for f in $(find fragments -name "*.ks"); do
|
||||
for f in $(find ingredients -name "*.ks"); do
|
||||
python3 -c "
|
||||
from pykickstart.parser import KickstartParser
|
||||
from pykickstart.version import makeVersion, DEVEL
|
||||
@@ -60,7 +60,7 @@ done
|
||||
## Architecture
|
||||
|
||||
```
|
||||
fragments/ (54 .ks) → recipe-generator/generate_recipe.py → recipes/ (16 .cfg) → ksflatten → dishes/ (28 .cfg)
|
||||
ingredients/ (54 .ks) → recipe-generator/generate_recipe.py → recipes/ (16 .cfg) → ksflatten → dishes/ (28 .cfg)
|
||||
```
|
||||
|
||||
See `DEVELOPMENT.md` Section 1 for detailed architecture overview.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env python3
|
||||
"""
|
||||
Flatten kickstart recipes with relative %include paths.
|
||||
Converts %include fragments/... to %include ../fragments/... relative to recipes/ location.
|
||||
Converts %include ingredients/... to %include ../ingredients/... relative to recipes/ location.
|
||||
"""
|
||||
|
||||
import os
|
||||
@@ -27,10 +27,10 @@ def flatten_recipe(recipe_path, output_path):
|
||||
if len(parts) >= 2:
|
||||
fragment_path = parts[1]
|
||||
# Make it relative to recipes/
|
||||
if fragment_path.startswith('fragments/'):
|
||||
if fragment_path.startswith('ingredients/'):
|
||||
# Keep as relative path - it's relative to the recipe file's location
|
||||
# recipes/ contains recipes, fragments/ is at project root level
|
||||
# So from recipes/, fragments/ is ../fragments/
|
||||
# recipes/ contains recipes, ingredients/ is at project root level
|
||||
# So from recipes/, ingredients/ is ../ingredients/
|
||||
relative_path = '../' + fragment_path
|
||||
lines.append('%include ' + relative_path)
|
||||
else:
|
||||
|
||||
@@ -1,114 +0,0 @@
|
||||
xconfig --startxonboot --defaultdesktop=GNOME # Start the display session on boot. Although it says --startx, which seems to imply xorg, it is actually generic and thus works also with Wayland.
|
||||
|
||||
%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies
|
||||
|
||||
## Mandatory packages found in hidden `@base-graphical` group (`dnf group info --hidden base-graphical`)
|
||||
@base-graphical
|
||||
## provides the following as mandatory packages:
|
||||
# mesa-dri-drivers
|
||||
# mesa-vulkan-drivers
|
||||
# plymouth-system-theme
|
||||
|
||||
# @critical-path-gnome not using this group but hand-picking packages
|
||||
## Mandatory packages found in hidden `@critical-path-gnome` group (`dnf group info --hidden critical-path-gnome`)
|
||||
## Not using
|
||||
## provides the following as mandatory packages:
|
||||
bash-color-prompt # Color prompt for bash shell
|
||||
dconf # A configuration system
|
||||
gdm # The GNOME Display Manager
|
||||
# gnome-classic-session # GNOME "classic" mode session
|
||||
gnome-control-center # Utilities to configure the GNOME desktop
|
||||
# gnome-initial-setup # Bootstrapping your OS
|
||||
gnome-shell # Window management and application launching for GNOME
|
||||
gvfs-fuse # FUSE support for gvfs
|
||||
# ptyxis # A container oriented terminal for GNOME
|
||||
### and the following as default packages
|
||||
# NetworkManager-pptp # NetworkManager VPN plugin for PPTP
|
||||
# avahi # Local network service discovery
|
||||
# gnome-bluetooth # Bluetooth graphical utilities
|
||||
gnome-session-wayland-session # Desktop file for wayland based gnome session
|
||||
# gnome-software # A software center for GNOME
|
||||
nautilus # File manager for GNOME
|
||||
# toolbox # Tool for interactive command line environments on Linux
|
||||
|
||||
## Extra hand-picked packages
|
||||
gnome-backgrounds.noarch # wallpapers from the GNOME project
|
||||
gnome-terminal # Terminal emulator for GNOME
|
||||
dejavu-sans-mono-fonts # the gnome-shell package doesn't include much fonts by default, resulting in weird spacings in GNOME Terminal. GNOME Terminal unfortunately doesn't automatically pick this font
|
||||
firefox # Mozilla Firefox Web browser
|
||||
mozilla-ublock-origin.noarch # An efficient blocker for Firefox
|
||||
|
||||
pipewire-alsa # PipeWire media server ALSA support
|
||||
pipewire-pulseaudio # PipeWire PulseAudio implementation
|
||||
pipewire-jack-audio-connection-kit # PipeWire JACK implementation
|
||||
|
||||
%end # End of the packagages section
|
||||
|
||||
%post --nochroot --log=/mnt/sysimage/root/base-desktop-gnome.log # Beginning of %post section. Those commands are executed outside the chroot environment
|
||||
|
||||
# cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.background.gschema.override<< EOF
|
||||
# [org.gnome.desktop.background]
|
||||
# picture-uri='file:///usr/share/backgrounds/elementary/Morskie Oko.jpg'
|
||||
# EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.media-handling.gschema.override<< EOF
|
||||
[org.gnome.desktop.media-handling]
|
||||
automount-open=false
|
||||
autorun-never=true
|
||||
EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.Terminal.gschema.override<< EOF
|
||||
[org.gnome.Terminal.Legacy.Profile]
|
||||
font='DejaVu Sans Mono 12'
|
||||
use-system-font=false
|
||||
audible-bell=false
|
||||
EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.wm.preferences.gschema.override<< EOF
|
||||
[org.gnome.desktop.wm.preferences]
|
||||
button-layout=':minimize,maximize,close'
|
||||
EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.a11y.gschema.override<< EOF
|
||||
[org.gnome.desktop.a11y]
|
||||
always-show-universal-access-status=true
|
||||
EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.interface.gschema.override<< EOF
|
||||
[org.gnome.desktop.interface]
|
||||
enable-animations=false
|
||||
EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.privacy.gschema.override<< EOF
|
||||
[org.gnome.desktop.privacy]
|
||||
remove-old-temp-files=true
|
||||
remember-recent-files=false
|
||||
remember-app-usage=false
|
||||
disable-camera=true
|
||||
disable-microphone=true
|
||||
disable-sound-output=true
|
||||
EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.search-providers.gschema.override<< EOF
|
||||
[org.gnome.desktop.search-providers]
|
||||
disable-external=true
|
||||
EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.notifications.gschema.override<< EOF
|
||||
[org.gnome.desktop.notifications.application]
|
||||
enable-sound-alerts=false
|
||||
EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.sound.gschema.override<< EOF
|
||||
[org.gnome.desktop.sound]
|
||||
event-sounds=false
|
||||
EOF
|
||||
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.thumbnailers.gschema.override<< EOF
|
||||
[org.gnome.desktop.thumbnailers]
|
||||
disable-all=true
|
||||
EOF
|
||||
|
||||
glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1,20 +0,0 @@
|
||||
# Untested
|
||||
|
||||
xconfig --startxonboot # Start the display session on boot. Although it says --startx, which seems to imply xorg, it is actually generic and thus works also with Wayland.
|
||||
|
||||
%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies.
|
||||
|
||||
## Mandatory packages found in hidden `@base-graphical` group (`dnf group info --hidden base-graphical`)
|
||||
@base-graphical
|
||||
## provides the following as mandatory packages:
|
||||
# mesa-dri-drivers
|
||||
# mesa-vulkan-drivers
|
||||
# plymouth-system-theme
|
||||
|
||||
labwc # A Wayland window-stacking compositor
|
||||
|
||||
## Extra hand-picked packages
|
||||
firefox # Mozilla Firefox Web browser
|
||||
mozilla-ublock-origin.noarch # An efficient blocker for Firefox
|
||||
|
||||
%end # End of the packagages section
|
||||
@@ -1,68 +0,0 @@
|
||||
%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies
|
||||
|
||||
virt-manager # Install virt-manager, a graphical front-end for QEMU/KVM
|
||||
|
||||
%end
|
||||
|
||||
%post --nochroot --log=/mnt/sysimage/root/base-desktop-gnome-virtual-machine-manager.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging.
|
||||
|
||||
# Create a file to autostart virt-manager
|
||||
cat > /mnt/sysimage/etc/xdg/autostart/virt-manager.desktop << EOF
|
||||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=Virtual Machine Manager
|
||||
Exec=virt-manager
|
||||
EOF
|
||||
|
||||
# Modify the default virt-manager behavior for misc. options
|
||||
cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.virt-manager.virt-manager.gschema.override<< EOF
|
||||
|
||||
# Modify the default virt-manager behavior for misc. options
|
||||
[org.virt-manager.virt-manager]
|
||||
xmleditor-enabled=true
|
||||
manager-window-height=600
|
||||
manager-window-width=200
|
||||
|
||||
# Libvirt URIs listed in the manager window
|
||||
[org.virt-manager.virt-manager.connections]
|
||||
uris=['qemu:///system', 'qemu:///session']
|
||||
autoconnect=['qemu:///session']
|
||||
|
||||
# Show usage in the domain list
|
||||
[org.virt-manager.virt-manager.vmlist-fields]
|
||||
cpu-usage=false
|
||||
|
||||
# Settings related to statistics
|
||||
[org.virt-manager.virt-manager.stats]
|
||||
update-interval=3
|
||||
enable-disk-poll=true
|
||||
enable-memory-poll=true
|
||||
enable-net-poll=true
|
||||
|
||||
# Default behavior for the console
|
||||
[org.virt-manager.virt-manager.console]
|
||||
scaling=2
|
||||
resize-guest=1
|
||||
autoconnect=false
|
||||
|
||||
# Do not show toolbar
|
||||
[org.virt-manager.virt-manager.details]
|
||||
show-toolbar=false
|
||||
|
||||
# Modify default values for new VMs
|
||||
[org.virt-manager.virt-manager.new-vm]
|
||||
storage-format='raw'
|
||||
cpu-default='host-model'
|
||||
graphics-type='spice'
|
||||
|
||||
# Modify the default virt-manager behavior for confirmation dialogues
|
||||
[org.virt-manager.virt-manager.confirm]
|
||||
forcepoweroff=false
|
||||
removedev=false
|
||||
unapplied-dev=false
|
||||
|
||||
EOF
|
||||
|
||||
glib-compile-schemas /mnt/sysimage/usr/share/glib-2.0/schemas/
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1,6 +0,0 @@
|
||||
%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies.
|
||||
|
||||
qemu-guest-agent # "QEMU guest agent" The qemu-guest agent is unnecessary for a bare-metal system. However, it is included here to cover cases where this kickstart file is used to deploy a virtual machine
|
||||
spice-vdagent # "Agent for Spice guests" The spice agent is unnecessary for a bare-metal system. However, it is included here to cover cases where this kickstart file is used to deploy a virtual machine
|
||||
|
||||
%end # End of the packages section
|
||||
@@ -1,7 +0,0 @@
|
||||
%post --nochroot --log=/mnt/sysimage/root/base-hypervisor-amdcpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting
|
||||
|
||||
sed -i 's/\(quiet\)/\1 iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB.
|
||||
|
||||
echo "options kvm_amd nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add support for nested virtualization
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1,7 +0,0 @@
|
||||
%post --nochroot --log=/mnt/sysimage/root/base-hypervisor-intelcpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting
|
||||
|
||||
sed -i 's/\(quiet\)/\1 intel_iommu=on iommu=pt rd.driver.pre=vfio-pci/i' /mnt/sysimage/etc/default/grub # Load kernel modules in GRUB.
|
||||
|
||||
echo "options kvm_intel nested=1" >> /mnt/sysimage/etc/modprobe.d/kvm.conf # Add support for nested virtualization on Intel CPUs
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1,9 +0,0 @@
|
||||
%post --nochroot --log=/mnt/sysimage/root/base-hypervisor-intelgpu.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installtion troubleshooting
|
||||
|
||||
sed -i 's/\(vfio-pci\)/\1 i915.enable_gvt=1/i' /mnt/sysimage/etc/default/grub # Load kernel modules in grub.
|
||||
|
||||
# Load extra kernel modules to enable vfio-mdev on selected hardware
|
||||
echo "kvmgt" > /mnt/sysimage/etc/modules-load.d/kvmgt.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm)
|
||||
echo "vfio-mdev" > /mnt/sysimage/etc/modules-load.d/vfio-mdev.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm)
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1,53 +0,0 @@
|
||||
services --enabled="NetworkManager,systemd-resolved,libvirtd" # Without libvirtd here, it appears the service won't automatically start
|
||||
|
||||
%packages --exclude-weakdeps # Beginning of the packages section. Does not include weak dependencies.
|
||||
|
||||
qemu-kvm # QEMU metapackage for KVM support
|
||||
libvirt # Library providing a simple virtualization API
|
||||
libvirt-client # Client side utilities of the libvirt library
|
||||
libvirt-client-qemu # Additional client side utilities for QEMU. Used to interact with some QEMU specific features of libvirt.
|
||||
libvirt-daemon # Server side daemon and supporting files for libvirt library
|
||||
libvirt-daemon-common # Miscellaneous files and utilities used by other libvirt daemons
|
||||
libvirt-daemon-config-network # Default configuration files for the libvirtd daemon. Provides NAT based networking
|
||||
libvirt-daemon-driver-interface # Interface driver plugin for the libvirtd daemon
|
||||
libvirt-daemon-driver-network # The network driver plugin for the libvirtd daemon, providing an implementation of the virtual network APIs using the Linux bridge capabilities.
|
||||
libvirt-daemon-driver-qemu # QEMU driver plugin for the libvirtd daemon
|
||||
libvirt-daemon-kvm # Server side daemon & driver required to run KVM guests
|
||||
libvirt-daemon-log # Server side daemon for managing logs
|
||||
libvirt-daemon-qemu # Server side daemon and driver required to manage the virtualization capabilities of the QEMU TCG emulators
|
||||
libvirt-nss # Libvirt plugin for Name Service Switch
|
||||
libvirt-dbus # libvirt D-Bus API binding
|
||||
libvirt-daemon-driver-ch # Cloud-Hypervisor driver plugin for libvirtd daemon
|
||||
virt-install # Utilities for installing virtual machines
|
||||
|
||||
%end # End of the packages section
|
||||
|
||||
%post --nochroot --log=/mnt/sysimage/root/base-hypervisor.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting
|
||||
|
||||
# Load kernel modules by adding vfio, vfio_pci, vfio_iommu_type1, vfio_virqfd
|
||||
echo "vfio" > /mnt/sysimage/etc/modules-load.d/vfio.conf
|
||||
echo "vfio-pci" > /mnt/sysimage/etc/modules-load.d/vfio-pci.conf
|
||||
echo "vfio_iommu_type1" > /mnt/sysimage/etc/modules-load.d/vfio_iommu_type1.conf
|
||||
echo "vfio_virqfd" > /mnt/sysimage/etc/modules-load.d/vfio_virqfd.conf
|
||||
|
||||
mkdir /mnt/sysimage/var/lib/libvirt/isos # Create a directory to store iso images. SELinux is already taking this one into account.
|
||||
|
||||
# wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/isos/ # fetch netboot.xyz iso and store it to the newly created iso directory
|
||||
|
||||
# # virsh commands fail in a kickstart environment (chroot or not it seems). would need to fetch a script and execute post-launch with a delay, for example using a systemd unit
|
||||
# virsh pool-define-as isos dir - - - - /mnt/sysimage/var/lib/libvirt/isos/ # Make libvirt aware of this new directory by creating a so-called 'pool'.
|
||||
# virsh pool-build isos # Build the pool
|
||||
# virsh pool-start isos # Start it
|
||||
# virsh pool-autostart isos # Set-it to autostart
|
||||
|
||||
# fetch custom script and make it executable
|
||||
# wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/local/bin/
|
||||
# chmod +x /mnt/sysimage/usr/local/bin/virtualization-tweaks-root-needed.sh
|
||||
|
||||
# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/linux.xml
|
||||
# virsh define linux.xml
|
||||
|
||||
# wget https://raw.githubusercontent.com/PhyllomeOS/xml-definition-for-domains/main/xml/system/windows.xml
|
||||
# virsh define windows.xml
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1 +0,0 @@
|
||||
bootloader --timeout=1 # Set the GNU GRUB bootloader timeout to 1
|
||||
@@ -1 +0,0 @@
|
||||
bootloader --sdboot --location=mbr --timeout=1 # Use systemd-boot and set a timeout to 1
|
||||
@@ -1 +0,0 @@
|
||||
liveimg --url=file:///mnt/iso/LiveOS/squashfs.img
|
||||
@@ -1,3 +0,0 @@
|
||||
repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64 # Official Fedora mirror
|
||||
repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f43&arch=x86_64 # Official Fedora updates mirror
|
||||
url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-43&arch=x86_64 # Official Fedora updates mirror
|
||||
@@ -1,2 +0,0 @@
|
||||
repo --name=rawhide --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
|
||||
url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
|
||||
@@ -1,8 +0,0 @@
|
||||
firstboot --enable --reconfig # Initial Setup will start after the first reboot
|
||||
|
||||
%packages # Beginning of the packages section
|
||||
|
||||
initial-setup-gui #Graphical user interface for the initial-setup utility
|
||||
initial-setup-gui-wayland-generic # Run the initial-setup GUI in Wayland
|
||||
|
||||
%end # End of the packages section
|
||||
@@ -1,23 +0,0 @@
|
||||
firstboot --enable # Initial Setup will start after the first reboot
|
||||
|
||||
%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies.
|
||||
|
||||
# TO BE TESTED -> initial-setup-gui # Graphical user interface for the initial-setup utility
|
||||
# TO BE TESTED -> initial-setup-gui-wayland-generic.x86_64 # Run the initial-setup GUI in Wayland
|
||||
gnome-initial-setup # Add GNOME initial setup too to let user create local account.
|
||||
|
||||
%end # End of the packages section
|
||||
|
||||
# %post --nochroot --log=/mnt/sysimage/root/base-initial-setup-gnome.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging.
|
||||
#
|
||||
# truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available
|
||||
#
|
||||
# ## Append lines to existing vendor.conf file, so that options are skipped upon reboot
|
||||
# cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF
|
||||
# [pages]
|
||||
# skip=privacy
|
||||
# [goa]
|
||||
# providers=local-first!
|
||||
# EOF
|
||||
#
|
||||
# %end # End of the %post section
|
||||
@@ -1,7 +0,0 @@
|
||||
firstboot --enable --reconfig # Enable the Setup Agent to start at boot time in reconfiguration mode. This mode enables the language, mouse, keyboard, root password, security level, time zone, and networking configuration options in addition to the default ones
|
||||
|
||||
%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies.
|
||||
|
||||
initial-setup # Initial setup package
|
||||
|
||||
%end # End of the packages section
|
||||
@@ -1,3 +0,0 @@
|
||||
keyboard --xlayouts='ch (fr)' # Set keyboard layouts for Romandy
|
||||
lang en_US.UTF-8 # Set system language to American English. More languages could be supported: --addsupport=cs_CZ,de_DE,en_UK
|
||||
timezone Europe/Zurich --utc # Set system timezone to Zurich
|
||||
@@ -1 +0,0 @@
|
||||
network --onboot=yes --bootproto=dhcp --device=link --activate --hostname=phyllome-alpha # Configure network devices, enable them at boot time device and sets a particular hostname. "link" selects the first device reaching an up state
|
||||
@@ -1,62 +0,0 @@
|
||||
# __ ____ ____ _____
|
||||
# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/
|
||||
# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \
|
||||
# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ /
|
||||
# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/
|
||||
# /_/ /____/
|
||||
#
|
||||
# Provides extended physical hardware support. Useful for a bare metal OS.
|
||||
|
||||
%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies.
|
||||
|
||||
@hardware-support
|
||||
## Mandatory packages found in hidden `hardware-support` group (`dnf group info --hidden core`)
|
||||
# alsa-sof-firmware # Audio drivers and firmware for ALSA. Essential for audio functionality.
|
||||
# amd-gpu-firmware # Firmware for AMD GPUs. Required for proper GPU operation.
|
||||
# atheros-firmware # Firmware for Atheros wireless network adapters. Critical for wireless connectivity.
|
||||
# b43-fwcutter # Utility for cutting firmware files for B43 drivers. Needed for driver compatibility.
|
||||
# b43-openfwwf # Driver and firmware for B43 network cards. Essential for network card operation.
|
||||
# brcmfmac-firmware # Firmware for Broadcom MAC controllers. Required for wireless and wired network performance.
|
||||
# cirrus-audio-firmware # Firmware for Cirrus Logic audio chips. Necessary for audio hardware support.
|
||||
# intel-audio-firmware # Firmware for Intel audio processors. Required for integrated audio functionality.
|
||||
# intel-gpu-firmware # Firmware for Intel GPUs. Essential for GPU operation.
|
||||
# intel-vsc-firmware # Firmware for Intel Video Scheduling Controller. Required for GPU performance.
|
||||
# iwlegacy-firmware # Legacy firmware for older Intel wireless cards. Needed for compatibility.
|
||||
# iwlwifi-dvm-firmware # Firmware for Intel Wireless Link 5100/5200 series. Crucial for wireless connectivity.
|
||||
# iwlwifi-mvm-firmware # Firmware for Intel Wireless Link 5300/5400 series. Required for wireless performance.
|
||||
# libertas-firmware # Firmware for Broadcom wireless network cards. Essential for wireless connectivity.
|
||||
# mt7xxx-firmware # Firmware for MediaTek wireless network adapters. Required for wireless connectivity.
|
||||
# nvidia-gpu-firmware # Firmware for NVIDIA GPUs. Essential for GPU operation.
|
||||
# nxpwireless-firmware # Firmware for NXP wireless network adapters. Required for wireless connectivity.
|
||||
# realtek-firmware # Firmware for Realtek network adapters and audio devices. Essential for various device support.
|
||||
# tiwilink-firmware # Firmware for TI WiLink wireless network adapters. Required for wireless connectivity.
|
||||
#
|
||||
# ## Optional packages found in hidden `hardware-support` group (`dnf group info --hidden hardware-support`)
|
||||
# ## Not installed by default unless "@hardware-support --optional" is used
|
||||
# acpi # Command-line ACPI client
|
||||
# acpitool # Command line ACPI client
|
||||
# alsa-firmware # Firmware for several ALSA-supported sound cards
|
||||
# atmel-firmware # Firmware for Atmel at76c50x wireless network chips
|
||||
# cmospwd # BIOS password cracker utility
|
||||
# dvb-firmware # Firmware for various DVB broadcast receivers
|
||||
# gpsd # Service daemon for mediating access to a GPS
|
||||
# gpsd-clients # Clients for gpsd
|
||||
# hddtemp # Hard disk temperature tool
|
||||
# hdparm # A utility for displaying and/or setting hard disk parameters
|
||||
# iscan-firmware # Firmware for Epson flatbed scanners
|
||||
# libifp # General-purpose library-driver for iRiver's iFP portable audio players
|
||||
# liquidio-firmware # Firmware for Cavium LiquidIO Intelligent Server Adapter
|
||||
# lsscsi # List SCSI devices (or hosts) and associated information
|
||||
# mlxsw_spectrum-firmware # Firmware for Mellanox Spectrum 1/2/3 Switches
|
||||
# mrvlprestera-firmware # Firmware for Marvell Prestera Switchdev/ASIC devices
|
||||
# netronome-firmware # Firmware for Netronome Smart NICs
|
||||
# opensc # Smart card library and applications
|
||||
# pcsc-lite # PC/SC Lite smart card framework and applications
|
||||
# pcsc-lite-ccid # Generic USB CCID smart card reader driver
|
||||
# qcom-accel-firmware # Firmware for Qualcomm Technologies data center / Open-vRAN Accelerators
|
||||
# qed-firmware # Firmware for Marvell FastLinQ adapters family
|
||||
# radeontop # AMD Radeon video cards monitoring utility
|
||||
# wpan-tools # Userspace tools for the Linux IEEE 802.15.4 stack
|
||||
# zd1211-firmware # Firmware for wireless devices based on zd1211 chipset
|
||||
|
||||
%end # End of the packages section
|
||||
@@ -1,82 +0,0 @@
|
||||
# __ ____ ____ _____
|
||||
# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/
|
||||
# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \
|
||||
# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ /
|
||||
# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/
|
||||
# /_/ /____/
|
||||
#
|
||||
# Provides the mandatory packages that are part of the core DNF group
|
||||
# More information: https://pykickstart.readthedocs.io/en/latest/kickstart-docs.html#id240
|
||||
|
||||
%packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies. Package description courtesy of the Fedora project
|
||||
|
||||
@core
|
||||
## Mandatory packages found in hidden `core` group (`dnf group info --hidden core`)
|
||||
# audit # User space tools for kernel auditing
|
||||
# basesystem # The skeleton package which defines a simple Fedora system
|
||||
# bash # The Bourne Again SHell, a command-line interpreter.
|
||||
# coreutils # A set of basic GNU tools commonly used in shell scripts
|
||||
# curl # A utility for getting files from remote servers (FTP, HTTP, and others)
|
||||
# dhcp-client # Provides the ISC DHCP client daemon and dhclient-script
|
||||
# dnf5 # Command-line package manager
|
||||
# e2fsprogs # Utilities for managing ext2, ext3, and ext4 file systems
|
||||
# filesystem # The basic directory layout for a Linux system
|
||||
# glibc # The GNU libc libraries
|
||||
# hostname # Utility to set/show the host name or domain name
|
||||
# iproute # Advanced IP routing and network device configuration tools
|
||||
# iputils # Network monitoring tools including ping
|
||||
# kbd # Tools for configuring the console (keyboard, virtual terminals, etc.)
|
||||
# kernel # The Linux kernel
|
||||
# less # A text file browser similar to more, but better. Can be excluded
|
||||
# man-db # Tools for searching and reading man pages. Can be excluded
|
||||
# ncurses # Ncurses support utilities
|
||||
# openssh-clients # An open source SSH client applications. Can be excluded
|
||||
# openssh-server # An open source SSH server daemon. Can be excluded
|
||||
# parted # The GNU disk partition manipulation program
|
||||
# policycoreutils # SELinux policy core utilities. Can be excluded
|
||||
# procps-ng # System and process monitoring utilities
|
||||
# rootfiles # The basic required files for the root user's directory
|
||||
# rpm # The RPM package management system
|
||||
# selinux-policy-targeted # SELinux targeted policy. Can be excluded
|
||||
# setup # A set of system configuration and setup files
|
||||
# shadow-utils # Utilities for managing accounts and shadow password files
|
||||
# sssd-common # Common files for the SSSD. Can be excluded
|
||||
# sssd-kcm # An implementation of a Kerberos KCM server. Can be excluded
|
||||
# sudo # Allows restricted root access for specified users
|
||||
# systemd # System and Service Manager
|
||||
# util-linux # Collection of basic system utilities
|
||||
# vim-minimal # A minimal version of the VIM editor
|
||||
|
||||
## Default packages found in hidden `core` group (`dnf group info --hidden core`)
|
||||
# NetworkManager # Network connection manager and user applications
|
||||
# dnf5-plugins # Plugins for dnf5
|
||||
# dracut-config-rescue # dracut configuration to turn on rescue image generation
|
||||
# firewalld # A firewall daemon with D-Bus interface providing a dynamic firewall
|
||||
# fwupd # Firmware update daemon
|
||||
# plymouth # Graphical Boot Animation and Logger
|
||||
# prefixdevname # Udev helper utility that provides network interface naming using user defined prefix
|
||||
# systemd-resolved # Network Name Resolution manager
|
||||
# zram-generator-defaults # Default configuration for zram-generator
|
||||
|
||||
## Optionnal packages found in hidden `core` group (`dnf group info --hidden core`)
|
||||
## Not installed by default unless "@core --optional" is used
|
||||
# dracut-config-generic
|
||||
# initial-setup
|
||||
# initscripts
|
||||
|
||||
# Packages to be used to create a Fedora Remix and comply Fedora Remix legal guidelines: https://fedoraproject.org/wiki/Remix
|
||||
fedora-remix-logos # Fedora Remix logos
|
||||
generic-release # Generic release files
|
||||
generic-logos # Icons and pictures
|
||||
generic-release-common # Generic release files
|
||||
generic-release-notes # Release Notes
|
||||
|
||||
# Hand-picked packages
|
||||
pciutils # PCI bus related utilities
|
||||
libusb # Library for accessing USB devices
|
||||
usbutils # Linux USB utilities
|
||||
curl # transfer a URL
|
||||
wget # An advanced file and recursive website downloader
|
||||
nano # A small text editor
|
||||
|
||||
%end # End of the packages section
|
||||
@@ -1,3 +0,0 @@
|
||||
%post --nochroot --log=/mnt/sysimage/root/post-nochroot.log # Beginning of the post-installation section. Log all messages to a given file
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1,7 +0,0 @@
|
||||
%post --log=/mnt/sysimage/root/post.log # Beginning of the post-installation section. Log all messages to a given file
|
||||
|
||||
localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
|
||||
dnf update -y # Update the system
|
||||
grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1,3 +0,0 @@
|
||||
%pre --log=/mnt/sysimage/root/pre-install.log Beginning of the pre-installation section. Log all messages to a given file
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1,3 +0,0 @@
|
||||
%pre --log=/mnt/sysimage/root/pre.log Beginning of the pre section. Log all messages to a given file
|
||||
|
||||
%end # End of the %post section
|
||||
@@ -1,3 +0,0 @@
|
||||
rootpw --plaintext 1234 --allow-ssh # Root account is enabled with weak password and allow ssh
|
||||
selinux --disabled # Disable SELinux
|
||||
firewall --enabled --ssh # Reject incoming connections that are not in response to outbound requests except SSH
|
||||
@@ -1,3 +0,0 @@
|
||||
rootpw --lock # No root login from the console
|
||||
selinux --enforcing # Set SELinux to enforcing mode
|
||||
firewall --enabled # Enable firewall
|
||||
@@ -1 +0,0 @@
|
||||
services --enabled=NetworkManager,systemd-resolved # List of comma-separated systemd services that can be explicitly enabled
|
||||
@@ -1,6 +0,0 @@
|
||||
zerombr # Destroy all the contents of disks with invalid partition tables or other formatting unrecognizable to the installer
|
||||
clearpart --all --initlabel # Erase all partitions and Initializes the disk label to the default for the target architecture
|
||||
|
||||
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label=efi # Creates a 512 MiB EFI system partition
|
||||
part /boot --fstype="ext4" --size=2048 --label=boot # Creates a 2048 MiB ext4 boot partition
|
||||
part / --fstype="ext4" --grow --label=root --mkfsoptions="-O encrypt,fast_commit" --encrypted --passphrase= # Create a single encrypted root partition with the remaining space.
|
||||
@@ -1,6 +0,0 @@
|
||||
zerombr # Destroy all the contents of disks with invalid partition tables or other formatting unrecognizable to the installer
|
||||
clearpart --all --initlabel # Erase all partitions and Initializes the disk label to the default for the target architecture
|
||||
|
||||
part /boot/efi --fstype="efi" --size=512 --fsoptions="umask=0077,shortname=winnt" --label=efi # Creates a 512 MiB EFI system partition
|
||||
part /boot --fstype="ext4" --size=2048 --label=boot # Creates a 2048 MiB ext4 boot partition
|
||||
part / --fstype="ext4" --grow --label=root --mkfsoptions="-O encrypt,fast_commit" # Create a single root partition with the remaining space
|
||||
@@ -1,2 +0,0 @@
|
||||
text # Kickstart installation in text mode
|
||||
poweroff # Shut down the system after a successful installation
|
||||
@@ -1,19 +0,0 @@
|
||||
# RPM fusion repositories
|
||||
# For the current release tree
|
||||
repo --name=rpmfusion-nonfree --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs=rpmfusion-nonfree-release
|
||||
# Updates for the current release tree
|
||||
repo --name=rpmfusion-nonfree-updates --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs=rpmfusion-nonfree-release
|
||||
|
||||
%post
|
||||
|
||||
# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
|
||||
echo "== RPM Fusion Nonfree: Base section =="
|
||||
echo "Importing RPM Fusion keys"
|
||||
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
|
||||
echo "List of packages from RPM Fusion Nonfree:"
|
||||
rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
|
||||
echo "List of incuded RPM Fusion packages with their size:"
|
||||
rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
|
||||
echo
|
||||
|
||||
%end
|
||||
@@ -1 +0,0 @@
|
||||
bootloader --location=none --timeout=1 # Set the GNU GRUB bootloader timeout to 1 and to location to none
|
||||
@@ -1 +0,0 @@
|
||||
bootloader --sdboot --location=none --timeout=1 # Use systemd-boot and set location to none
|
||||
@@ -1,23 +0,0 @@
|
||||
%packages # Beginning of the package section. Include weak dependencies. Description courtesy of the Fedora project
|
||||
|
||||
@anaconda-tools
|
||||
|
||||
# Explicitly specified here:
|
||||
# <notting> walters: because otherwise dependency loops cause yum issues.
|
||||
kernel
|
||||
kernel-modules
|
||||
kernel-modules-extra
|
||||
|
||||
# Need aajohan-comfortaa-fonts for the SVG rnotes images
|
||||
aajohan-comfortaa-fonts
|
||||
|
||||
# Without this, initramfs generation during live image creation fails: #1242586
|
||||
dracut-live
|
||||
|
||||
# anaconda needs the locales available to run for different locales
|
||||
glibc-all-langpacks
|
||||
|
||||
# provide the livesys scripts
|
||||
livesys-scripts
|
||||
|
||||
%end
|
||||
@@ -1,6 +0,0 @@
|
||||
%post --log=/mnt/sysimage/root/post-live-session.log # Beginning of the post-installation section. Add logging.
|
||||
|
||||
# set livesys session type
|
||||
sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
|
||||
|
||||
%end
|
||||
@@ -1,51 +0,0 @@
|
||||
%post --log=/mnt/sysimage/root/post-live-core.log # Beginning of the post-installation section. Add logging.
|
||||
|
||||
# Enable livesys services
|
||||
systemctl enable livesys.service
|
||||
systemctl enable livesys-late.service
|
||||
|
||||
# enable tmpfs for /tmp
|
||||
systemctl enable tmp.mount
|
||||
|
||||
# make it so that we don't do writing to the overlay for things which
|
||||
# are just tmpdirs/caches
|
||||
# note https://bugzilla.redhat.com/show_bug.cgi?id=1135475
|
||||
cat >> /etc/fstab << EOF
|
||||
vartmp /var/tmp tmpfs defaults 0 0
|
||||
EOF
|
||||
|
||||
# work around for poor key import UI in PackageKit
|
||||
rm -f /var/lib/rpm/__db*
|
||||
echo "Packages within this LiveCD"
|
||||
rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
|
||||
# Note that running rpm recreates the rpm db files which aren't needed or wanted
|
||||
rm -f /var/lib/rpm/__db*
|
||||
|
||||
# go ahead and pre-make the man -k cache (#455968)
|
||||
/usr/bin/mandb
|
||||
|
||||
# make sure there aren't core files lying around
|
||||
rm -f /core*
|
||||
|
||||
# remove random seed, the newly installed instance should make it's own
|
||||
rm -f /var/lib/systemd/random-seed
|
||||
|
||||
# convince readahead not to collect
|
||||
# FIXME: for systemd
|
||||
|
||||
echo 'File created by kickstart. See systemd-update-done.service(8).' \
|
||||
| tee /etc/.updated >/var/.updated
|
||||
|
||||
# Drop the rescue kernel and initramfs, we don't need them on the live media itself.
|
||||
# See bug 1317709
|
||||
rm -f /boot/*-rescue*
|
||||
|
||||
# Disable network service here, as doing it in the services line
|
||||
# fails due to RHBZ #1369794
|
||||
systemctl disable network
|
||||
|
||||
# Remove machine-id on pre generated images
|
||||
rm -f /etc/machine-id
|
||||
touch /etc/machine-id
|
||||
|
||||
%end
|
||||
@@ -1,5 +0,0 @@
|
||||
zerombr # WARNING : Dangerous command ! Will clear the Master Boot Record
|
||||
clearpart --all --initlabel # Partition clearing information. This setup uses GPT by default.
|
||||
|
||||
part / --fstype="ext4" --size=5120 # Create a root partition of around 7GB
|
||||
part / --size=8576
|
||||
@@ -1 +0,0 @@
|
||||
poweroff # Shut down the system after a successful installation
|
||||
@@ -1,25 +0,0 @@
|
||||
# __ ____ ____ _____
|
||||
# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/
|
||||
# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \
|
||||
# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ /
|
||||
# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/
|
||||
# /_/ /____/
|
||||
|
||||
# What ? This partial kickstart file provides a template one can use to further extend an installation
|
||||
|
||||
# %packages --exclude-weakdeps # Beginning of the packages section. Excludes weak package dependencies
|
||||
# Any software in the official Fedora repository can be added [here](https://packages.fedoraproject.org/).
|
||||
|
||||
# gnome-shell # the version 3 of the GNOME desktop environment, without any presintalled applications
|
||||
|
||||
# %end
|
||||
|
||||
# %post --nochroot --log=/mnt/sysimage/opt/base-desktop-gnome.log # Beginning of %post section. Those commands are executed outside the chroot environment.
|
||||
# Use this section to further extend the system
|
||||
|
||||
# cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.background.gschema.override<< EOF
|
||||
# [org.gnome.desktop.background]
|
||||
# picture-uri='file:///usr/share/backgrounds/elementary/Morskie Oko.jpg'
|
||||
# EOF
|
||||
|
||||
# %end # End of the %post section
|
||||
Binary file not shown.
Binary file not shown.
@@ -96,7 +96,7 @@ class RecipeGenerator:
|
||||
modifiers = modifiers.copy()
|
||||
modifiers['version'] = version
|
||||
|
||||
# Add required includes (all fragments listed under 'required')
|
||||
# Add required includes (all ingredients listed under 'required')
|
||||
for item in template.get('required', []):
|
||||
if isinstance(item, dict):
|
||||
fragment_path = list(item.values())[0]
|
||||
|
||||
@@ -8,96 +8,96 @@ templates:
|
||||
description: "An install recipe for desktop, server, or hypervisor"
|
||||
base: core
|
||||
required:
|
||||
- core: fragments/core/base.ks
|
||||
- version: fragments/repo/fedora-43-mirrors.ks
|
||||
- storage: fragments/storage/standard.ks
|
||||
- bootloader: fragments/bootloader/grub.ks
|
||||
- locale: fragments/core/locale.ks
|
||||
- services: fragments/core/services.ks
|
||||
- network: fragments/core/network.ks
|
||||
- packages: fragments/packages/core-group.ks
|
||||
- fedora-remix: fragments/packages/fedora-remix.ks
|
||||
- hand-picked: fragments/packages/hand-picked.ks
|
||||
- security: fragments/core/security/enabled.ks
|
||||
- initial-setup: fragments/initial-setup/server/config.ks
|
||||
- core: ingredients/core/base.ks
|
||||
- version: ingredients/repo/fedora-43-mirrors.ks
|
||||
- storage: ingredients/storage/standard.ks
|
||||
- bootloader: ingredients/bootloader/grub.ks
|
||||
- locale: ingredients/core/locale.ks
|
||||
- services: ingredients/core/services.ks
|
||||
- network: ingredients/core/network.ks
|
||||
- packages: ingredients/packages/core-group.ks
|
||||
- fedora-remix: ingredients/packages/fedora-remix.ks
|
||||
- hand-picked: ingredients/packages/hand-picked.ks
|
||||
- security: ingredients/core/security/enabled.ks
|
||||
- initial-setup: ingredients/initial-setup/server/config.ks
|
||||
optional:
|
||||
hardware-support: fragments/packages/hardware-support.ks
|
||||
guest-agents: fragments/guest-agents/base.ks
|
||||
hardware-support: ingredients/packages/hardware-support.ks
|
||||
guest-agents: ingredients/guest-agents/base.ks
|
||||
variant_type:
|
||||
desktop:
|
||||
server:
|
||||
hypervisor:
|
||||
modifiers:
|
||||
version:
|
||||
"43": fragments/repo/fedora-43-mirrors.ks
|
||||
"rawhide": fragments/repo/rawhide-mirrors.ks
|
||||
"43": ingredients/repo/fedora-43-mirrors.ks
|
||||
"rawhide": ingredients/repo/rawhide-mirrors.ks
|
||||
storage:
|
||||
standard: fragments/storage/standard.ks
|
||||
encrypted: fragments/storage/encrypted.ks
|
||||
standard: ingredients/storage/standard.ks
|
||||
encrypted: ingredients/storage/encrypted.ks
|
||||
desktop:
|
||||
gnome:
|
||||
- fragments/desktop/gnome/config.ks
|
||||
- fragments/desktop/gnome/packages.ks
|
||||
- fragments/desktop/gnome/post-scripts.ks
|
||||
- ingredients/desktop/gnome/config.ks
|
||||
- ingredients/desktop/gnome/packages.ks
|
||||
- ingredients/desktop/gnome/post-scripts.ks
|
||||
labwc:
|
||||
- fragments/desktop/labwc/config.ks
|
||||
- ingredients/desktop/labwc/config.ks
|
||||
security:
|
||||
secure: fragments/core/security/enabled.ks
|
||||
"off": fragments/core/security/disabled.ks
|
||||
secure: ingredients/core/security/enabled.ks
|
||||
"off": ingredients/core/security/disabled.ks
|
||||
initial-setup:
|
||||
server: fragments/initial-setup/server/config.ks
|
||||
desktop: fragments/initial-setup/desktop/config.ks
|
||||
gnome: fragments/initial-setup/gnome/config.ks
|
||||
generic-wayland: fragments/initial-setup/generic-wayland/config.ks
|
||||
server: ingredients/initial-setup/server/config.ks
|
||||
desktop: ingredients/initial-setup/desktop/config.ks
|
||||
gnome: ingredients/initial-setup/gnome/config.ks
|
||||
generic-wayland: ingredients/initial-setup/generic-wayland/config.ks
|
||||
hypervisor_type:
|
||||
amdcpu: fragments/hypervisor/amdcpu.ks
|
||||
intelcpu: fragments/hypervisor/intelcpu.ks
|
||||
intelgpu: fragments/hypervisor/intelgpu.ks
|
||||
amdcpu: ingredients/hypervisor/amdcpu.ks
|
||||
intelcpu: ingredients/hypervisor/intelcpu.ks
|
||||
intelgpu: ingredients/hypervisor/intelgpu.ks
|
||||
hypervisor:
|
||||
base:
|
||||
- fragments/hypervisor/base/packages.ks
|
||||
- fragments/hypervisor/base/services.ks
|
||||
- fragments/hypervisor/base/post-scripts.ks
|
||||
- ingredients/hypervisor/base/packages.ks
|
||||
- ingredients/hypervisor/base/services.ks
|
||||
- ingredients/hypervisor/base/post-scripts.ks
|
||||
desktop:
|
||||
- fragments/packages/virtual-machine-manager/packages.ks
|
||||
- fragments/packages/virtual-machine-manager/post-scripts.ks
|
||||
- ingredients/packages/virtual-machine-manager/packages.ks
|
||||
- ingredients/packages/virtual-machine-manager/post-scripts.ks
|
||||
bootloader:
|
||||
grub: fragments/bootloader/grub.ks
|
||||
systemd-boot: fragments/bootloader/systemd-boot.ks
|
||||
grub: ingredients/bootloader/grub.ks
|
||||
systemd-boot: ingredients/bootloader/systemd-boot.ks
|
||||
|
||||
# Live recipe - for live-desktop or live-server
|
||||
live:
|
||||
description: "A live recipe for live-desktop or live-server"
|
||||
base: live-core
|
||||
required:
|
||||
- live-core: fragments/live/core/base.ks
|
||||
- version: fragments/repo/fedora-43-mirrors.ks
|
||||
- storage: fragments/live/core/storage.ks
|
||||
- bootloader: fragments/live/core/bootloader/grub.ks
|
||||
- locale: fragments/core/locale.ks
|
||||
- services: fragments/core/services.ks
|
||||
- network: fragments/core/network.ks
|
||||
- packages: fragments/live/core/packages.ks
|
||||
- post: fragments/live/post/base.ks
|
||||
- session: fragments/live/post/session.ks
|
||||
- rpmfusion-nonfree: fragments/repo/rpmfusion-nonfree.ks
|
||||
- live-core: ingredients/live/core/base.ks
|
||||
- version: ingredients/repo/fedora-43-mirrors.ks
|
||||
- storage: ingredients/live/core/storage.ks
|
||||
- bootloader: ingredients/live/core/bootloader/grub.ks
|
||||
- locale: ingredients/core/locale.ks
|
||||
- services: ingredients/core/services.ks
|
||||
- network: ingredients/core/network.ks
|
||||
- packages: ingredients/live/core/packages.ks
|
||||
- post: ingredients/live/post/base.ks
|
||||
- session: ingredients/live/post/session.ks
|
||||
- rpmfusion-nonfree: ingredients/repo/rpmfusion-nonfree.ks
|
||||
optional:
|
||||
variant_type:
|
||||
desktop:
|
||||
server:
|
||||
hardware-support: fragments/packages/hardware-support.ks
|
||||
guest-agents: fragments/guest-agents/base.ks
|
||||
hypervisor: fragments/live/hypervisor.ks
|
||||
hardware-support: ingredients/packages/hardware-support.ks
|
||||
guest-agents: ingredients/guest-agents/base.ks
|
||||
hypervisor: ingredients/live/hypervisor.ks
|
||||
security:
|
||||
secure: fragments/core/security/enabled.ks
|
||||
"off": fragments/core/security/disabled.ks
|
||||
secure: ingredients/core/security/enabled.ks
|
||||
"off": ingredients/core/security/disabled.ks
|
||||
modifiers:
|
||||
version:
|
||||
"43": fragments/repo/fedora-43-mirrors.ks
|
||||
"rawhide": fragments/repo/rawhide-mirrors.ks
|
||||
"43": ingredients/repo/fedora-43-mirrors.ks
|
||||
"rawhide": ingredients/repo/rawhide-mirrors.ks
|
||||
storage:
|
||||
standard: fragments/live/core/storage.ks
|
||||
encrypted: fragments/live/core/storage.ks
|
||||
standard: ingredients/live/core/storage.ks
|
||||
encrypted: ingredients/live/core/storage.ks
|
||||
bootloader:
|
||||
grub: fragments/live/core/bootloader/grub.ks
|
||||
systemd-boot: fragments/live/core/bootloader/systemd-boot.ks
|
||||
grub: ingredients/live/core/bootloader/grub.ks
|
||||
systemd-boot: ingredients/live/core/bootloader/systemd-boot.ks
|
||||
|
||||
@@ -28,7 +28,7 @@ class TemplateValidator:
|
||||
if key not in template:
|
||||
errors.append(f"Missing required key: {key}")
|
||||
|
||||
# Validate required fragments exist
|
||||
# Validate required ingredients exist
|
||||
for item in template.get('required', []):
|
||||
if isinstance(item, dict):
|
||||
fragment_path = list(item.values())[0]
|
||||
@@ -37,18 +37,18 @@ class TemplateValidator:
|
||||
|
||||
full_path = self.project_root / fragment_path
|
||||
if not full_path.exists():
|
||||
errors.append(f"Required fragment not found: {fragment_path}")
|
||||
errors.append(f"Required ingredient not found: {fragment_path}")
|
||||
|
||||
# Validate versioned fragments
|
||||
# Validate versioned ingredients
|
||||
for key, fragment_path in template.get('versioned', {}).items():
|
||||
if '{version}' in fragment_path:
|
||||
# Will be resolved at generation time
|
||||
continue
|
||||
full_path = self.project_root / fragment_path
|
||||
if not full_path.exists():
|
||||
errors.append(f"Versioned fragment not found: {fragment_path}")
|
||||
errors.append(f"Versioned ingredient not found: {fragment_path}")
|
||||
|
||||
# Validate conditional fragments
|
||||
# Validate conditional ingredients
|
||||
conditional = template.get('conditional', {})
|
||||
for modifier, modifier_config in conditional.items():
|
||||
if isinstance(modifier_config, dict):
|
||||
@@ -60,25 +60,25 @@ class TemplateValidator:
|
||||
if fp is not None:
|
||||
full_path = self.project_root / fp
|
||||
if not full_path.exists():
|
||||
errors.append(f"Conditional fragment not found: {fp} (in list for {modifier}={value})")
|
||||
errors.append(f"Conditional ingredient not found: {fp} (in list for {modifier}={value})")
|
||||
else:
|
||||
full_path = self.project_root / fragment_path
|
||||
if not full_path.exists():
|
||||
errors.append(f"Conditional fragment not found: {fragment_path} (for {modifier}={value})")
|
||||
errors.append(f"Conditional ingredient not found: {fragment_path} (for {modifier}={value})")
|
||||
|
||||
# Validate flag fragments
|
||||
# Validate flag ingredients
|
||||
for key, fragment_path in template.get('flags', {}).items():
|
||||
if fragment_path is None:
|
||||
continue
|
||||
full_path = self.project_root / fragment_path
|
||||
if not full_path.exists():
|
||||
errors.append(f"Flag fragment not found: {fragment_path}")
|
||||
errors.append(f"Flag ingredient not found: {fragment_path}")
|
||||
|
||||
return errors
|
||||
|
||||
|
||||
class ContentValidator:
|
||||
"""Validate recipe content for fragment existence and duplicates."""
|
||||
"""Validate recipe content for ingredient existence and duplicates."""
|
||||
|
||||
def __init__(self, project_root: Path):
|
||||
self.project_root = project_root
|
||||
@@ -102,15 +102,15 @@ class ContentValidator:
|
||||
issues.append(f"Duplicate include: {path}")
|
||||
seen.add(path)
|
||||
|
||||
# Check fragment existence
|
||||
# Check ingredient existence
|
||||
for inc in includes:
|
||||
parts = inc.split()
|
||||
if len(parts) < 2:
|
||||
continue
|
||||
path = parts[1]
|
||||
fragment_path = self.project_root / path
|
||||
if not fragment_path.exists():
|
||||
issues.append(f"Missing fragment: {path}")
|
||||
ingredient_path = self.project_root / path
|
||||
if not ingredient_path.exists():
|
||||
issues.append(f"Missing ingredient: {path}")
|
||||
|
||||
return issues
|
||||
|
||||
|
||||
@@ -7,18 +7,18 @@
|
||||
|
||||
# An install recipe for desktop, server, or hypervisor
|
||||
|
||||
%include fragments/core/base.ks
|
||||
%include fragments/repo/fedora-43-mirrors.ks
|
||||
%include fragments/storage/standard.ks
|
||||
%include fragments/bootloader/grub.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/core/security/enabled.ks
|
||||
%include fragments/initial-setup/server/config.ks
|
||||
%include fragments/desktop/gnome/config.ks
|
||||
%include fragments/desktop/gnome/packages.ks
|
||||
%include fragments/desktop/gnome/post-scripts.ks
|
||||
%include ingredients/core/base.ks
|
||||
%include ingredients/repo/fedora-43-mirrors.ks
|
||||
%include ingredients/storage/standard.ks
|
||||
%include ingredients/bootloader/grub.ks
|
||||
%include ingredients/core/locale.ks
|
||||
%include ingredients/core/services.ks
|
||||
%include ingredients/core/network.ks
|
||||
%include ingredients/packages/core-group.ks
|
||||
%include ingredients/packages/fedora-remix.ks
|
||||
%include ingredients/packages/hand-picked.ks
|
||||
%include ingredients/core/security/enabled.ks
|
||||
%include ingredients/initial-setup/server/config.ks
|
||||
%include ingredients/desktop/gnome/config.ks
|
||||
%include ingredients/desktop/gnome/packages.ks
|
||||
%include ingredients/desktop/gnome/post-scripts.ks
|
||||
@@ -7,19 +7,19 @@
|
||||
|
||||
# An install recipe for desktop, server, or hypervisor
|
||||
|
||||
%include fragments/core/base.ks
|
||||
%include fragments/repo/fedora-43-mirrors.ks
|
||||
%include fragments/storage/standard.ks
|
||||
%include fragments/bootloader/grub.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/core/security/enabled.ks
|
||||
%include fragments/initial-setup/server/config.ks
|
||||
%include fragments/desktop/gnome/config.ks
|
||||
%include fragments/desktop/gnome/packages.ks
|
||||
%include fragments/desktop/gnome/post-scripts.ks
|
||||
%include fragments/storage/encrypted.ks
|
||||
%include ingredients/core/base.ks
|
||||
%include ingredients/repo/fedora-43-mirrors.ks
|
||||
%include ingredients/storage/standard.ks
|
||||
%include ingredients/bootloader/grub.ks
|
||||
%include ingredients/core/locale.ks
|
||||
%include ingredients/core/services.ks
|
||||
%include ingredients/core/network.ks
|
||||
%include ingredients/packages/core-group.ks
|
||||
%include ingredients/packages/fedora-remix.ks
|
||||
%include ingredients/packages/hand-picked.ks
|
||||
%include ingredients/core/security/enabled.ks
|
||||
%include ingredients/initial-setup/server/config.ks
|
||||
%include ingredients/desktop/gnome/config.ks
|
||||
%include ingredients/desktop/gnome/packages.ks
|
||||
%include ingredients/desktop/gnome/post-scripts.ks
|
||||
%include ingredients/storage/encrypted.ks
|
||||
@@ -7,19 +7,19 @@
|
||||
|
||||
# An install recipe for desktop, server, or hypervisor
|
||||
|
||||
%include fragments/core/base.ks
|
||||
%include fragments/repo/fedora-43-mirrors.ks
|
||||
%include fragments/storage/standard.ks
|
||||
%include fragments/bootloader/grub.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/core/security/enabled.ks
|
||||
%include fragments/initial-setup/server/config.ks
|
||||
%include fragments/desktop/gnome/config.ks
|
||||
%include fragments/desktop/gnome/packages.ks
|
||||
%include fragments/desktop/gnome/post-scripts.ks
|
||||
%include fragments/storage/encrypted.ks
|
||||
%include ingredients/core/base.ks
|
||||
%include ingredients/repo/fedora-43-mirrors.ks
|
||||
%include ingredients/storage/standard.ks
|
||||
%include ingredients/bootloader/grub.ks
|
||||
%include ingredients/core/locale.ks
|
||||
%include ingredients/core/services.ks
|
||||
%include ingredients/core/network.ks
|
||||
%include ingredients/packages/core-group.ks
|
||||
%include ingredients/packages/fedora-remix.ks
|
||||
%include ingredients/packages/hand-picked.ks
|
||||
%include ingredients/core/security/enabled.ks
|
||||
%include ingredients/initial-setup/server/config.ks
|
||||
%include ingredients/desktop/gnome/config.ks
|
||||
%include ingredients/desktop/gnome/packages.ks
|
||||
%include ingredients/desktop/gnome/post-scripts.ks
|
||||
%include ingredients/storage/encrypted.ks
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user