X-Original-To: alpine-aports@lists.alpinelinux.org
Received: from hurricane.the-brannons.com (hurricane.the-brannons.com [71.19.155.94])
	by lists.alpinelinux.org (Postfix) with ESMTP id 434105C4E98
	for <alpine-aports@lists.alpinelinux.org>; Sun, 11 Feb 2018 01:13:44 +0000 (GMT)
Received: from localhost (unknown [IPv6:2602:b8:64e6:1100:cdfd:fafb:48e1:ae4f])
	by hurricane.the-brannons.com (Postfix) with ESMTPSA id A9F3477AAF
	for <alpine-aports@lists.alpinelinux.org>; Sat, 10 Feb 2018 17:13:01 -0800 (PST)
From: Christopher Brannon <chris@the-brannons.com>
To: alpine-aports@lists.alpinelinux.org
Subject: [alpine-aports] [PATCH] mkinitfs: point the /boot/boot symlink at ., not /.
Date: Sat, 10 Feb 2018 17:13:43 -0800
Message-Id: <20180211011343.16188-1-chris@the-brannons.com>
X-Mailer: git-send-email 2.15.1
X-Mailinglist: alpine-aports
Precedence: list
List-Id: Alpine Development <alpine-aports.lists.alpinelinux.org>
List-Unsubscribe: 
	<mailto:alpine-aports+unsubscribe@lists.alpinelinux.org?subject=unsubscribe>
List-Post: <mailto:alpine-aports@lists.alpinelinux.org>
List-Help: <mailto:alpine-aports+help@lists.alpinelinux.org?subject=help>
List-Subscribe: 
	<mailto:alpine-aports+subscribe@lists.alpinelinux.org?subject=subscribe>

From: Linux User <cmb@cmb-alpine..test>

If /boot is on the root partition, then /boot/boot should not point
to /, because it will be pointing at the wrong directory.  Pointing
/boot/boot to "." is correct in all situations.
---
 main/mkinitfs/APKBUILD         | 2 +-
 main/mkinitfs/mkinitfs.trigger | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD
index 1b3ce792ed..c2f18b4d7d 100644
--- a/main/mkinitfs/APKBUILD
+++ b/main/mkinitfs/APKBUILD
@@ -2,7 +2,7 @@
 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"
diff --git a/main/mkinitfs/mkinitfs.trigger b/main/mkinitfs/mkinitfs.trigger
index cedf36337d..e8acc97854 100644
--- a/main/mkinitfs/mkinitfs.trigger
+++ b/main/mkinitfs/mkinitfs.trigger
@@ -18,7 +18,7 @@ done
 # extlinux will use path relative partition, so if /boot is on a
 # separate partition we want /boot/<kernel> resolve to /<kernel>
 if ! [ -e /boot/boot ]; then
-	ln -sf / /boot/boot
+	ln -sf . /boot/boot
 fi
 
 # cleanup unused initramfs
-- 
2.15.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---