Missed some deamon to daemon updates. This shoulf make Fenrir work with the installer automatically again, switching modes, etc.
This commit is contained in:
@@ -5,3 +5,4 @@ CLAUDE.md
|
|||||||
*.sha1sum
|
*.sha1sum
|
||||||
*.xz
|
*.xz
|
||||||
*.zst
|
*.zst
|
||||||
|
scripts/xlibre-video-dummy-with-vt/
|
||||||
|
|||||||
@@ -7,19 +7,20 @@ if [[ -x /etc/audibleprompt.sh ]]; then
|
|||||||
export sudoFlags=("-A")
|
export sudoFlags=("-A")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
trap cleanup EXIT
|
# shellcheck disable=SC2329
|
||||||
cleanup() {
|
cleanup() {
|
||||||
popd &> /dev/null
|
popd &> /dev/null || true
|
||||||
if ! [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then
|
if ! [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then
|
||||||
echo "Initial setup is not complete."
|
echo "Initial setup is not complete."
|
||||||
echo "To continue setup, please run:"
|
echo "To continue setup, please run:"
|
||||||
echo "sudo configure-stormux"
|
echo "sudo configure-stormux"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
trap cleanup EXIT
|
||||||
|
|
||||||
|
|
||||||
if [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then
|
if [[ -x /opt/configure-stormux/configure-stormux.sh ]]; then
|
||||||
pushd /opt/configure-stormux
|
pushd /opt/configure-stormux || exit 1
|
||||||
./configure-stormux.sh
|
./configure-stormux.sh
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
@@ -33,25 +34,27 @@ set_timezone() {
|
|||||||
mapfile -t regions < <(timedatectl --no-pager list-timezones | cut -d '/' -f1 | sort -u)
|
mapfile -t regions < <(timedatectl --no-pager list-timezones | cut -d '/' -f1 | sort -u)
|
||||||
|
|
||||||
# Use the same text twice here and just hide the tag field.
|
# Use the same text twice here and just hide the tag field.
|
||||||
|
# shellcheck disable=SC2046
|
||||||
region=$(dialog --backtitle "Please select your Region" \
|
region=$(dialog --backtitle "Please select your Region" \
|
||||||
--no-tags \
|
--no-tags \
|
||||||
--menu "Use up and down arrows or page-up and page-down to navigate the list, and press 'Enter' to make your selection." 0 0 0 \
|
--menu "Use up and down arrows or page-up and page-down to navigate the list, and press 'Enter' to make your selection." 0 0 0 \
|
||||||
$(for i in ${regions[@]} ; do echo "$i";echo "$i";done) --stdout)
|
$(for i in "${regions[@]}" ; do echo "$i";echo "$i";done) --stdout)
|
||||||
|
|
||||||
|
|
||||||
mapfile -t cities < <(timedatectl --no-pager list-timezones | grep "$region" | cut -d '/' -f2 | sort -u)
|
mapfile -t cities < <(timedatectl --no-pager list-timezones | grep "$region" | cut -d '/' -f2 | sort -u)
|
||||||
|
|
||||||
# Use the same text twice here and just hide the tag field.
|
# Use the same text twice here and just hide the tag field.
|
||||||
|
# shellcheck disable=SC2046
|
||||||
city=$(dialog --backtitle "Please select a city near you" \
|
city=$(dialog --backtitle "Please select a city near you" \
|
||||||
--no-tags \
|
--no-tags \
|
||||||
--menu "Use up and down arrow or page-up and page-down to navigate the list." 0 0 10 \
|
--menu "Use up and down arrow or page-up and page-down to navigate the list." 0 0 10 \
|
||||||
$(for i in ${cities[@]} ; do echo "$i";echo "$i";done) --stdout)
|
$(for i in "${cities[@]}" ; do echo "$i";echo "$i";done) --stdout)
|
||||||
|
|
||||||
# Set the timezone
|
# Set the timezone
|
||||||
if [[ -f /etc/localtime ]]; then
|
if [[ -f /etc/localtime ]]; then
|
||||||
rm /etc/localtime
|
rm /etc/localtime
|
||||||
fi
|
fi
|
||||||
ln -sf /usr/share/zoneinfo/${region}/${city} /etc/localtime
|
ln -sf /usr/share/zoneinfo/"${region}"/"${city}" /etc/localtime
|
||||||
timedatectl set-ntp true
|
timedatectl set-ntp true
|
||||||
}
|
}
|
||||||
# Offer to switch fenrir layout.
|
# Offer to switch fenrir layout.
|
||||||
@@ -81,6 +84,7 @@ if [[ $diskSize -le 7 ]]; then
|
|||||||
diskDevice="${BASH_REMATCH[1]}"
|
diskDevice="${BASH_REMATCH[1]}"
|
||||||
else
|
else
|
||||||
# Handle sda2, sdb3 style
|
# Handle sda2, sdb3 style
|
||||||
|
# shellcheck disable=SC2001
|
||||||
diskDevice="$(echo "$diskSource" | sed 's/[0-9]*$//')"
|
diskDevice="$(echo "$diskSource" | sed 's/[0-9]*$//')"
|
||||||
fi
|
fi
|
||||||
echo "Yes" | sudo "${sudoFlags[@]}" parted ---pretend-input-tty "$diskDevice" resizepart 2 100%
|
echo "Yes" | sudo "${sudoFlags[@]}" parted ---pretend-input-tty "$diskDevice" resizepart 2 100%
|
||||||
@@ -91,9 +95,9 @@ fi
|
|||||||
if ! ping -c1 stormux.org &> /dev/null ; then
|
if ! ping -c1 stormux.org &> /dev/null ; then
|
||||||
echo "No internet connection detected. Press enter to open NetworkManager."
|
echo "No internet connection detected. Press enter to open NetworkManager."
|
||||||
read -r continue
|
read -r continue
|
||||||
echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
|
echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-daemon.sock
|
||||||
nmtui-connect
|
nmtui-connect
|
||||||
echo "setting set focus#highlight=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
|
echo "setting set focus#highlight=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-daemon.sock
|
||||||
fi
|
fi
|
||||||
# Check for internet connectivity
|
# Check for internet connectivity
|
||||||
if ping -qc1 -W 1 stormux.org &> /dev/null; then
|
if ping -qc1 -W 1 stormux.org &> /dev/null; then
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
# Monitors SSH logins and announces them via Fenrir's speech system
|
# Monitors SSH logins and announces them via Fenrir's speech system
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
fenrirSocket="/tmp/fenrirscreenreader-deamon.sock"
|
fenrirSocket="/tmp/fenrirscreenreader-daemon.sock"
|
||||||
logFile="/var/log/auth.log"
|
logFile="/var/log/auth.log"
|
||||||
stateFile="/tmp/fenrir-ssh-monitor.state"
|
stateFile="/tmp/fenrir-ssh-monitor.state"
|
||||||
checkInterval=2 # seconds between checks
|
checkInterval=2 # seconds between checks
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ set_timezone() {
|
|||||||
mapfile -t regions < <(timedatectl --no-pager list-timezones | cut -d '/' -f1 | sort -u)
|
mapfile -t regions < <(timedatectl --no-pager list-timezones | cut -d '/' -f1 | sort -u)
|
||||||
|
|
||||||
# Use the same text twice here and just hide the tag field.
|
# Use the same text twice here and just hide the tag field.
|
||||||
|
# shellcheck disable=SC2046
|
||||||
region=$(dialog --backtitle "Please select your Region" \
|
region=$(dialog --backtitle "Please select your Region" \
|
||||||
--no-tags \
|
--no-tags \
|
||||||
--menu "Use up and down arrows or page-up and page-down to navigate the list, and press 'Enter' to make your selection." 0 0 0 \
|
--menu "Use up and down arrows or page-up and page-down to navigate the list, and press 'Enter' to make your selection." 0 0 0 \
|
||||||
@@ -23,6 +24,7 @@ set_timezone() {
|
|||||||
mapfile -t cities < <(timedatectl --no-pager list-timezones | grep "$region" | cut -d '/' -f2 | sort -u)
|
mapfile -t cities < <(timedatectl --no-pager list-timezones | grep "$region" | cut -d '/' -f2 | sort -u)
|
||||||
|
|
||||||
# Use the same text twice here and just hide the tag field.
|
# Use the same text twice here and just hide the tag field.
|
||||||
|
# shellcheck disable=SC2046
|
||||||
city=$(dialog --backtitle "Please select a city near you" \
|
city=$(dialog --backtitle "Please select a city near you" \
|
||||||
--no-tags \
|
--no-tags \
|
||||||
--menu "Use up and down arrow or page-up and page-down to navigate the list." 0 0 10 \
|
--menu "Use up and down arrow or page-up and page-down to navigate the list." 0 0 10 \
|
||||||
@@ -49,9 +51,9 @@ fi
|
|||||||
if ! ping -c1 stormux.org &> /dev/null ; then
|
if ! ping -c1 stormux.org &> /dev/null ; then
|
||||||
echo "No internet connection detected. Press enter to open NetworkManager."
|
echo "No internet connection detected. Press enter to open NetworkManager."
|
||||||
read -r continue
|
read -r continue
|
||||||
echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
|
echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-daemon.sock
|
||||||
nmtui-connect
|
nmtui-connect
|
||||||
echo "setting set focus#highlight=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
|
echo "setting set focus#highlight=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-daemon.sock
|
||||||
fi
|
fi
|
||||||
# Check for internet connectivity
|
# Check for internet connectivity
|
||||||
if ping -qc1 -W 1 stormux.org &> /dev/null; then
|
if ping -qc1 -W 1 stormux.org &> /dev/null; then
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
# Monitors SSH logins and announces them via Fenrir's speech system
|
# Monitors SSH logins and announces them via Fenrir's speech system
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
fenrirSocket="/tmp/fenrirscreenreader-deamon.sock"
|
fenrirSocket="/tmp/fenrirscreenreader-daemon.sock"
|
||||||
logFile="/var/log/auth.log"
|
logFile="/var/log/auth.log"
|
||||||
stateFile="/tmp/fenrir-ssh-monitor.state"
|
stateFile="/tmp/fenrir-ssh-monitor.state"
|
||||||
checkInterval=2 # seconds between checks
|
checkInterval=2 # seconds between checks
|
||||||
|
|||||||
Reference in New Issue
Block a user