| -rw-r--r-- | Fedora.kiwi | 1 | ||||
| -rwxr-xr-x | config.sh | 4 | ||||
| -rw-r--r-- | teams/cloud/wsl.xml | 68 | ||||
| -rw-r--r-- | tmt/plans/wsl/build.fmf | 9 |
4 files changed, 2 insertions, 80 deletions
diff --git a/Fedora.kiwi b/Fedora.kiwi index 5f3a795..6eeb9c9 100644 --- a/Fedora.kiwi +++ b/Fedora.kiwi @@ -38,7 +38,6 @@ <include from="this://./teams/cloud/cloud.xml"/> <include from="this://./teams/cloud/container.xml"/> <include from="this://./teams/cloud/vagrant.xml"/> - <include from="this://./teams/cloud/wsl.xml"/> <include from="this://./teams/server.xml"/> <include from="this://./teams/workstation.xml"/> <include from="this://./teams/kde.xml"/> @@ -33,7 +33,7 @@ rm -f /var/lib/systemd/random-seed #====================================== # Configure grub correctly #-------------------------------------- -if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]] && [[ "$kiwi_profiles" != *"WSL"* ]]; then +if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]]; then ## Works around issues with grub-bls ## See: https://github.com/OSInside/kiwi/issues/2198 echo "GRUB_DEFAULT=saved" >> /etc/default/grub @@ -58,7 +58,7 @@ fi #====================================== # Delete & lock the root user password #-------------------------------------- -if [[ "$kiwi_profiles" == *"Cloud"* ]] || [[ "$kiwi_profiles" == *"Disk"* ]] || [[ "$kiwi_profiles" == *"Live"* ]] || [[ "$kiwi_profiles" == *"WSL"* ]]; then +if [[ "$kiwi_profiles" == *"Cloud"* ]] || [[ "$kiwi_profiles" == *"Disk"* ]] || [[ "$kiwi_profiles" == *"Live"* ]]; then passwd -d root passwd -l root fi diff --git a/teams/cloud/wsl.xml b/teams/cloud/wsl.xml deleted file mode 100644 index aae883f..0000000 --- a/teams/cloud/wsl.xml +++ /dev/null @@ -1,68 +0,0 @@ -<image> - <profiles> - <profile name="WSL-Base" description="Windows Subsystem for Linux Base"/> - </profiles> - <preferences profiles="WSL-Base"> - <type image="tbz"/> - <timezone>Etc/UTC</timezone> - <locale>en_US</locale> - <rpm-locale-filtering>false</rpm-locale-filtering> - <rpm-excludedocs>false</rpm-excludedocs> - </preferences> - <packages type="bootstrap" profiles="WSL-Base"> - <package name="bash"/> - <package name="coreutils"/> - <package name="dnf5"/> - <package name="dnf5-plugins"/> - <package name="fedora-release-wsl"/> - <package name="policycoreutils"/> - <package name="rpm"/> - <package name="selinux-policy-targeted"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="WSL-Base"> - <package name="attr"/> - <package name="acl"/> - <package name="bash-color-prompt"/> - <package name="bash-completion"/> - <package name="bind-utils"/> - <package name="bzip2"/> - <package name="curl"/> - <package name="dbus"/> - <package name="default-editor"/> - <package name="file"/> - <package name="glibc-langpack-en"/> - <package name="gnupg2"/> - <package name="iproute"/> - <package name="iputils"/> - <package name="less"/> - <package name="lsof"/> - <package name="man-db"/> - <package name="man-pages"/> - <package name="NetworkManager"/> - <package name="nmap-ncat"/> - <package name="openssh-clients"/> - <package name="passwd"/> - <package name="pciutils"/> - <package name="procps-ng"/> - <package name="rsync"/> - <package name="shadow-utils"/> - <package name="sudo"/> - <package name="symlinks"/> - <package name="systemd-udev"/> - <package name="systemd-resolved"/> - <package name="tar"/> - <package name="tcpdump"/> - <package name="time"/> - <package name="traceroute"/> - <package name="tree"/> - <package name="unzip"/> - <package name="usbutils"/> - <package name="util-linux"/> - <package name="vim-minimal"/> - <package name="which"/> - <package name="whois"/> - <package name="wsl-setup"/> - <package name="zip"/> - <package name="zram-generator-defaults"/> - </packages> -</image> diff --git a/tmt/plans/wsl/build.fmf b/tmt/plans/wsl/build.fmf deleted file mode 100644 index 7a9094c..0000000 --- a/tmt/plans/wsl/build.fmf +++ /dev/null @@ -1,9 +0,0 @@ -summary: Build the Windows Subsystem for Linux image -discover: - how: fmf -environment: - image_type: tbz - image_profile: WSL-Base - kiwi_file: Fedora.kiwi -execute: - how: tmt |