From f829d0fe03f1bf32c2f90d4ed3ea98b5a4a600ab Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 9 Aug 2017 20:30:41 +0000 Subject: [PATCH] Configfs network setup was broken (related to #338) (#353) * Partially resolve #338: Configfs network setup was broken * Ignore shellcheck warning ...because if we do what shellcheck recommends here, we end up with exactly the code which we're reverting in this PR. --- aports/main/postmarketos-mkinitfs/APKBUILD | 4 ++-- aports/main/postmarketos-mkinitfs/init_functions.sh | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/aports/main/postmarketos-mkinitfs/APKBUILD b/aports/main/postmarketos-mkinitfs/APKBUILD index 8ca24111..e8730e1c 100644 --- a/aports/main/postmarketos-mkinitfs/APKBUILD +++ b/aports/main/postmarketos-mkinitfs/APKBUILD @@ -1,5 +1,5 @@ pkgname=postmarketos-mkinitfs -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://github.com/postmarketOS" @@ -26,5 +26,5 @@ package() { mkdir -p "$pkgdir/etc/postmarketos-mkinitfs/hooks/" } sha512sums="95e49eb5e7891d319543165290fb7279733e696db8c768d864d87ef36a20b04e1c4e8a1702a2927e7492ea2e9f3d4fdd83d9ea55811969689b9c2483fb3b44c4 init.sh.in -66207a12dba2be8868d080e69e54dce43c8a3edbbd08a6585f8ad49034e32bbe9184c4c77b5fe49049d7475f930781f48919a12eb4d82c9e0008f6fa6da0d035 init_functions.sh +64aa05363f79a0cf2319740753b8852f5252a5b35b23fecccb131cd77d306cd4c7fe287b2d58cea456f669ff99e20f53cf609703530abf6eda7c958a9e0811d2 init_functions.sh 81ae1b6c1a96fbefe842b5e2cc8790c4c9761d9c714a8a6d6a623834e290e5255f5695740d38dc5bc2571aa0eeab54bb5ce69fe1457db5ef84b56d8a8e8eee9d mkinitfs.sh" diff --git a/aports/main/postmarketos-mkinitfs/init_functions.sh b/aports/main/postmarketos-mkinitfs/init_functions.sh index 657a4340..87910a39 100644 --- a/aports/main/postmarketos-mkinitfs/init_functions.sh +++ b/aports/main/postmarketos-mkinitfs/init_functions.sh @@ -214,7 +214,10 @@ setup_usb_network_configfs() { printf "%s" "rndis" > $CONFIGFS/g1/configs/c.1/strings/0x409/configuration ln -s $CONFIGFS/g1/functions/rndis.usb0 $CONFIGFS/g1/configs/c.1 - ls /sys/class/udc > $CONFIGFS/g1/UDC + + # See also: #338 + # shellcheck disable=SC2005 + echo "$(ls /sys/class/udc)" > $CONFIGFS/g1/UDC } setup_usb_network() {