diff options
| author | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-02-21 15:07:50 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@alpinelinux.org> | 2018-02-21 15:08:09 +0000 |
| commit | ffe7f4a37348c151612c0903ec7fe176fa4d879d (patch) | |
| tree | a02fdba0640534c299f3fa61836319878515573a /main | |
| parent | f8b9271a13e370dc666a6b00bdf1ca1d3b69e53b (diff) | |
| download | aports-ffe7f4a37348c151612c0903ec7fe176fa4d879d.tar.bz2 aports-ffe7f4a37348c151612c0903ec7fe176fa4d879d.tar.xz | |
main/mkinitfs: fix netboot warning
Diffstat (limited to 'main')
| -rw-r--r-- | main/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch | 28 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 8 |
2 files changed, 34 insertions, 2 deletions
diff --git a/main/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch b/main/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch new file mode 100644 index 0000000000..e6e580a145 --- /dev/null +++ b/main/mkinitfs/0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch @@ -0,0 +1,28 @@ +From 1d115251816a3f83a008883f1b9665c3d8f4d3a4 Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter <clandmeter@alpinelinux.org> +Date: Tue, 20 Feb 2018 10:18:11 +0000 +Subject: [PATCH] initramfs: do not relocate mountpoint for netboot + +mountpoint cannot be located when repo is external. +--- + initramfs-init.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 95fcd97..bf2d9bd 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -221,6 +221,10 @@ relocate_mount() { + return + fi + while read dir; do ++ # skip http(s)/ftp repos for netboot ++ if ! [ -d "$dir" ]; then ++ continue ++ fi + local dev=$(df -P "$dir" | tail -1 | awk '{print $1}') + local mnt=$(find_mnt $dev $fstab) + if [ -n "$mnt" ]; then +-- +2.16.1 + diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index c1f5af603e..06898352f8 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,11 +2,13 @@ pkgname=mkinitfs pkgver=3.2.0 _ver=${pkgver%_git*} -pkgrel=6 +pkgrel=7 pkgdesc="Tool to generate initramfs images for Alpine" url="https://git.alpinelinux.org/cgit/mkinitfs" arch="all" license="GPL-2.0" +# currently we do not ship any testsuite +options="!check" makedepends_build="" makedepends_host="busybox kmod-dev util-linux-dev cryptsetup-dev linux-headers" makedepends="$makedepends_build $makedepends_host" @@ -16,6 +18,7 @@ triggers="$pkgname.trigger=/usr/share/kernel/*" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz 0001-skip-hooks-on-diskless-install.patch 0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch + 0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch " builddir="$srcdir/$pkgname-$_ver" @@ -31,4 +34,5 @@ package() { sha512sums="906bfbce677d4ece9c9fea7b2a529121740bc9d96ea011be083303cc5c56162f09271b0a673e9e335234ccf2f293109bda1eda333698a95357d0772c86f498af mkinitfs-3.2.0.tar.xz f5c9b21e53c663dac1b8f33f929dbe067492f0dc1bd5ef5310ef531033f31fc3fa0b6de6dce03cecaf90b8ed47b278d0f1f7c64dbbeede7621c895ee3ea79864 0001-skip-hooks-on-diskless-install.patch -4d298d73cc6e557c51de805721ef4b9f002498af5dd9f0aebfd6620ec84d1fadde76888bc2d40efc71dc0a8497aa0586ac65d596eb0021bfed633adcc3aca3b4 0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch" +4d298d73cc6e557c51de805721ef4b9f002498af5dd9f0aebfd6620ec84d1fadde76888bc2d40efc71dc0a8497aa0586ac65d596eb0021bfed633adcc3aca3b4 0001-nlplug-findfs-add-primitive-support-for-LUKS2-contai.patch +4387357cfcd3441c5d8777e42c0e62a73fa446aacd2faac081947afc39bdd8fb91e12b34f3b69a6827bd7d0705f54514b77c0ff4c38ee0d70553050117c42576 0001-initramfs-do-not-relocate-mountpoint-for-netboot.patch" |