Skip to content

Commit

Permalink
don't use fedora-common-ostree-pkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
karuboniru committed Jan 25, 2024
1 parent 5b05aed commit db651a6
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 13 deletions.
14 changes: 3 additions & 11 deletions fedora-common-ostree.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ mutate-os-release: "39"
container-cmd:
- /usr/bin/bash

include: fedora-common-ostree-pkgs.yaml
# don't include the default package list as
# this for GUI systems
# include: fedora-common-ostree-pkgs.yaml

# See https://github.com/coreos/bootupd
# TODO: Disabled until we use use unified-core or native container flow
Expand All @@ -21,24 +23,14 @@ packages:
- git-core
# Explicitely add Git docs
- git-core-doc
- lvm2
- rpm-ostree
# Required for compatibility with old bootloaders until we have bootupd
# See https://github.com/fedora-silverblue/issue-tracker/issues/120
- ostree-grub2
# Container management
- buildah
- podman
- skopeo
- toolbox
# Provides terminal tools like clear, reset, tput, and tset
- ncurses
# Flatpak support
- flatpak
- xdg-desktop-portal
# HFS filesystem tools for Apple hardware
# See https://github.com/projectatomic/rpm-ostree/issues/1380
- hfsplus-tools
# Contains default ostree remote config to be used on client's
# system for fetching ostree update
- fedora-repos-ostree
Expand Down
42 changes: 40 additions & 2 deletions server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ repos:
- fedora-39-updates

packages:
- NetworkManager
- NetworkManager-bluetooth
- NetworkManager-l2tp
- NetworkManager-libreswan
Expand Down Expand Up @@ -180,6 +181,37 @@ packages:
- xrootd-voms
- zram-generator-defaults
- zsh
- curl
- dnsmasq
- iputils
- kernel
- kernel-modules-extra
- less
- linux-firmware
- mtr
- nfs-utils
- nss-altfiles
- nss-mdns
- ntfs-3g
- ntfsprogs
- opensc
- openssh-clients
- openssh-server
- passwd
- passwdqc
- pinfo
- man-db
- lsof
- rsync
- man-pages
- shadow-utils
- selinux-policy-targeted
- sssd
- sssd-common
- systemd-resolved
- wget
- which
- whois

postprocess:
- |
Expand Down Expand Up @@ -222,6 +254,12 @@ add-files:
["cils/container_wireguard.cil", "/etc/cils/container_wireguard.cil"],
["etc/containers/containers.conf", "/etc/containers/containers.conf"],
["etc/containers/storage.conf", "/etc/containers/storage.conf"],
["etc/containers/networks/podman.json", "/etc/containers/networks/podman.json"],
["etc/systemd/system.conf.d/accounting.conf", "/etc/systemd/system.conf.d/accounting.conf"]
[
"etc/containers/networks/podman.json",
"/etc/containers/networks/podman.json",
],
[
"etc/systemd/system.conf.d/accounting.conf",
"/etc/systemd/system.conf.d/accounting.conf",
],
]

0 comments on commit db651a6

Please sign in to comment.