[elbe-devel] [PATCH 3/3] Use new debootstrap configuration

Daniel Braunwarth daniel.braunwarth at kuka.com
Thu Sep 9 14:02:17 CEST 2021


This patch replaces the old debootstrapvariant configuration with the
new debootstrap configuration.

Signed-off-by: Daniel Braunwarth <daniel.braunwarth at kuka.com>
---
 examples/armhf-ti-beaglebone-black.xml          | 4 +++-
 examples/armhf-ubuntu.xml                       | 4 +++-
 examples/x86_64-docker.xml                      | 4 +++-
 examples/x86_64-pc-hdimg-grub-hybrid-buster.xml | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/examples/armhf-ti-beaglebone-black.xml b/examples/armhf-ti-beaglebone-black.xml
index 6d9d51eae..43ac303fc 100644
--- a/examples/armhf-ti-beaglebone-black.xml
+++ b/examples/armhf-ti-beaglebone-black.xml
@@ -39,7 +39,9 @@
 		the emulated part (run in QEMU) of the installation
 		significant.
 		-->
-		<debootstrapvariant>minbase</debootstrapvariant>
+		<debootstrap>
+			<variant>minbase</variant>
+		</debootstrap>
 		<package>
 			<!-- build a tarball of the target image -->
 			<tar>
diff --git a/examples/armhf-ubuntu.xml b/examples/armhf-ubuntu.xml
index 31967a0ac..c49f90369 100644
--- a/examples/armhf-ubuntu.xml
+++ b/examples/armhf-ubuntu.xml
@@ -70,7 +70,9 @@
 				<name>image.tgz</name>
 			</tar>
 		</package>
-		<debootstrapvariant>minbase</debootstrapvariant>
+		<debootstrap>
+			<variant>minbase</variant>
+		</debootstrap>
 		<finetuning>
 			<rm>var/cache/apt/archives/*.deb</rm>
 			<rm>/var/cache/apt/*.bin</rm>
diff --git a/examples/x86_64-docker.xml b/examples/x86_64-docker.xml
index d6b30af00..9f19884bc 100644
--- a/examples/x86_64-docker.xml
+++ b/examples/x86_64-docker.xml
@@ -37,7 +37,9 @@
 		<hostname>debianmin</hostname>
 		<domain>docker</domain>
 		<passwd>docker</passwd>
-		<debootstrapvariant>minbase</debootstrapvariant>
+		<debootstrap>
+			<variant>minbase</variant>
+		</debootstrap>
 		<package>
 			<tar>
 				<name>docker-debianmin.tgz</name>
diff --git a/examples/x86_64-pc-hdimg-grub-hybrid-buster.xml b/examples/x86_64-pc-hdimg-grub-hybrid-buster.xml
index e93f8296c..00589fdf6 100644
--- a/examples/x86_64-pc-hdimg-grub-hybrid-buster.xml
+++ b/examples/x86_64-pc-hdimg-grub-hybrid-buster.xml
@@ -31,7 +31,9 @@
 		<domain>tec.linutronix.de</domain>
 		<passwd>foo</passwd>
 		<console>ttyS0,115200</console>
-		<debootstrapvariant variant="sysv">minbase</debootstrapvariant>
+		<debootstrap variant"sysv">
+			<variant>minbase</variant>
+		</debootstrap>
 		<package>
 			<tar>
 				<name>grub-hybrid-rfs.tgz</name>
-- 
2.33.0



More information about the elbe-devel mailing list