diff options
| author | Oliver V <ovpc@users.noreply.github.com> | 2021-10-11 18:54:58 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2021-10-12 00:56:03 +0300 |
| commit | b64859e2375c573d15e48e401b2a6fef17211109 (patch) | |
| tree | 3adda42cc7b3ac51a3b236870a92dfd16aa31cbf | |
| parent | f3fda8f9488579b2fa901d235ab56d25f491e6fc (diff) | |
add architecture and kernel info to ncp-info (#1360)v1.40.6
| -rw-r--r-- | bin/ncp-diag | 3 | ||||
| -rw-r--r-- | changelog.md | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/bin/ncp-diag b/bin/ncp-diag index 49260a70..d8780499 100644 --- a/bin/ncp-diag +++ b/bin/ncp-diag @@ -16,7 +16,7 @@ source /usr/local/etc/library.sh # Distro, NCP version and tag echo "NextCloudPi version|$( cat /usr/local/etc/ncp-version )" [[ -f /usr/local/etc/ncp-baseimage ]] && echo "NextCloudPi image|$( cat /usr/local/etc/ncp-baseimage )" -echo "distribution|$( cat /etc/issue )" +echo "OS|$(cat /etc/issue | sed 's| \\n \\l||'). $(uname -r) ($(uname -m))" # Data DATADIR="$( grep datadirectory /var/www/nextcloud/config/config.php | @@ -104,6 +104,7 @@ echo "NAT loopback|$( [[ "$RESOLV" == "$IP" ]] && echo yes || echo no )" # Other echo "uptime|$( uptime | cut -f1 -d',' | awk '{ $1=""; $2=""; print }' | tr -d " " )" +# Get kernel version # License # diff --git a/changelog.md b/changelog.md index 472d45a7..b6cd0ff5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,13 @@ +<<<<<<< HEAD [v1.40.5](https://github.com/nextcloud/nextcloudpi/commit/6c3cb37) (2021-10-11) letsencrypt: keep original cert name [v1.40.4 ](https://github.com/nextcloud/nextcloudpi/commit/de104a5) (2021-10-06) Make templating safer and more verbose (#1343) +======= +[v1.40.5](https://github.com/nextcloud/nextcloudpi/commit/f7c393f) (2021-10-11) add architecture and kernel info to ncp-info (#1360) + +[v1.40.4](https://github.com/nextcloud/nextcloudpi/commit/de104a5) (2021-10-06) Make templating safer and more verbose (#1343) +>>>>>>> b532589 (add architecture and kernel info to ncp-info (#1360)) [v1.40.3 ](https://github.com/nextcloud/nextcloudpi/commit/8a6c1c0) (2021-10-06) ncp-check-nc-version: dont notify the same version more than once |