From 1150ed8bfeb2d57bcb0a0c0c5623b9cdac787155 Mon Sep 17 00:00:00 2001 From: nachoparker Date: Mon, 24 Sep 2018 17:10:52 -0600 Subject: [PATCH] nc-format-USB: fix --- changelog.md | 6 ++++-- etc/ncp-config.d/nc-format-USB.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index f834b997d..77a098794 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,9 @@ -[v0.60.5](https://github.com/nextcloud/nextcloudpi/commit/601cf1e) (2018-09-23) armbian: fix locales for ncp-config +[v0.60.6](https://github.com/nextcloud/nextcloudpi/commit/bf1a052) (2018-09-24) nc-format-USB: fix -[v0.60.4](https://github.com/nextcloud/nextcloudpi/commit/a7f0fd2) (2018-09-23) build: use a separate file for NCP database config +[v0.60.5](https://github.com/nextcloud/nextcloudpi/commit/3de5fe0) (2018-09-23) armbian: fix locales for ncp-config + +[v0.60.4, master](https://github.com/nextcloud/nextcloudpi/commit/a7f0fd2) (2018-09-23) build: use a separate file for NCP database config [v0.60.3](https://github.com/nextcloud/nextcloudpi/commit/1bfcebc) (2018-09-23) nc-update-nextcloud: workaround news integrity bug diff --git a/etc/ncp-config.d/nc-format-USB.sh b/etc/ncp-config.d/nc-format-USB.sh index fa2d154bc..dcd2a9264 100644 --- a/etc/ncp-config.d/nc-format-USB.sh +++ b/etc/ncp-config.d/nc-format-USB.sh @@ -40,7 +40,7 @@ configure() done # do it - local NAME=( $( lsblk -ln | grep -v -e mmcblk -e zram | grep disk | awk '{ print $1 }' ) ) + local NAME=( $( lsblk -ln | grep "^sd[[:alpha:]].*disk" | awk '{ print $1 }' ) ) [[ ${#NAME[@]} != 1 ]] && { echo "unexpected error"; return 1; } wipefs -a -f /dev/"$NAME" || return 1