diff options
| -rw-r--r-- | .forgejo/workflows/build-iso.yml | 10 | ||||
| -rw-r--r-- | releng/airootfs/etc/pacman.conf | 14 | ||||
| -rw-r--r-- | releng/pacman.conf | 10 |
3 files changed, 16 insertions, 18 deletions
diff --git a/.forgejo/workflows/build-iso.yml b/.forgejo/workflows/build-iso.yml index 85bc9d9..6284e78 100644 --- a/.forgejo/workflows/build-iso.yml +++ b/.forgejo/workflows/build-iso.yml @@ -23,15 +23,13 @@ jobs: mkdir -p "${GITHUB_WORKSPACE}/.tmp" df -h - - name: Fix raveos-core-repo pacman repo (overwrite clean) + - name: Fix raveos-core-repo pacman repo (overwrite clean, first in order) run: | set -euo pipefail sudo sed -i '/^\[raveos-core-repo\]/,/^$/d' /etc/pacman.conf - cat <<'EOF' | sudo tee -a /etc/pacman.conf - [raveos-core-repo] - SigLevel = Required DatabaseOptional - Server = https://page.rp1.hu/x86_64/ - EOF + sudo sed -i '/^\[core\]/i\[raveos-core-repo]\nSigLevel = Required DatabaseOptional\nServer = https://page.rp1.hu/x86_64/\n' /etc/pacman.conf + echo "=== repo sorrend ellenorzes:" + grep -n '^\[raveos-core-repo\]\|^\[core\]' /etc/pacman.conf - name: Verify archiso run: pacman -Q archiso diff --git a/releng/airootfs/etc/pacman.conf b/releng/airootfs/etc/pacman.conf index 6e07afe..b93a926 100644 --- a/releng/airootfs/etc/pacman.conf +++ b/releng/airootfs/etc/pacman.conf @@ -22,7 +22,7 @@ HoldPkg = pacman glibc Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = linux-cachyos linux-cachyos-headers gnome-session gnome-console gedit gnome-disk-utility gnome-system-monitor eog gnome-calculator baobab gnome-control-center gnome-tweaks gnome-browser-connector gnome-settings-daemon nautilus gnome-shell-extensions mutter +#IgnorePkg = linux-cachyos linux-cachyos-headers #IgnoreGroup = # A chaotic-mirrorlist tartalmat a chaotic-rankmirrors.service minden boot-kor @@ -79,6 +79,12 @@ LocalFileSigLevel = Optional #[core-testing] #Include = /etc/pacman.d/mirrorlist +[raveos-core-repo] +SigLevel = Required DatabaseOptional +# Elsodleges + tartalek (GitHub Releases) szerver a raveos-mirrorlist +# csomag altal szolgaltatott fajlbol - lasd /etc/pacman.d/raveos-core-mirrorlist +Include = /etc/pacman.d/raveos-core-mirrorlist + [core] Include = /etc/pacman.d/mirrorlist @@ -103,11 +109,5 @@ Include = /etc/pacman.d/mirrorlist #SigLevel = Optional TrustAll #Server = file:///home/custompkgs -[raveos-core-repo] -SigLevel = Required DatabaseOptional -# Elsodleges + tartalek (GitHub Releases) szerver a raveos-mirrorlist -# csomag altal szolgaltatott fajlbol - lasd /etc/pacman.d/raveos-core-mirrorlist -Include = /etc/pacman.d/raveos-core-mirrorlist - [chaotic-aur] Include = /etc/pacman.d/chaotic-mirrorlist diff --git a/releng/pacman.conf b/releng/pacman.conf index 56babca..a10d53c 100644 --- a/releng/pacman.conf +++ b/releng/pacman.conf @@ -22,7 +22,7 @@ HoldPkg = pacman glibc Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -IgnorePkg = gnome-session gnome-console gedit gnome-disk-utility gnome-system-monitor eog gnome-calculator baobab gnome-control-center gnome-tweaks gnome-browser-connector gnome-settings-daemon nautilus gnome-shell-extensions mutter +IgnorePkg = linux-cachyos linux-cachyos-headers #IgnoreGroup = #NoUpgrade = @@ -76,6 +76,10 @@ LocalFileSigLevel = Optional #[core-testing] #Include = /etc/pacman.d/mirrorlist +[raveos-core-repo] +SigLevel = Required DatabaseOptional +Server = https://page.rp1.hu/x86_64/ + [core] Include = /etc/pacman.d/mirrorlist @@ -100,9 +104,5 @@ Include = /etc/pacman.d/mirrorlist #SigLevel = Optional TrustAll #Server = file:///home/custompkgs -[raveos-core-repo] -SigLevel = Required DatabaseOptional -Server = https://page.rp1.hu/x86_64/ - [chaotic-aur] Include = /etc/pacman.d/chaotic-mirrorlist |