diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-12-19 22:46:35 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-12-19 23:17:40 +0100 |
| commit | 64d8a02abb597b48bb58ccbbf001c6abb69af367 (patch) | |
| tree | 6fc45e8e0e1c9d9b759a82807fa48f5b1089d341 | |
| parent | 9a161edf90f6e45eafba5d47ff01b51a819d4e7b (diff) | |
| download | aports-64d8a02abb597b48bb58ccbbf001c6abb69af367.tar.bz2 aports-64d8a02abb597b48bb58ccbbf001c6abb69af367.tar.xz | |
main/mkinitfs: backport fix for warning message during boot
| -rw-r--r-- | main/mkinitfs/0001-init-quote-rootfstype-during-comparison.patch | 24 | ||||
| -rw-r--r-- | main/mkinitfs/APKBUILD | 7 |
2 files changed, 28 insertions, 3 deletions
diff --git a/main/mkinitfs/0001-init-quote-rootfstype-during-comparison.patch b/main/mkinitfs/0001-init-quote-rootfstype-during-comparison.patch new file mode 100644 index 0000000000..2f0239164c --- /dev/null +++ b/main/mkinitfs/0001-init-quote-rootfstype-during-comparison.patch @@ -0,0 +1,24 @@ +From 6e5b1852be0247803ea070a6708010a0d3c2bc3e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net> +Date: Thu, 19 Dec 2019 22:39:11 +0100 +Subject: [PATCH] init: quote $rootfstype during comparison + +Without this change this may result in a warning message to be printed +during boot if the rootfstype kernel parameter is not set. +--- + initramfs-init.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/initramfs-init.in b/initramfs-init.in +index 76f284c..eaacb13 100755 +--- a/initramfs-init.in ++++ b/initramfs-init.in +@@ -503,7 +503,7 @@ if [ -n "$KOPT_root" ]; then + mkdir -p /media/root-rw/work /media/root-rw/root + mount -t overlay -o lowerdir=/media/root-ro,upperdir=/media/root-rw/root,workdir=/media/root-rw/work overlayfs $sysroot + else +- if [ $rootfstype = "zfs" ]; then ++ if [ "$rootfstype" = "zfs" ]; then + prepare_zfs_root + fi + mount ${rootfstype:+-t} ${rootfstype} \ diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 752e38ae2b..fded998892 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=3.4.4 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url="https://git.alpinelinux.org/cgit/mkinitfs" arch="all" @@ -16,7 +16,7 @@ subpackages="$pkgname-doc" install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade" triggers="$pkgname.trigger=/usr/share/kernel/*" source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$_ver.tar.xz - " + 0001-init-quote-rootfstype-during-comparison.patch" build() { cd "$builddir" @@ -28,4 +28,5 @@ package() { make install DESTDIR="$pkgdir" } -sha512sums="0f26969cb0e6627e7594f09038ada99ea1fa161de918834b95a92d5ba41ebe2ffa93510e2797310f98c963a3140dbde53747064f43ebc31c15bb061a56173ee5 mkinitfs-3.4.4.tar.xz" +sha512sums="0f26969cb0e6627e7594f09038ada99ea1fa161de918834b95a92d5ba41ebe2ffa93510e2797310f98c963a3140dbde53747064f43ebc31c15bb061a56173ee5 mkinitfs-3.4.4.tar.xz +2cf3c2fb190e0001c4c29495cd1f3661a75ae61cd540f77759836b0cca13c638e7c3789c1456dbc27be124cf6f7ebc688815a1ad8a2dff09f4e75eac62a67d58 0001-init-quote-rootfstype-during-comparison.patch" |