diff --git a/main/mkinitfs/0001-init-use-alpine-cloud-provider-instead-of-nocloud.patch b/main/mkinitfs/0001-init-use-alpine-cloud-provider-instead-of-nocloud.patch new file mode 100644 index 00000000000..457e606dd09 --- /dev/null +++ b/main/mkinitfs/0001-init-use-alpine-cloud-provider-instead-of-nocloud.patch @@ -0,0 +1,25 @@ +From 9acaa5a848963a41999cfe6b913f5baa1f6c7450 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Mon, 8 May 2023 22:51:36 +0200 +Subject: [PATCH] init: use alpine cloud provider instead of nocloud + +--- + initramfs-init.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index ccef0fe..8d75fb1 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -691,7 +691,7 @@ if [ -f "$sysroot/etc/.default_boot_services" -o ! -f "$ovl" ]; then + fi + + if findfs LABEL=cidata >/dev/null 2>&1 || findfs LABEL=CIDATA >/dev/null 2>&1; then +- pkgs="$pkgs tiny-cloud-nocloud ifupdown-ng" ++ pkgs="$pkgs tiny-cloud-alpine ifupdown-ng" + rc_add tiny-cloud-early boot + rc_add tiny-cloud default + rc_add tiny-cloud-final default +-- +2.40.1 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 53b3342d386..1f1a3901620 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -3,7 +3,7 @@ pkgname=mkinitfs pkgver=3.8.0_rc4 # shellcheck disable=SC2034 # used for git versions, keep around for next time _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url="https://gitlab.alpinelinux.org/alpine/mkinitfs" arch="all" @@ -24,6 +24,7 @@ subpackages="$pkgname-doc" install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="https://gitlab.alpinelinux.org/alpine/mkinitfs/-/archive/$pkgver/mkinitfs-$pkgver.tar.gz + 0001-init-use-alpine-cloud-provider-instead-of-nocloud.patch " provides="initramfs-generator" @@ -39,4 +40,5 @@ package() { sha512sums=" 04ea081fae76681115a48f0192be1b4e193289ef560f214d0eae2060d40fc92888cda394d1efa7d42f4defeaf6fbd0d8f07545e37c351c8e02d37d72926641dd mkinitfs-3.8.0_rc4.tar.gz +99dbbafe79b9e935a7406d5d5cbf02752f664b929526ca943e7e19fb0d09a1f883159199cd54732f523ce127030948efd59c4034d75a61b4b0811511151dcf51 0001-init-use-alpine-cloud-provider-instead-of-nocloud.patch " diff --git a/scripts/mkimg.base.sh b/scripts/mkimg.base.sh index 1ce6f16d308..f68b2b994f5 100755 --- a/scripts/mkimg.base.sh +++ b/scripts/mkimg.base.sh @@ -327,7 +327,7 @@ profile_base() { esac apks="alpine-base busybox chrony dhcpcd doas e2fsprogs kbd-bkeymaps network-extras openntpd openssl openssh - tzdata wget tiny-cloud-nocloud" + tzdata wget tiny-cloud-alpine" apkovl= hostname="alpine" }