Loading slideshow…
diff --git a/kiosk-app/slideshow.js b/kiosk-app/slideshow.js
index c515b6a..708d5d3 100644
--- a/kiosk-app/slideshow.js
+++ b/kiosk-app/slideshow.js
@@ -2,20 +2,29 @@
//
// A site whose URL is a local folder (file:///home/kiosk/photos, entered
// in the Sites menu or Web UI as /home/kiosk/photos/) is shown as a
-// full-screen slideshow of the images in it, instead of Chromium's
-// directory listing. main.js swaps the folder URL for slideshow.html via
-// resolveSiteUrl(), then hands the page its image list with attach() -
-// the page itself has no filesystem access (contextIsolation, no Node).
-// The folder is re-read every minute, so images added or removed show up
-// without restarting the kiosk.
+// full-screen slideshow of the images, Word documents (.docx) and PDFs in it,
+// instead of Chromium's directory listing. main.js swaps the folder URL
+// for slideshow.html via resolveSiteUrl(), then attach() hands the page
+// its item list - the page itself has no filesystem access
+// (contextIsolation, no Node). The folder is re-read every minute, so
+// files added, removed or changed show up without restarting the kiosk.
+//
+// Images load directly by file:// URL. A document's bytes are fetched on
+// demand: the page sets its title to TITLE_REQUEST + the document's URL,
+// and attach() answers via kioskSlideshow.docData() - but only for a
+// document (.docx/.pdf) in that slideshow's own current item list, so a page can't use
+// this to read anything else on disk.
//
// Optional slideshow.json in the folder (all keys optional):
// { "interval": 10, seconds per image (default 10, minimum 2)
+// "docInterval": 20, seconds per document - .docx or PDF (default 2x interval,
+// minimum 5); a document longer than the
+// screen scrolls slowly top to bottom in it
// "shuffle": false, random order instead of by file name
-// "fit": "contain", "contain" (whole image, letterboxed) or
-// "cover" (fill the screen, cropped)
+// "fit": "contain", images: "contain" (whole image, letterboxed)
+// or "cover" (fill the screen, cropped)
// "transition": 1, crossfade seconds (0 = instant cut)
-// "recursive": false } include images in subfolders
+// "recursive": false } include files in subfolders
const fs = require('fs');
const path = require('path');
@@ -23,13 +32,16 @@ const { fileURLToPath, pathToFileURL } = require('url');
const SLIDESHOW_PAGE = path.join(__dirname, 'slideshow.html');
const IMAGE_EXT = new Set(['.jpg', '.jpeg', '.png', '.gif', '.webp', '.bmp', '.svg', '.avif']);
+const DOC_TYPES = { '.docx': 'docx', '.pdf': 'pdf' };
const REFRESH_MS = 60000;
-const DEFAULTS = { interval: 10, shuffle: false, fit: 'contain', transition: 1, recursive: false };
+const MAX_DOC_BYTES = 50 * 1024 * 1024;
+const TITLE_REQUEST = 'kiosk-slideshow-need:';
+const DEFAULTS = { interval: 10, docInterval: null, shuffle: false, fit: 'contain', transition: 1, recursive: false };
// The folder path a site URL points at, or null if it isn't a slideshow.
// A file:// URL counts when it's an existing directory, or ends in "/"
// (so a folder that isn't there yet - e.g. a USB stick not plugged in -
-// still shows the slideshow's "no images" message, not an error page).
+// still shows the slideshow's "nothing to show" message, not an error).
function slideshowDir(url) {
if (typeof url !== 'string' || !url.startsWith('file://')) return null;
let p;
@@ -57,20 +69,22 @@ function resolveSiteUrl(url) {
function readOptions(dir) {
const opts = { ...DEFAULTS };
+ let user = {};
try {
- const user = JSON.parse(fs.readFileSync(path.join(dir, 'slideshow.json'), 'utf8'));
- if (Number(user.interval) > 0) opts.interval = Math.max(2, Number(user.interval));
- if (typeof user.shuffle === 'boolean') opts.shuffle = user.shuffle;
- if (user.fit === 'contain' || user.fit === 'cover') opts.fit = user.fit;
- if (Number(user.transition) >= 0) opts.transition = Math.min(Number(user.transition), opts.interval / 2);
- if (typeof user.recursive === 'boolean') opts.recursive = user.recursive;
+ user = JSON.parse(fs.readFileSync(path.join(dir, 'slideshow.json'), 'utf8'));
} catch (e) {
// No (or unreadable) slideshow.json - defaults.
}
+ if (Number(user.interval) > 0) opts.interval = Math.max(2, Number(user.interval));
+ opts.docInterval = Number(user.docInterval) > 0 ? Math.max(5, Number(user.docInterval)) : opts.interval * 2;
+ if (typeof user.shuffle === 'boolean') opts.shuffle = user.shuffle;
+ if (user.fit === 'contain' || user.fit === 'cover') opts.fit = user.fit;
+ if (Number(user.transition) >= 0) opts.transition = Math.min(Number(user.transition), opts.interval / 2);
+ if (typeof user.recursive === 'boolean') opts.recursive = user.recursive;
return opts;
}
-function listImages(dir, recursive, depth = 0) {
+function listItems(dir, recursive, depth = 0) {
let entries;
try {
entries = fs.readdirSync(dir, { withFileTypes: true });
@@ -79,12 +93,18 @@ function listImages(dir, recursive, depth = 0) {
}
const out = [];
for (const e of entries) {
- if (e.name.startsWith('.')) continue;
+ // Skip hidden files and Word's "~$name.docx" lock files.
+ if (e.name.startsWith('.') || e.name.startsWith('~$')) continue;
const full = path.join(dir, e.name);
+ const ext = path.extname(e.name).toLowerCase();
if (e.isDirectory()) {
- if (recursive && depth < 8) out.push(...listImages(full, recursive, depth + 1));
- } else if (IMAGE_EXT.has(path.extname(e.name).toLowerCase())) {
- out.push(full);
+ if (recursive && depth < 8) out.push(...listItems(full, recursive, depth + 1));
+ } else if (IMAGE_EXT.has(ext)) {
+ out.push({ path: full, type: 'image' });
+ } else if (DOC_TYPES[ext]) {
+ let mtime = 0;
+ try { mtime = fs.statSync(full).mtimeMs; } catch (err) { /* listed but gone */ }
+ out.push({ path: full, type: DOC_TYPES[ext], mtime });
}
}
return out;
@@ -92,36 +112,59 @@ function listImages(dir, recursive, depth = 0) {
function snapshot(dir) {
const options = readOptions(dir);
- const files = listImages(dir, options.recursive)
- .sort((a, b) => a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' }));
- return {
- dir,
- exists: fs.existsSync(dir),
- options,
- images: files.map((f) => pathToFileURL(f).href),
- };
+ const items = listItems(dir, options.recursive)
+ .sort((a, b) => a.path.localeCompare(b.path, undefined, { numeric: true, sensitivity: 'base' }))
+ .map((it) => ({ url: pathToFileURL(it.path).href, type: it.type, ...(it.mtime ? { mtime: it.mtime } : {}) }));
+ return { dir, exists: fs.existsSync(dir), options, items };
}
-// Feed a view's slideshow page its image list now and every REFRESH_MS
-// while it stays on a slideshow. Call once per view (main.js does, right
-// after creating it); safe on views that never show a slideshow.
+function readDoc(fileUrl) {
+ try {
+ const file = fileURLToPath(fileUrl);
+ const st = fs.statSync(file);
+ if (st.size > MAX_DOC_BYTES) return { error: `too large (${Math.round(st.size / 1048576)} MB)` };
+ return { mtime: st.mtimeMs, data: fs.readFileSync(file).toString('base64') };
+ } catch (e) {
+ return { error: e.code === 'ENOENT' ? 'file not found' : e.message };
+ }
+}
+
+// Feed a view's slideshow page its item list now and every REFRESH_MS
+// while it stays on a slideshow, and answer its document requests. Call
+// once per view (main.js does, right after creating it); safe on views
+// that never show a slideshow.
function attach(webContents) {
+ const pagePrefix = pathToFileURL(SLIDESHOW_PAGE).href;
let lastSent = '';
+ let current = null; // latest snapshot sent to the page
+
+ const onSlideshow = () => !webContents.isDestroyed() && webContents.getURL().startsWith(pagePrefix);
+
const send = (force) => {
- if (webContents.isDestroyed()) return;
- const current = webContents.getURL();
- if (!current.startsWith(pathToFileURL(SLIDESHOW_PAGE).href)) return;
- const dir = new URL(current).searchParams.get('dir');
+ if (!onSlideshow()) return;
+ const dir = new URL(webContents.getURL()).searchParams.get('dir');
if (!dir) return;
- const payload = JSON.stringify(snapshot(dir));
+ const snap = snapshot(dir);
+ const payload = JSON.stringify(snap);
if (!force && payload === lastSent) return;
lastSent = payload;
+ current = snap;
webContents.executeJavaScript(`window.kioskSlideshow&&window.kioskSlideshow.update(${payload})`)
.catch(() => {});
};
+
webContents.on('did-finish-load', () => send(true));
+ webContents.on('page-title-updated', (event, title) => {
+ if (!title.startsWith(TITLE_REQUEST) || !onSlideshow() || !current) return;
+ const url = title.slice(TITLE_REQUEST.length);
+ if (!current.items.some((it) => it.type !== 'image' && it.url === url)) return;
+ const doc = readDoc(url);
+ webContents.executeJavaScript(
+ `window.kioskSlideshow&&window.kioskSlideshow.docData(${JSON.stringify(url)},${JSON.stringify(doc)})`,
+ ).catch(() => {});
+ });
const timer = setInterval(() => send(false), REFRESH_MS);
webContents.once('destroyed', () => clearInterval(timer));
}
-module.exports = { resolveSiteUrl, slideshowDir, attach, snapshot };
+module.exports = { resolveSiteUrl, slideshowDir, attach, snapshot, TITLE_REQUEST };
diff --git a/lib/config.sh b/lib/config.sh
index 01f196f..3b9fd50 100644
--- a/lib/config.sh
+++ b/lib/config.sh
@@ -29,6 +29,7 @@
: "${CRON_D_DIR:=/etc/cron.d}"
: "${BIN_DIR:=/usr/local/bin}"
: "${NETPLAN_DIR:=/etc/netplan}"
+: "${TIMESYNCD_CONF_DIR:=/etc/systemd/timesyncd.conf.d}"
: "${POLKIT_DIR:=/etc/polkit-1/localauthority/50-local.d}"
: "${WIREGUARD_DIR:=/etc/wireguard}"
: "${WEBUI_DIR:=/opt/kiosk-webui}"
diff --git a/lib/provision.sh b/lib/provision.sh
index 85067ec..bf774b9 100644
--- a/lib/provision.sh
+++ b/lib/provision.sh
@@ -122,8 +122,9 @@ provision_install_nodejs() {
provision_install_app() {
echo "[4/10] Installing kiosk app..."
- sudo cp "$KIOSK_APP_SRC"/*.js "$KIOSK_APP_SRC"/*.html "$KIOSK_APP_SRC/package.json" "$KIOSK_APP_SRC/start.sh" "$KIOSK_DIR/"
- sudo chown "$KIOSK_USER:$KIOSK_USER" "$KIOSK_DIR"/*.js "$KIOSK_DIR"/*.html "$KIOSK_DIR/package.json" "$KIOSK_DIR/start.sh"
+ # *.mjs: pdf-render.mjs (pdf.js only ships as a JavaScript module).
+ sudo cp "$KIOSK_APP_SRC"/*.js "$KIOSK_APP_SRC"/*.mjs "$KIOSK_APP_SRC"/*.html "$KIOSK_APP_SRC/package.json" "$KIOSK_APP_SRC/start.sh" "$KIOSK_DIR/"
+ sudo chown "$KIOSK_USER:$KIOSK_USER" "$KIOSK_DIR"/*.js "$KIOSK_DIR"/*.mjs "$KIOSK_DIR"/*.html "$KIOSK_DIR/package.json" "$KIOSK_DIR/start.sh"
sudo chmod +x "$KIOSK_DIR/start.sh"
if offline_mode_active; then
diff --git a/menus/addon_asterisk_intercom.sh b/menus/addon_asterisk_intercom.sh
index 7a54274..c70a418 100644
--- a/menus/addon_asterisk_intercom.sh
+++ b/menus/addon_asterisk_intercom.sh
@@ -36,6 +36,9 @@
################################################################################
BARESIP_CONFIG_DIR="${KIOSK_HOME}/.baresip"
+# Also read by iso/offline/build-bundle.sh to bundle them for offline installs.
+# pulseaudio-utils/pipewire-pulse: pactl, for audio routing.
+ASTERISK_INTERCOM_APT_PACKAGES=(baresip pulseaudio-utils pipewire-pulse)
BARESIP_USER_SERVICE_DIR="${KIOSK_HOME}/.config/systemd/user"
# Runs `systemctl --user ...` as $KIOSK_USER with the runtime dir/D-Bus
@@ -169,14 +172,13 @@ action_configure_asterisk_intercom() {
echo
echo "Installing Baresip..."
- if ! command -v baresip &>/dev/null; then
- if ! sudo apt install -y baresip; then
+ if ! command -v baresip &>/dev/null || ! command -v pactl &>/dev/null; then
+ if ! run_with_offline_fallback sudo apt install -y "${ASTERISK_INTERCOM_APT_PACKAGES[@]}"; then
log_error "Failed to install baresip package"
pause
return 1
fi
fi
- sudo apt install -y pulseaudio-utils pipewire-pulse 2>/dev/null || true
sudo mkdir -p "$BARESIP_CONFIG_DIR"
diff --git a/menus/addon_lms_squeezelite.sh b/menus/addon_lms_squeezelite.sh
index ac779a3..dfadcda 100644
--- a/menus/addon_lms_squeezelite.sh
+++ b/menus/addon_lms_squeezelite.sh
@@ -22,10 +22,23 @@
# Depends on: lib/menu.sh, lib/config.sh being sourced first.
################################################################################
+# Also read by iso/offline/build-bundle.sh, to bundle the same versions
+# for offline installs (the .deb itself plus its apt dependencies).
+LMS_DEB_URL="https://downloads.lms-community.org/LyrionMusicServer_v9.0.3/lyrionmusicserver_9.0.3_amd64.deb"
+SQUEEZELITE_APT_PACKAGES=(squeezelite)
+
+# True on a kiosk installed from an --offline ISO that can't reach the
+# internet right now - the one case where LMS comes from the bundle.
+lms_offline_install_wanted() {
+ grep -q '^Package: lyrionmusicserver$' "$KIOSK_OFFLINE_DIR/apt/Packages" 2>/dev/null && ! have_internet
+}
+
lms_service_name() {
- if systemctl list-unit-files 2>/dev/null | grep -q "lyrionmusicserver.service"; then
+ # `systemctl cat`, not `list-unit-files | grep -q`: grep -q exiting
+ # early can SIGPIPE systemctl, failing the pipeline under pipefail.
+ if systemctl cat lyrionmusicserver.service &>/dev/null; then
echo "lyrionmusicserver"
- elif systemctl list-unit-files 2>/dev/null | grep -q "logitechmediaserver.service"; then
+ elif systemctl cat logitechmediaserver.service &>/dev/null; then
echo "logitechmediaserver"
fi
}
@@ -114,42 +127,53 @@ action_install_lms() {
echo "Installing Lyrion Music Server..."
- # Try the repository method first.
- if wget -qO - https://debian.slimdevices.com/debian/squeezebox-keyring.gpg | sudo gpg --dearmor -o /usr/share/keyrings/lms-keyring.gpg 2>/dev/null; then
- echo "deb [signed-by=/usr/share/keyrings/lms-keyring.gpg] http://debian.slimdevices.com/debian stable main" | sudo tee /etc/apt/sources.list.d/lms.list
- # `|| true`: a bare, unguarded `apt update` failing here (bad
- # mirror, no network) would otherwise crash the whole session
- # under set -e instead of falling through to the direct-download
- # fallback below, which is exactly the degrade path this is
- # supposed to hit when the repository route doesn't work.
- sudo apt update 2>/dev/null || true
- if sudo apt install -y logitechmediaserver 2>/dev/null; then
- log_success "LMS installed via repository"
- else
- log_warning "Repository install failed, trying direct download..."
+ if lms_offline_install_wanted; then
+ # Kiosk installed from an --offline ISO with no internet right now:
+ # the bundle carries the same LMS_DEB_URL .deb as a package.
+ if ! run_with_offline_fallback sudo apt install -y lyrionmusicserver; then
+ log_error "Failed to install LMS from the offline bundle"
+ pause
+ return 1
fi
- fi
-
- # Fall back to a direct .deb download if the repository didn't produce
- # either possible package.
- if ! command -v logitechmediaserver &>/dev/null && ! command -v lyrionmusicserver &>/dev/null; then
- local lms_deb="/tmp/lms.deb"
- echo "Downloading LMS v9.0.3..."
- if wget -q https://downloads.lms-community.org/LyrionMusicServer_v9.0.3/lyrionmusicserver_9.0.3_amd64.deb -O "$lms_deb"; then
- echo "Installing LMS package..."
- if sudo apt install -y "$lms_deb"; then
- log_success "LMS installed via direct download"
+ log_success "LMS installed from the offline bundle"
+ else
+ # Try the repository method first.
+ if wget -qO - https://debian.slimdevices.com/debian/squeezebox-keyring.gpg | sudo gpg --dearmor -o /usr/share/keyrings/lms-keyring.gpg 2>/dev/null; then
+ echo "deb [signed-by=/usr/share/keyrings/lms-keyring.gpg] http://debian.slimdevices.com/debian stable main" | sudo tee /etc/apt/sources.list.d/lms.list
+ # `|| true`: a bare, unguarded `apt update` failing here (bad
+ # mirror, no network) would otherwise crash the whole session
+ # under set -e instead of falling through to the direct-download
+ # fallback below, which is exactly the degrade path this is
+ # supposed to hit when the repository route doesn't work.
+ sudo apt update 2>/dev/null || true
+ if sudo apt install -y logitechmediaserver 2>/dev/null; then
+ log_success "LMS installed via repository"
else
- log_error "Failed to install LMS package"
+ log_warning "Repository install failed, trying direct download..."
+ fi
+ fi
+
+ # Fall back to a direct .deb download if the repository didn't produce
+ # either possible package.
+ if ! command -v logitechmediaserver &>/dev/null && ! command -v lyrionmusicserver &>/dev/null; then
+ local lms_deb="/tmp/lms.deb"
+ echo "Downloading LMS ($(basename "$LMS_DEB_URL"))..."
+ if wget -q "$LMS_DEB_URL" -O "$lms_deb"; then
+ echo "Installing LMS package..."
+ if sudo apt install -y "$lms_deb"; then
+ log_success "LMS installed via direct download"
+ else
+ log_error "Failed to install LMS package"
+ rm -f "$lms_deb"
+ pause
+ return 1
+ fi
rm -f "$lms_deb"
+ else
+ log_error "Failed to download LMS from lms-community.org"
pause
return 1
fi
- rm -f "$lms_deb"
- else
- log_error "Failed to download LMS from lms-community.org"
- pause
- return 1
fi
fi
@@ -250,7 +274,7 @@ action_install_squeezelite() {
fi
if ! command -v squeezelite &>/dev/null; then
- if ! sudo apt install -y squeezelite; then
+ if ! run_with_offline_fallback sudo apt install -y "${SQUEEZELITE_APT_PACKAGES[@]}"; then
log_error "squeezelite package installation failed"
pause
return 1
diff --git a/menus/addon_remote_access.sh b/menus/addon_remote_access.sh
index d535b95..4c3fe0d 100644
--- a/menus/addon_remote_access.sh
+++ b/menus/addon_remote_access.sh
@@ -24,6 +24,12 @@
# Depends on: lib/menu.sh, lib/config.sh being sourced first.
################################################################################
+# Also read by iso/offline/build-bundle.sh to bundle them for offline
+# installs. (Tailscale/Netbird aren't bundled: they install from their
+# vendors' scripts and need their vendors' servers to work anyway.)
+VNC_APT_PACKAGES=(x11vnc)
+WIREGUARD_APT_PACKAGES=(wireguard wireguard-tools)
+
remote_access_status() {
echo "VNC: $(is_service_active x11vnc && echo "running" || echo "not installed")"
echo "WireGuard: $(wireguard_connected && echo "connected" || (command -v wg &>/dev/null && echo "installed, not connected" || echo "not installed"))"
@@ -70,7 +76,7 @@ action_vnc_install() {
echo
ask_yes_no "Install x11vnc?" "n" || { echo "Cancelled"; return; }
- if ! sudo apt install -y x11vnc; then
+ if ! run_with_offline_fallback sudo apt install -y "${VNC_APT_PACKAGES[@]}"; then
log_error "x11vnc installation failed"
return 1
fi
@@ -182,7 +188,7 @@ action_wireguard_install() {
echo
ask_yes_no "Install WireGuard?" "n" || { echo "Cancelled"; return; }
- if ! sudo apt install -y wireguard wireguard-tools; then
+ if ! run_with_offline_fallback sudo apt install -y "${WIREGUARD_APT_PACKAGES[@]}"; then
log_error "WireGuard installation failed"
return 1
fi
diff --git a/menus/addon_webui.sh b/menus/addon_webui.sh
index 520ada1..ec01bec 100644
--- a/menus/addon_webui.sh
+++ b/menus/addon_webui.sh
@@ -163,6 +163,7 @@ source "$SCRIPT_DIR/lib/electron.sh"
source "$SCRIPT_DIR/menus/sites.sh"
source "$SCRIPT_DIR/menus/display.sh"
source "$SCRIPT_DIR/menus/timezone.sh"
+source "$SCRIPT_DIR/menus/time_sync.sh"
source "$SCRIPT_DIR/menus/hidden_pin.sh"
source "$SCRIPT_DIR/menus/lockout.sh"
source "$SCRIPT_DIR/menus/wifi.sh"
diff --git a/menus/advanced_emergency_hotspot.sh b/menus/advanced_emergency_hotspot.sh
index 315cf0c..b4c7684 100644
--- a/menus/advanced_emergency_hotspot.sh
+++ b/menus/advanced_emergency_hotspot.sh
@@ -1,8 +1,15 @@
#!/bin/bash
################################################################################
# menus/advanced_emergency_hotspot.sh - "Emergency Hotspot" (Advanced):
-# auto-starts a WiFi hotspot if no internet is detected 60 seconds after
-# boot, so the kiosk can be reached and reconfigured remotely.
+# auto-starts a WiFi hotspot if the kiosk finds itself cut off 60 seconds
+# after boot, so it can be reached and reconfigured remotely.
+# "Cut off" is chosen at setup (EMERGENCY_HOTSPOT_CHECK_MODE in the
+# generated script): by default the local network itself is unreachable -
+# neither the router nor the internet answers - so a kiosk on a LAN with
+# no internet (an offline install) doesn't start the hotspot on every
+# boot. The old internet-only check (ping 8.8.8.8) is still an option, as
+# is checking one specific address. Scripts generated before this choice
+# existed keep the internet-only check until Reconfigure is run.
#
# Writes a standalone runtime script ($BIN_DIR/kiosk-emergency-hotspot)
# plus a oneshot systemd unit ($SYSTEMD_DIR) that runs it at boot - both
@@ -21,6 +28,8 @@
################################################################################
EMERGENCY_HOTSPOT_SCRIPT="$BIN_DIR/kiosk-emergency-hotspot"
+# Also read by iso/offline/build-bundle.sh to bundle them for offline installs.
+EMERGENCY_HOTSPOT_APT_PACKAGES=(hostapd dnsmasq iptables)
emergency_hotspot_is_configured() {
[[ -f "$EMERGENCY_HOTSPOT_SCRIPT" ]]
@@ -38,8 +47,8 @@ advanced_emergency_hotspot_status() {
else
echo "Emergency Hotspot: Not configured"
fi
- echo "ℹ Auto-starts a WiFi hotspot if no internet is detected 60"
- echo " seconds after boot, so you can connect and reconfigure remotely."
+ echo "ℹ Auto-starts a WiFi hotspot if the kiosk can't reach its network"
+ echo " 60 seconds after boot, so you can connect and reconfigure remotely."
}
advanced_emergency_hotspot_menu_builder() {
@@ -62,7 +71,7 @@ advanced_emergency_hotspot_menu() {
action_configure_emergency_hotspot() {
echo
- if ! sudo apt install -y hostapd dnsmasq iptables; then
+ if ! run_with_offline_fallback sudo apt install -y "${EMERGENCY_HOTSPOT_APT_PACKAGES[@]}"; then
log_error "Failed to install hostapd/dnsmasq/iptables"
pause
return 1
@@ -91,6 +100,29 @@ action_configure_emergency_hotspot() {
[[ ${#hotspot_pass} -lt 8 ]] && log_error "Password must be at least 8 characters"
done
+ echo
+ echo "When should the hotspot start? (checked 60 seconds after boot)"
+ echo " 1) The local network is unreachable - neither the router nor the"
+ echo " internet answers. Recommended; right for networks without"
+ echo " internet too."
+ echo " 2) There's no internet. On a network without internet this starts"
+ echo " the hotspot on every boot."
+ echo " 3) A specific address on your network doesn't answer (e.g. a server)."
+ local check_mode="network" check_host="" check_choice
+ check_choice=$(ask_integer "Choice" 1 1 3)
+ case "$check_choice" in
+ 2) check_mode="internet" ;;
+ 3)
+ check_host=$(ask_text "Address to check (IP or hostname)" "")
+ if [[ "$check_host" =~ ^[A-Za-z0-9.:-]+$ ]]; then
+ check_mode="host"
+ else
+ log_warning "Not a valid address - using option 1 instead"
+ check_host=""
+ fi
+ ;;
+ esac
+
local hotspot_ip="192.168.50.1"
sudo mkdir -p "$BIN_DIR"
@@ -98,9 +130,14 @@ action_configure_emergency_hotspot() {
#!/bin/bash
################################################################################
### KIOSK EMERGENCY HOTSPOT
-### Auto-starts if no internet connection 60 seconds after boot
+### Auto-starts if the network check fails 60 seconds after boot
################################################################################
+# network = neither the default gateway (router) nor the internet answers
+# internet = no internet (pings 8.8.8.8 / 1.1.1.1)
+# host = CHECK_HOST doesn't answer
+CHECK_MODE="$check_mode"
+CHECK_HOST="$check_host"
WIFI_IFACE="$wifi_iface"
HOTSPOT_SSID="$hotspot_ssid"
HOTSPOT_PASS="$hotspot_pass"
@@ -110,13 +147,36 @@ KIOSK_USER="$KIOSK_USER"
# Wait 60 seconds after boot
sleep 60
-# Check for internet connectivity
-if ping -c 3 -W 5 8.8.8.8 >/dev/null 2>&1; then
- logger "KIOSK: Internet connected - emergency hotspot not needed"
- exit 0
-fi
+ping_ok() { ping -c 2 -W 3 "\$1" >/dev/null 2>&1; }
+internet_ok() { ping_ok 8.8.8.8 || ping_ok 1.1.1.1; }
+# The router counts as there if it answers ping - or, for routers set to
+# ignore ping, if it answered the ARP lookup that ping just triggered.
+gateway_ok() {
+ local gw
+ gw=\$(ip -4 route show default 2>/dev/null | awk '{print \$3; exit}')
+ [[ -n "\$gw" ]] || return 1
+ ping_ok "\$gw" && return 0
+ ip neigh show "\$gw" 2>/dev/null | grep -qE 'REACHABLE|STALE|DELAY|PROBE'
+}
+connected() {
+ case "\$CHECK_MODE" in
+ internet) internet_ok ;;
+ host) ping_ok "\$CHECK_HOST" ;;
+ *) gateway_ok || internet_ok ;;
+ esac
+}
-logger "KIOSK: No internet detected - starting emergency hotspot"
+# Three tries, 10 seconds apart, so a slow DHCP lease or WiFi association
+# isn't mistaken for being cut off.
+for attempt in 1 2 3; do
+ if connected; then
+ logger "KIOSK: Network check (\$CHECK_MODE) passed - emergency hotspot not needed"
+ exit 0
+ fi
+ [[ \$attempt -lt 3 ]] && sleep 10
+done
+
+logger "KIOSK: Network check (\$CHECK_MODE) failed - starting emergency hotspot"
# Stop any conflicting services
systemctl stop wpa_supplicant 2>/dev/null || true
diff --git a/menus/complete_uninstall.sh b/menus/complete_uninstall.sh
index 53d83a8..0230d45 100644
--- a/menus/complete_uninstall.sh
+++ b/menus/complete_uninstall.sh
@@ -8,7 +8,7 @@
# tailscale_do_uninstall, netbird_do_uninstall, lms_do_uninstall,
# squeezelite_do_uninstall, asterisk_intercom_do_uninstall,
# webui_do_uninstall, power_schedule_do_remove_all,
-# emergency_hotspot_do_disable) instead of
+# emergency_hotspot_do_disable, time_sync_do_reset) instead of
# re-implementing removal logic for each addon a second time here - if an
# addon's uninstall logic changes, this picks it up automatically. Only
# the pieces no single addon owns - the kiosk user/files, Node.js/
@@ -62,6 +62,7 @@ action_complete_uninstall() {
echo " • LightDM and Openbox"
echo " • All kiosk schedules and services"
echo " • Emergency hotspot configuration"
+ echo " • LAN time server setting (back to Ubuntu's defaults)"
echo
echo "⚠️ This CANNOT be undone!"
echo
@@ -90,9 +91,10 @@ action_complete_uninstall() {
asterisk_intercom_do_uninstall purge
webui_do_uninstall
- echo "[3/12] Removing schedules and emergency hotspot..."
+ echo "[3/12] Removing schedules, emergency hotspot and time server setting..."
power_schedule_do_remove_all
emergency_hotspot_do_disable
+ time_sync_do_reset
# Must come after every addon teardown above - Asterisk Intercom's
# helper still needs this user to resolve its systemd --user session.
diff --git a/menus/sites.sh b/menus/sites.sh
index 06f27e4..b47660b 100644
--- a/menus/sites.sh
+++ b/menus/sites.sh
@@ -137,8 +137,8 @@ action_add_page() {
echo " -1 = hidden (PIN-gated, F10 or 3-finger swipe)"
echo
echo "URL: a web address, or a path on this kiosk - a file (page, PDF,"
- echo "image) like /home/kiosk/docs/menu.pdf, or a folder of images ending"
- echo "in / like /home/kiosk/photos/ for a slideshow."
+ echo "image, Word .docx) like /home/kiosk/docs/menu.pdf, or a folder of"
+ echo "images ending in / like /home/kiosk/photos/ for a slideshow."
local raw_url url dur name needs_auth user pass
read -r -p "URL: " raw_url
diff --git a/menus/time_sync.sh b/menus/time_sync.sh
new file mode 100644
index 0000000..9ea34a8
--- /dev/null
+++ b/menus/time_sync.sh
@@ -0,0 +1,167 @@
+#!/bin/bash
+################################################################################
+# menus/time_sync.sh - "Time Server (NTP)" (Core Settings).
+#
+# The kiosk keeps its clock right with systemd-timesyncd, which by default
+# asks Ubuntu's time servers on the internet. On a network with no
+# internet that never works and the clock slowly drifts - which matters
+# here, because lockout times, quiet hours and power schedules all go by
+# it. This menu points timesyncd at a time server on the local network
+# instead (most routers, Windows domain controllers and NAS boxes can
+# serve NTP), or, with no time server at all, sets the clock by hand.
+#
+# Writes one drop-in, $TIMESYNCD_CONF_DIR/50-kiosk-ntp.conf - removing it
+# (the "internet time servers" option, or Complete Uninstall via
+# time_sync_do_reset) puts Ubuntu's defaults back untouched.
+#
+# Depends on: lib/menu.sh, lib/config.sh being sourced first.
+################################################################################
+
+TIMESYNC_DROPIN="$TIMESYNCD_CONF_DIR/50-kiosk-ntp.conf"
+
+# The time server(s) this menu configured, or empty for Ubuntu's defaults.
+time_sync_servers() {
+ sed -n 's/^NTP=//p' "$TIMESYNC_DROPIN" 2>/dev/null | head -1
+}
+
+time_sync_status() {
+ local servers synced
+ servers=$(time_sync_servers)
+ synced=$(timedatectl show -p NTPSynchronized --value 2>/dev/null || echo "unknown")
+ echo "Current time: $(date '+%Y-%m-%d %H:%M:%S %Z')"
+ echo "Time servers: ${servers:-Ubuntu defaults (internet)}"
+ echo "Synchronized: $([[ "$synced" == "yes" ]] && echo "yes" || echo "no")"
+}
+
+time_sync_menu_builder() {
+ MENU_LABELS=(
+ "Use a time server on my network"
+ "Use the internet time servers (Ubuntu default)"
+ "Set the date and time manually"
+ "Show sync details"
+ )
+ MENU_HANDLERS=(
+ action_time_sync_lan
+ action_time_sync_default
+ action_time_sync_manual
+ action_time_sync_details
+ )
+}
+
+time_sync_menu() {
+ run_menu "TIME SERVER (NTP)" time_sync_menu_builder time_sync_status
+}
+
+# Validate a space-separated list of hostnames / IPv4 / IPv6 addresses.
+time_sync_valid_servers() {
+ local s
+ [[ -n "$1" ]] || return 1
+ for s in $1; do
+ [[ "$s" =~ ^[A-Za-z0-9.:-]+$ ]] || return 1
+ done
+}
+
+time_sync_apply() {
+ sudo systemctl enable systemd-timesyncd 2>/dev/null || true
+ sudo timedatectl set-ntp true 2>/dev/null || true
+ sudo systemctl restart systemd-timesyncd 2>/dev/null || true
+}
+
+# Remove this menu's drop-in, back to Ubuntu's default time servers.
+# Also used by Complete Uninstall.
+time_sync_do_reset() {
+ sudo rm -f "$TIMESYNC_DROPIN"
+ time_sync_apply
+}
+
+################################################################################
+# Actions
+################################################################################
+
+action_time_sync_lan() {
+ echo
+ echo "Enter the address of a time (NTP) server on your network - often"
+ echo "the router (e.g. 192.168.1.1), a Windows domain controller, or a"
+ echo "NAS. Several can be given, separated by spaces."
+ local current servers
+ current=$(time_sync_servers)
+ servers=$(ask_text "Time server(s)" "${current:-$(ip -4 route show default 2>/dev/null | awk '{print $3; exit}')}")
+ if ! time_sync_valid_servers "$servers"; then
+ log_error "Not a valid address list: '$servers'"
+ pause
+ return 1
+ fi
+
+ sudo mkdir -p "$TIMESYNCD_CONF_DIR"
+ sudo tee "$TIMESYNC_DROPIN" > /dev/null <