From 43dba290896f84552c31385ef9ff008fed7e473c Mon Sep 17 00:00:00 2001 From: clayton craft Date: Wed, 23 Aug 2017 10:05:05 -0700 Subject: [PATCH] Fix issue with deviceinfo modules not loading in init (#451) When modules are surrounded with quotes, modprobe seems to be treating them as all one module and none of them are actually loaded. On the N900, where a watchdog module MUST be loaded on boot, this results in the device shutting down after 30 seconds. This commit corrects this in init.sh.in --- main/postmarketos-mkinitfs/APKBUILD | 4 ++-- main/postmarketos-mkinitfs/init.sh.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index f67003bc0..7bf9a3f52 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-mkinitfs pkgver=0.3.3 -pkgrel=5 +pkgrel=6 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://github.com/postmarketOS" # multipath-tools: kpartx @@ -25,6 +25,6 @@ package() { "$pkgdir/sbin/mkinitfs" mkdir -p "$pkgdir/etc/postmarketos-mkinitfs/hooks/" } -sha512sums="8607f772b1e5854cde27f6d7df3ce083095eb2e13d13c5ef59f0b5820777220cd0f22019a888e5aa884a8833646813e85bf4e94fbe2182a957ec528cc5bee355 init.sh.in +sha512sums="3d0215d61a34e846c6c3e4ff1911742a620cd1c6ff1de3cf26eaa4cb7643467da72bf9abc6a53992cc750bb76340be820149b25b806152b70fc0d40e0f8aa310 init.sh.in 2331fe9a89ba58348b41fbfdeb6f4daeff3f6ef161d1b7582c3e900baba377fa9411efa0b052ea5c2ae22f75bc48f6b8f38dafad0bd836a0319906e70482898c init_functions.sh ef1481ef45e786486fb8e9939f756afb1d873a92546468d3dda3065ef46404be7e9847ab1f630fa6cf3e4ab99bdb116401093bbb1bbc882ea85ea824cdf7e389 mkinitfs.sh" diff --git a/main/postmarketos-mkinitfs/init.sh.in b/main/postmarketos-mkinitfs/init.sh.in index c19dfb1ff..c05c2b6a0 100644 --- a/main/postmarketos-mkinitfs/init.sh.in +++ b/main/postmarketos-mkinitfs/init.sh.in @@ -10,8 +10,8 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin # Mount everything, set up logging, modules, mdev mount_proc_sys_dev setup_log -# shellcheck disable=SC2154 -[ -d /lib/modules ] && modprobe -a "${deviceinfo_modules_initfs} ext4" +# shellcheck disable=SC2154,SC2086 +[ -d /lib/modules ] && modprobe -a ${deviceinfo_modules_initfs} ext4 setup_mdev mount_subpartitions