From ebc52d13a8ef2a282cbe43ebe8cbed2fedcf2268 Mon Sep 17 00:00:00 2001 From: macmpi Date: Mon, 18 Sep 2023 19:24:49 +0200 Subject: [PATCH] Add test for internet availability --- headless.apkovl.tar.gz | Bin 5642 -> 5934 bytes overlay/etc/local.d/headless.start | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/headless.apkovl.tar.gz b/headless.apkovl.tar.gz index aaac53ca077c83efa0184a819a34523948774e4a..4b9b1a29aa7dedaf8ef86ff9cdf1a482edcf5dc3 100644 GIT binary patch delta 5812 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 diff --git a/overlay/etc/local.d/headless.start b/overlay/etc/local.d/headless.start index 0ad1ec6..18afb85 100755 --- a/overlay/etc/local.d/headless.start +++ b/overlay/etc/local.d/headless.start @@ -39,7 +39,7 @@ _restore() { fi } -##### End of part to be dupplicated into post-cleanup (do not alter!) +##### End of part to be duplicated into post-cleanup (do not alter!) # Redirect stdout and errors to console as rc.local does not log anything @@ -189,6 +189,16 @@ sed -n '/^#* End .*alter!)$/q;p' /etc/local.d/headless.start > /tmp/.trash/post- cat <<-EOF >> /tmp/.trash/post-cleanup + _tst_inet() { + ## Tested URL redirects to github project page: is.gd shortener provides basic analytics. + ## Analytics are public and can be checked at https://is.gd/stats.php?url=apkovl_run + ## Privacy policy: https://is.gd/privacy.php + INET="failed" + wget -q -T 10 --spider https://is.gd/apkovl_run > /dev/null 2>&1 && + INET="success" + logger -st ${0##*/} "Internet access: \$INET" + } + logger -st ${0##*/} "Cleaning-up..." _restore "/etc/ssh/sshd_config" _restore "/etc/conf.d/sshd" @@ -202,6 +212,11 @@ cat <<-EOF >> /tmp/.trash/post-cleanup rc-update del local default rm /etc/local.d/headless.start + # Internet connectivity test + # Can be skipped by creating a 'opt-out'-named dummy file aside apkovl file + [ -f "${ovlpath}/opt-out" ] || _tst_inet & + + # Run unattended script if available if [ -f "${ovlpath}/unattended.sh" ]; then install -m755 "${ovlpath}/unattended.sh" /tmp/unattended.sh /tmp/unattended.sh >/dev/console 2>&1 &