From e9c9a67365e6157a9490e90dc662ac0ec8319481 Mon Sep 17 00:00:00 2001
From: Lucy <12953208+elvece@users.noreply.github.com>
Date: Thu, 18 Apr 2024 13:35:38 -0400
Subject: [PATCH 1/4] update registry upload to take id for new admin
 permissions (#2605)

---
 core/startos/src/registry/admin.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 44b83d161..7cb734d8c 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -71,12 +71,14 @@ async fn do_upload(
     mut url: Url,
     user: &str,
     pass: &str,
+    pkg_id: &str,
     body: Body,
 ) -> Result<(), Error> {
     url.set_path("/admin/v0/upload");
     let req = httpc
         .post(url)
         .header(header::ACCEPT, "text/plain")
+        .query(&["id", pkg_id])
         .basic_auth(user, Some(pass))
         .body(body)
         .build()?;
@@ -178,6 +180,7 @@ pub async fn publish(
             registry.clone(),
             &user,
             &pass,
+            &pkg.id,
             Body::wrap_stream(file_stream),
         )
         .await?;

From df777c63fe651a6d91fb75f088bfaef0837aeb60 Mon Sep 17 00:00:00 2001
From: Lucy <12953208+elvece@users.noreply.github.com>
Date: Tue, 23 Apr 2024 16:02:11 -0400
Subject: [PATCH 2/4] fix type for query params (#2611)

---
 core/startos/src/registry/admin.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/startos/src/registry/admin.rs b/core/startos/src/registry/admin.rs
index 7cb734d8c..e994b5c53 100644
--- a/core/startos/src/registry/admin.rs
+++ b/core/startos/src/registry/admin.rs
@@ -78,7 +78,7 @@ async fn do_upload(
     let req = httpc
         .post(url)
         .header(header::ACCEPT, "text/plain")
-        .query(&["id", pkg_id])
+        .query(&[("id", pkg_id)])
         .basic_auth(user, Some(pass))
         .body(body)
         .build()?;

From c832b5d29eee5e13295b090395441c562c80f3c9 Mon Sep 17 00:00:00 2001
From: Matt Hill <MattDHill@users.noreply.github.com>
Date: Wed, 29 May 2024 14:07:36 -0600
Subject: [PATCH 3/4] Update README.md (#2630)

* Update README.md

* Update README.md
---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8383498b1..e9d71401a 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,8 @@
 <br />
 
 ## Running StartOS
-There are multiple ways to get started with StartOS:
+> [!WARNING]
+> StartOS is in beta. It lacks features. It doesn't always work perfectly. Start9 servers are not plug and play. Using them properly requires some effort and patience. Please do not use StartOS or purchase a server if you are unable or unwilling to follow instructions and learn new concepts.
 
 ### 💰 Buy a Start9 server
 This is the most convenient option. Simply [buy a server](https://store.start9.com) from Start9 and plug it in.

From fc8b1193de618efe3c9fe9f68ed9c7ce23cd562f Mon Sep 17 00:00:00 2001
From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com>
Date: Fri, 7 Jun 2024 12:17:21 -0600
Subject: [PATCH 4/4] fix master build (#2639)

---
 image-recipe/build.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/image-recipe/build.sh b/image-recipe/build.sh
index 836fc49ed..3ff91ca75 100755
--- a/image-recipe/build.sh
+++ b/image-recipe/build.sh
@@ -158,8 +158,16 @@ echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/tor.key.gpg]
 curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o config/archives/docker.key
 echo "deb [arch=${IB_TARGET_ARCH} signed-by=/etc/apt/trusted.gpg.d/docker.key.gpg] https://download.docker.com/linux/debian ${IB_SUITE} stable" > config/archives/docker.list
 
-curl -fsSL https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/Release.key | gpg --dearmor -o config/archives/podman.key
-echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/trusted.gpg.d/podman.key.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/Debian_Testing/ /" > config/archives/podman.list
+echo "deb http://deb.debian.org/debian/ trixie main contrib" > config/archives/trixie.list
+cat > config/archives/trixie.pref <<- EOF
+Package: *
+Pin: release n=trixie
+Pin-Priority: 100
+
+Package: podman
+Pin: release n=trixie
+Pin-Priority: 600
+EOF
 
 # Dependencies