[elbe-devel] [PATCH] initvm: Update to bullseye

[bage at linutronix.de]

From: Bastian Germann <bage at linutronix.de>

Change the suite and url-list to install the default and big-machine
initvms from bullseye. For qemu, buster-backports shall not be used
anymore, obviously.

Also, ubuntu-keyring is not available in buster because Debian bug
929165 prevents ubuntu-keyring from migrating to bullseye. Remove it.
People who want to build Ubuntu filesystems should install it separately
in the initvm or create it from a custom XML.

Link: https://bugs.debian.org/929165
Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 elbepack/init/default-init.xml     | 16 +++-------------
 examples/elbe-init-big-machine.xml | 15 +++------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/elbepack/init/default-init.xml b/elbepack/init/default-init.xml
index 8f73bebbd..f82114047 100644
--- a/elbepack/init/default-init.xml
+++ b/elbepack/init/default-init.xml
@@ -8,18 +8,10 @@
 			<url-list>
 				<url>
 					<binary>
-						http://security.debian.org/debian-security buster/updates main
+						http://security.debian.org/debian-security bullseye-security main
 					</binary>
 					<source>
-						http://security.debian.org/debian-security buster/updates main
-					</source>
-				</url>
-				<url>
-					<binary>
-						http://ftp.debian.org/debian buster-backports main
-					</binary>
-					<source>
-						http://ftp.debian.org/debian buster-backports main
+						http://security.debian.org/debian-security bullseye-security main
 					</source>
 				</url>
 				<url>
@@ -46,11 +38,9 @@
 				</url>
 			</url-list>
 		</mirror>
-		<suite>buster</suite>
+		<suite>bullseye</suite>
 		<pkg-list>
-			<pkg pin="buster-backports">qemu-user-static</pkg>
 			<pkg>openssh-server</pkg>
-			<pkg>ubuntu-keyring</pkg>
 		</pkg-list>
 		<preseed>
 			<conf owner="pbuilder" key="pbuilder/mirrorsite" type="string" value="http://ftp.de.debian.org/debian"/>
diff --git a/examples/elbe-init-big-machine.xml b/examples/elbe-init-big-machine.xml
index 1d7e33a48..435b2020f 100644
--- a/examples/elbe-init-big-machine.xml
+++ b/examples/elbe-init-big-machine.xml
@@ -8,18 +8,10 @@
 			<url-list>
 				<url>
 					<binary>
-						http://security.debian.org/debian-security buster/updates main
+						http://security.debian.org/debian-security bullseye-security main
 					</binary>
 					<source>
-						http://security.debian.org/debian-security buster/updates main
-					</source>
-				</url>
-				<url>
-					<binary>
-						http://ftp.debian.org/debian buster-backports main
-					</binary>
-					<source>
-						http://ftp.debian.org/debian buster-backports main
+						http://security.debian.org/debian-security bullseye-security main
 					</source>
 				</url>
 				<url>
@@ -46,9 +38,8 @@
 				</url>
 			</url-list>
 		</mirror>
-		<suite>buster</suite>
+		<suite>bullseye</suite>
 		<pkg-list>
-			<pkg pin="buster-backports">qemu-user-static</pkg>
 			<pkg>openssh-server</pkg>
 		</pkg-list>
 		<preseed>
-- 
2.30.2