From 86bfec62f6e445e1f9754304c94f383123952608 Mon Sep 17 00:00:00 2001
From: ericbsd <ericturgeon.bsd@gmail.com>
Date: Sun, 30 Jun 2024 15:12:00 -0300
Subject: [PATCH] Updated ghostbsd-version and pkg config for package base

---
 .github/CODEOWNERS                       | 2 +-
 bin/ghostbsd-version/ghostbsd-version.sh | 2 +-
 release/pkg_repos/release-dvd.conf       | 7 +++++++
 sys/conf/package-version                 | 2 +-
 usr.sbin/pkg/GhostBSD.conf               | 7 +++++++
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c386c0c2062e..ae5f5358c6ad 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,4 +3,4 @@
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
 # *       @global-owner1 @global-owner2
-* @ghostbsd/developers
+* @ghostbsd/contributors @ghostbsd/new-contributors @ghostbsd/core-contributors @ghostbsd/project-leader
diff --git a/bin/ghostbsd-version/ghostbsd-version.sh b/bin/ghostbsd-version/ghostbsd-version.sh
index faba05dec2e5..71d56ffbc68d 100644
--- a/bin/ghostbsd-version/ghostbsd-version.sh
+++ b/bin/ghostbsd-version/ghostbsd-version.sh
@@ -48,7 +48,7 @@ freebsd_version() {
 }
 
 os_version() {
-  pkg query '%v' os-generic-userland-base
+  pkg query '%v' GhostBSD-runtime
 }
 
 usage() {
diff --git a/release/pkg_repos/release-dvd.conf b/release/pkg_repos/release-dvd.conf
index fd40a6e61e92..85fa4ee43ffc 100644
--- a/release/pkg_repos/release-dvd.conf
+++ b/release/pkg_repos/release-dvd.conf
@@ -4,3 +4,10 @@ release: {
   pubkey: "/usr/share/keys/ssl/certs/ghostbsd.cert",
   enabled: yes
 }
+
+GhostBSD_base: {
+  url: "http://pkg.ghostbsd.org/stable/${ABI}/base",
+  signature_type: "pubkey",
+  pubkey: "/usr/share/keys/ssl/certs/ghostbsd.cert",
+  enabled: yes
+}
\ No newline at end of file
diff --git a/sys/conf/package-version b/sys/conf/package-version
index 5eca1d6fcd9f..11300bc91f56 100644
--- a/sys/conf/package-version
+++ b/sys/conf/package-version
@@ -1 +1 @@
-24.04.1
+24.04.2
diff --git a/usr.sbin/pkg/GhostBSD.conf b/usr.sbin/pkg/GhostBSD.conf
index cdf29a8e89ad..1b281501aea0 100644
--- a/usr.sbin/pkg/GhostBSD.conf
+++ b/usr.sbin/pkg/GhostBSD.conf
@@ -13,3 +13,10 @@ GhostBSD: {
   pubkey: "/usr/share/keys/ssl/certs/ghostbsd.cert",
   enabled: yes
 }
+
+GhostBSD_base: {
+  url: "http://pkg.ghostbsd.org/stable/${ABI}/base",
+  signature_type: "pubkey",
+  pubkey: "/usr/share/keys/ssl/certs/ghostbsd.cert",
+  enabled: yes
+}
\ No newline at end of file