From cea8f539a010bd3ac60aff7b78f3ba95c2ad001c Mon Sep 17 00:00:00 2001 From: bert hubert Date: Tue, 28 Apr 2020 22:31:28 +0200 Subject: [PATCH] work by @ptudor on the Debian scripts --- debian/control | 2 +- debian/galmon.galmon-upgrade.service | 1 + debian/galmon.postinst | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 820b320..df4280b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: galmon Section: net Priority: optional Maintainer: Patrick Tudor -Build-Depends: debhelper (>=11~) +Build-Depends: debhelper (>=11~), help2man, libzstd-dev, adduser Standards-Version: 4.3.0 Homepage: https://github.com/ahupowerdns/galmon/ diff --git a/debian/galmon.galmon-upgrade.service b/debian/galmon.galmon-upgrade.service index 3c80a14..cfc0d90 100644 --- a/debian/galmon.galmon-upgrade.service +++ b/debian/galmon.galmon-upgrade.service @@ -6,6 +6,7 @@ StartLimitIntervalSec=0 ConditionPathExists=/etc/default/galmon [Service] +Environment=DEBIAN_FRONTEND=noninteractive Type=simple Restart=no ExecStartPre=+apt-get update diff --git a/debian/galmon.postinst b/debian/galmon.postinst index f11d2d5..d57324e 100755 --- a/debian/galmon.postinst +++ b/debian/galmon.postinst @@ -17,7 +17,9 @@ if getent passwd ubxtool > /dev/null ; then echo "galmon: ubxtool user exists, skipping" else echo "galmon: creating ubxtool system user" - adduser --system ubxtool && adduser ubxtool ubxtool + adduser --system ubxtool --no-create-home --home /run/ubxtool + echo "galmon: adding ubxtool user to ubxtool group" + adduser ubxtool ubxtool echo "galmon: adding ubxtool user to dialout group" adduser ubxtool dialout fi @@ -41,7 +43,7 @@ print_help_text() { echo "Example: cp /etc/default/galmon /etc/default/ubxtool-ttyACM0" echo "Example: vi /etc/default/ubxtool-ttyACM0" echo "Example: systemctl enable --now ubxtool@ttyACM0" - echo "Example: systemctl enable --now galmon-upgrade.timer" + echo "Example: (beta testing) systemctl enable --now galmon-upgrade.timer" } setup_user