diff --git a/files/scripts/disablesshd.sh b/files/scripts/disablesshd.sh new file mode 100644 index 0000000..de5abc0 --- /dev/null +++ b/files/scripts/disablesshd.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +# Tell build process to exit if there are any errors. +set -oue pipefail + +echo "Disabling the sshd" +systemctl disable sshd +systemctl mask sshd diff --git a/recipes/common/gui-packages.yml b/recipes/common/gui-packages.yml index 48a5dff..8c51bdf 100644 --- a/recipes/common/gui-packages.yml +++ b/recipes/common/gui-packages.yml @@ -12,7 +12,6 @@ install: - setools remove: - - openssh-server - fedora-chromium-config - fedora-flathub-remote - open-vm-tools diff --git a/recipes/common/gui-scripts.yml b/recipes/common/gui-scripts.yml index 2ea4c6e..410b302 100644 --- a/recipes/common/gui-scripts.yml +++ b/recipes/common/gui-scripts.yml @@ -1,3 +1,4 @@ type: script scripts: - disablecups.sh + - disablesshd.sh \ No newline at end of file diff --git a/recipes/common/kinoite-packages.yml b/recipes/common/kinoite-packages.yml index 32ad10a..0a07597 100644 --- a/recipes/common/kinoite-packages.yml +++ b/recipes/common/kinoite-packages.yml @@ -3,3 +3,4 @@ remove: - kde-connect - kde-connect-libs - kdeconnectd + - fedora-chromium-config-kde \ No newline at end of file diff --git a/recipes/common/silverblue-packages.yml b/recipes/common/silverblue-packages.yml index 2999e35..1ecc53f 100644 --- a/recipes/common/silverblue-packages.yml +++ b/recipes/common/silverblue-packages.yml @@ -15,3 +15,4 @@ remove: - libvncserver - malcontent-ui-libs - malcontent-control + - fedora-chromium-config-gnome \ No newline at end of file diff --git a/recipes/general/recipe-bluefin-dx-main-userns.yml b/recipes/general/recipe-bluefin-dx-main-userns.yml index a7db2ed..9069fd5 100644 --- a/recipes/general/recipe-bluefin-dx-main-userns.yml +++ b/recipes/general/recipe-bluefin-dx-main-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/silverblue-packages.yml - from-file: common/bluefin-packages.yml - from-file: common/gui-packages.yml - from-file: common/common-packages.yml diff --git a/recipes/general/recipe-bluefin-dx-nvidia-userns.yml b/recipes/general/recipe-bluefin-dx-nvidia-userns.yml index 02f3d4f..8749fc7 100644 --- a/recipes/general/recipe-bluefin-dx-nvidia-userns.yml +++ b/recipes/general/recipe-bluefin-dx-nvidia-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/silverblue-packages.yml - from-file: common/bluefin-packages.yml - from-file: common/gui-packages.yml - from-file: common/common-packages.yml diff --git a/recipes/general/recipe-bluefin-main-userns.yml b/recipes/general/recipe-bluefin-main-userns.yml index e0c78c1..348199d 100644 --- a/recipes/general/recipe-bluefin-main-userns.yml +++ b/recipes/general/recipe-bluefin-main-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/silverblue-packages.yml - from-file: common/bluefin-packages.yml - from-file: common/gui-packages.yml - from-file: common/common-packages.yml diff --git a/recipes/general/recipe-bluefin-main.yml b/recipes/general/recipe-bluefin-main.yml index 8c2141a..a581d91 100644 --- a/recipes/general/recipe-bluefin-main.yml +++ b/recipes/general/recipe-bluefin-main.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/silverblue-packages.yml - from-file: common/bluefin-packages.yml - from-file: common/gui-packages.yml - from-file: common/common-packages.yml diff --git a/recipes/general/recipe-bluefin-nvidia-userns.yml b/recipes/general/recipe-bluefin-nvidia-userns.yml index 7992c1e..6f7bd6d 100644 --- a/recipes/general/recipe-bluefin-nvidia-userns.yml +++ b/recipes/general/recipe-bluefin-nvidia-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/silverblue-packages.yml - from-file: common/bluefin-packages.yml - from-file: common/gui-packages.yml - from-file: common/common-packages.yml diff --git a/recipes/general/recipe-bluefin-nvidia.yml b/recipes/general/recipe-bluefin-nvidia.yml index 36857ea..4a19315 100644 --- a/recipes/general/recipe-bluefin-nvidia.yml +++ b/recipes/general/recipe-bluefin-nvidia.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/silverblue-packages.yml - from-file: common/bluefin-packages.yml - from-file: common/gui-packages.yml - from-file: common/common-packages.yml