From 5563a7863f4312fe1837fa85f22cb008e93f1671 Mon Sep 17 00:00:00 2001 From: David P Date: Wed, 22 Jan 2020 15:22:25 -0300 Subject: [talkingparabola] sync with talkingarch Signed-off-by: David P --- .../airootfs/etc/udev/rules.d/81-dhcpcd.rules | 2 +- .../airootfs/root/.automated_script.sh | 34 +++++++++++++++++++++ configs/talkingparabola/airootfs/root/.zlogin | 6 ++++ .../usr/share/livecd-sound/sounds/beep.wav | Bin 0 -> 192080 bytes .../usr/share/livecd-sound/sounds/pick-a-card.wav | Bin 0 -> 121460 bytes .../loader/entries/parabolaiso-x86_64-cd.conf | 2 +- .../loader/entries/parabolaiso-x86_64-usb.conf | 2 +- configs/talkingparabola/packages.both | 1 + .../talkingparabola/syslinux/parabolaiso_sys32.cfg | 12 +++++--- .../talkingparabola/syslinux/parabolaiso_sys64.cfg | 12 +++++--- 10 files changed, 58 insertions(+), 13 deletions(-) create mode 100755 configs/talkingparabola/airootfs/root/.automated_script.sh create mode 100644 configs/talkingparabola/airootfs/root/.zlogin create mode 100644 configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/beep.wav create mode 100644 configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/pick-a-card.wav diff --git a/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules b/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules index 970da69..1c4053c 100644 --- a/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules +++ b/configs/talkingparabola/airootfs/etc/udev/rules.d/81-dhcpcd.rules @@ -1 +1 @@ -ACTION=="add", SUBSYSTEM=="net", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service" +ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="en*|eth*", ENV{SYSTEMD_WANTS}="dhcpcd@$name.service" diff --git a/configs/talkingparabola/airootfs/root/.automated_script.sh b/configs/talkingparabola/airootfs/root/.automated_script.sh new file mode 100755 index 0000000..81a98a1 --- /dev/null +++ b/configs/talkingparabola/airootfs/root/.automated_script.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +script_cmdline () +{ + local param + for param in $(< /proc/cmdline); do + case "${param}" in + script=*) echo "${param#*=}" ; return 0 ;; + esac + done +} + +automated_script () +{ + local script rt + script="$(script_cmdline)" + if [[ -n "${script}" && ! -x /tmp/startup_script ]]; then + if [[ "${script}" =~ ^http:// || "${script}" =~ ^ftp:// ]]; then + wget "${script}" --retry-connrefused -q -O /tmp/startup_script >/dev/null + rt=$? + else + cp "${script}" /tmp/startup_script + rt=$? + fi + if [[ ${rt} -eq 0 ]]; then + chmod +x /tmp/startup_script + /tmp/startup_script + fi + fi +} + +if [[ $(tty) == "/dev/tty1" ]]; then + automated_script +fi diff --git a/configs/talkingparabola/airootfs/root/.zlogin b/configs/talkingparabola/airootfs/root/.zlogin new file mode 100644 index 0000000..7666b6b --- /dev/null +++ b/configs/talkingparabola/airootfs/root/.zlogin @@ -0,0 +1,6 @@ +if [ -n "$(grep -oP 'speakup.synth=\K\S+' /proc/cmdline)" ] +then + setopt singlelinezle + flock -n /run/talk-to-me.lck talk-to-me +fi +~/.automated_script.sh diff --git a/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/beep.wav b/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/beep.wav new file mode 100644 index 0000000..495f90b Binary files /dev/null and b/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/beep.wav differ diff --git a/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/pick-a-card.wav b/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/pick-a-card.wav new file mode 100644 index 0000000..7343935 Binary files /dev/null and b/configs/talkingparabola/airootfs/usr/share/livecd-sound/sounds/pick-a-card.wav differ diff --git a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-cd.conf b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-cd.conf index 057e14f..d4f3c56 100644 --- a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-cd.conf +++ b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-cd.conf @@ -1,4 +1,4 @@ title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI CD linux /EFI/parabolaiso/vmlinuz.efi initrd /EFI/parabolaiso/parabolaiso.img -options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% +options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% speakup.synth=soft diff --git a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf index 3863799..c5ba43c 100644 --- a/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf +++ b/configs/talkingparabola/efiboot/loader/entries/parabolaiso-x86_64-usb.conf @@ -1,4 +1,4 @@ title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI USB linux /%INSTALL_DIR%/boot/x86_64/vmlinuz initrd /%INSTALL_DIR%/boot/x86_64/parabolaiso.img -options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% +options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% speakup.synth=soft diff --git a/configs/talkingparabola/packages.both b/configs/talkingparabola/packages.both index a778f47..b0e3894 100644 --- a/configs/talkingparabola/packages.both +++ b/configs/talkingparabola/packages.both @@ -54,6 +54,7 @@ openvpn partclone parted partimage +polkit pptpclient ppp pptpclient diff --git a/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg b/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg index 4abdf7a..404c00e 100644 --- a/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg +++ b/configs/talkingparabola/syslinux/parabolaiso_sys32.cfg @@ -1,9 +1,11 @@ -LABEL parabola32 +# accessability boot option + +LABEL parabola32speatch TEXT HELP -Boot the Parabola GNU/Linux-libre (i686) live medium. -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +Boot the Parabola GNU/Linux-libre (i686) live medium with speakup enabled. +It allows you to install Parabola GNU/Linux-libre or perform system maintenance using speatch feedback. ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (i686) +MENU LABEL Boot Parabola GNU/Linux-libre (i686) with speatch LINUX boot/i686/vmlinuz INITRD boot/i686/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% speakup.synth=soft diff --git a/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg b/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg index b154459..9f7df06 100644 --- a/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg +++ b/configs/talkingparabola/syslinux/parabolaiso_sys64.cfg @@ -1,9 +1,11 @@ -LABEL parabola64 +# accessability boot option + +LABEL parabola64speatch TEXT HELP -Boot the Parabola GNU/Linux-libre (x86_64) live medium. -It allows you to install Parabola GNU/Linux-libre or perform system maintenance. +Boot the Parabola GNU/Linux-libre (x86_64) live medium with speakup enabled. +It allows you to install Parabola GNU/Linux-libre or perform system maintenance using speatch feedback. ENDTEXT -MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) +MENU LABEL Boot Parabola GNU/Linux-libre (x86_64) with speatch LINUX boot/x86_64/vmlinuz INITRD boot/x86_64/parabolaiso.img -APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% +APPEND parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% speakup.synth=soft -- cgit v1.2.2