From 39dd0c2162396df74a24f44b89405ee09ad70421 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 11 Feb 2025 01:11:26 +0000
Subject: [PATCH] main/tiny-cloud: backport fix for autoinstall
---
main/tiny-cloud/APKBUILD | 4 +++-
main/tiny-cloud/autoinstall.patch | 25 +++++++++++++++++++++++++
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 main/tiny-cloud/autoinstall.patch
diff --git a/main/tiny-cloud/APKBUILD b/main/tiny-cloud/APKBUILD
index 0caa126e7efc..f500dd900299 100644
--- a/main/tiny-cloud/APKBUILD
+++ b/main/tiny-cloud/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Jake Buchholz Göktürk <tomalok@gmail.com>
pkgname=tiny-cloud
pkgver=3.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="Tiny Cloud instance bootstrapper"
url="https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud"
arch="noarch"
@@ -13,6 +13,7 @@ depends="e2fsprogs-extra partx sfdisk yx openssh-server"
provides="tiny-cloud-allclouds=$pkgver-r$pkgrel"
source="
$url/-/archive/$pkgver/tiny-cloud-$pkgver.tar.gz
+ autoinstall.patch
tiny-cloud.pre-upgrade
tiny-cloud-openrc.pre-upgrade
tiny-cloud-aws.post-install
@@ -110,6 +111,7 @@ scaleway() {
sha512sums="
053f4321d241093cb993df8fcf916aeb03b023ef98564d3a4c3feff36c3a49a58d155570ca0c3d80cab59b06cab8e6d76d4a0345be7245fd890c6d78e54d5e54 tiny-cloud-3.1.0.tar.gz
+fb3cc32b7ba8b42c30351520ac3ed9dffe9844e0ad5042582fabb562a957697390792a7879ab2875f3451835791ef8d864f66ba2bca3bbf5d02ba9f8765cb649 autoinstall.patch
83217a30e495bcc18ad1a5d744806d499b5bdf929df3f18597216a25f465e5d4764ca66499d221bf5738b83639f1ec80de2a14e4b64aac80d51b285c01f0fc74 tiny-cloud.pre-upgrade
a2f795c1d9cce1a796cc92711b18459706b6573417d2ef43504c50a65f4808eaf8f8d48a20a4f198ade25c285188659a95d51e5cb34e4c64cf6384459397b850 tiny-cloud-openrc.pre-upgrade
8fd43cabc3de03cf47d5252ac2642d9c943f042b7a5c96a6691c0523fc75ee114363affedbe108fe8f1c2ef4ef7146563d488b6f7ef89b3a3ac6b4ac355e9d48 tiny-cloud-aws.post-install
diff --git a/main/tiny-cloud/autoinstall.patch b/main/tiny-cloud/autoinstall.patch
new file mode 100644
index 000000000000..a94558f839db
--- /dev/null
+++ b/main/tiny-cloud/autoinstall.patch
@@ -0,0 +1,25 @@
+From f643fad6327c400631558d734bde9da75792c604 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Sat, 18 Jan 2025 18:49:45 +0000
+Subject: [PATCH] alpine-config: fix bug when running autoinstall
+
+---
+ lib/tiny-cloud/user-data/alpine-config | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/tiny-cloud/user-data/alpine-config b/lib/tiny-cloud/user-data/alpine-config
+index def1b1f..63e10ca 100644
+--- a/lib/tiny-cloud/user-data/alpine-config
++++ b/lib/tiny-cloud/user-data/alpine-config
+@@ -71,7 +71,7 @@ init__userdata_autoinstall() {
+ if [ -n "$disk" ]; then
+ rm -f "$ETC"/runlevels/*/tiny-cloud*
+ $MOCK lbu include /root/.ssh /home
+- $MOCK ERASE_DISKS=/dev/$disk setup-disk -m sys /dev/$disk
++ ERASE_DISKS=/dev/$disk $MOCK setup-disk -m sys /dev/$disk
+ # TODO: make reboot configurable
+ $MOCK reboot
+ else
+--
+GitLab
+
--
GitLab