Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/nextcloudpi.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornachoparker <nacho@ownyourbits.com>2018-09-25 02:10:52 +0300
committernachoparker <nacho@ownyourbits.com>2018-09-25 02:11:10 +0300
commit1150ed8bfeb2d57bcb0a0c0c5623b9cdac787155 (patch)
treedd4b473b1c526434b0da4c949888b19469633774
parent3de5fe0cfe0ded97e945db5ccf617cd40bfb79db (diff)
nc-format-USB: fixv0.60.6
-rw-r--r--changelog.md6
-rw-r--r--etc/ncp-config.d/nc-format-USB.sh2
2 files changed, 5 insertions, 3 deletions
diff --git a/changelog.md b/changelog.md
index f834b997..77a09879 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 fa2d154b..dcd2a926 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