summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-09-04 23:18:00 (GMT)
committer Jaromil <jaromil@dyne.org>2011-09-04 23:18:00 (GMT)
commit4f6ed0678f62f27157b678dd8f520d069f921626 (patch)
treeb76b7048e0231a3aba945ff81af5ff9f45b7341b
parent806846129a390743d67b92f16891c79a6ce76613 (diff)
accessibility settings at boot, cleanup and cosmetics
-rwxr-xr-xdyneIII/live-init-scripts/scripts/live-bottom/00dyne_gui_settings59
-rwxr-xr-xdyneIII/live-init-scripts/scripts/live-bottom/00dyne_settings6
-rwxr-xr-xdyneIII/live-init-scripts/scripts/live-bottom/10adduser2
-rwxr-xr-xdyneIII/live-init-scripts/scripts/live-bottom/30accessibility1
-rwxr-xr-xdyneIII/live-init-scripts/scripts/live-premount/dyne_iso_explorer8
5 files changed, 43 insertions, 33 deletions
diff --git a/dyneIII/live-init-scripts/scripts/live-bottom/00dyne_gui_settings b/dyneIII/live-init-scripts/scripts/live-bottom/00dyne_gui_settings
index f9cd815..5ad1026 100755
--- a/dyneIII/live-init-scripts/scripts/live-bottom/00dyne_gui_settings
+++ b/dyneIII/live-init-scripts/scripts/live-bottom/00dyne_gui_settings
@@ -1,8 +1,10 @@
#!/bin/sh
-# Original script by Denis Roio <jaromil@dyne.org>
+# dyne:III live-boot script
+# by Denis Roio <jaromil@dyne.org>
+# GNU GPL v3
-PREREQ="blacklist udev"
+PREREQ=""
prereqs()
{
@@ -31,31 +33,34 @@ fi
# superseded by command line
for ARGUMENT in $(cat /proc/cmdline); do
- case "${ARGUMENT}" in
- textonly)
- TEXTONLY=yes
- really_export TEXTONLY
- log_success_msg "Text-only mode selected"
- ;;
- xdriver=*)
- XDRIVER="${ARGUMENT#xdriver=}"
- really_export XDRIVER
- log_success_msg "XDriver set to ${XDRIVER}"
- ;;
- esac
-done
+ case "${ARGUMENT}" in
+ textonly)
+ TEXTONLY=Yes
+ NOXAUTOLOGIN=yes
+ NOXAUTOCONFIG=yes
+ really_export TEXTONLY
+ really_export NOXAUTOLOGIN
+ really_export NOXAUTOCONFIG
+ echo "Text-only mode selected"
+ ;;
-# this is what adds parameters to boot
-touch /live.vars
-if [ -n "$textonly" ];
-then
- echo "TEXT ONLY MODE SELECTED"
- echo "TEXTONLY=Yes" >> /live.vars
-fi
-if [ -n "$xdriver" ];
-then
- echo "XDRIVER MANUALLY SET TO: ${xdriver}"
- echo "XDRIVER=${xdriver}" >> /live.vars
-fi
+ xdriver=*)
+ XDRIVER="${ARGUMENT#xdriver=}"
+ really_export XDRIVER
+ echo "XDriver manually set to ${XDRIVER}"
+ ;;
+
+ access=*)
+ ACCESS=${ARGUMENT}
+ really_export ACCESS
+ ;;
+
+ braille)
+ ACCESS="braille=ask"
+ really_export ACCESS
+ ;;
+
+ esac
+done
diff --git a/dyneIII/live-init-scripts/scripts/live-bottom/00dyne_settings b/dyneIII/live-init-scripts/scripts/live-bottom/00dyne_settings
index c6af042..7c16db5 100755
--- a/dyneIII/live-init-scripts/scripts/live-bottom/00dyne_settings
+++ b/dyneIII/live-init-scripts/scripts/live-bottom/00dyne_settings
@@ -1,8 +1,10 @@
#!/bin/sh
-# Original script by Denis Roio <jaromil@dyne.org>
+# dyne:III live-boot script
+# by Denis Roio <jaromil@dyne.org>
+# GNU GPL v3
-PREREQ="blacklist udev"
+PREREQ=""
prereqs()
{
diff --git a/dyneIII/live-init-scripts/scripts/live-bottom/10adduser b/dyneIII/live-init-scripts/scripts/live-bottom/10adduser
index 8b15ebd..34b66e8 100755
--- a/dyneIII/live-init-scripts/scripts/live-bottom/10adduser
+++ b/dyneIII/live-init-scripts/scripts/live-bottom/10adduser
@@ -27,7 +27,7 @@ fi
. /scripts/live-functions
-log_begin_msg "Live session user already created, no need to create at every boot!"
+log_begin_msg "Live session user is luther:luther"
USERNAME="luther"
really_export USERNAME
diff --git a/dyneIII/live-init-scripts/scripts/live-bottom/30accessibility b/dyneIII/live-init-scripts/scripts/live-bottom/30accessibility
index 4ed1c6d..7522296 100755
--- a/dyneIII/live-init-scripts/scripts/live-bottom/30accessibility
+++ b/dyneIII/live-init-scripts/scripts/live-bottom/30accessibility
@@ -69,6 +69,7 @@ remove_applet ()
add_sudoers_file ()
{
+mkdir -p /root/etc/sudoers.d
cat <<EOF > /root/etc/sudoers.d/a11y-sudo
# TO allow accessibility in GTK to work with sudo.
Defaults env_keep = "ORBIT_SOCKETDIR XDG_SESSION_COOKIE GTK_MODULES"
diff --git a/dyneIII/live-init-scripts/scripts/live-premount/dyne_iso_explorer b/dyneIII/live-init-scripts/scripts/live-premount/dyne_iso_explorer
index 5c4ca90..c72c264 100755
--- a/dyneIII/live-init-scripts/scripts/live-premount/dyne_iso_explorer
+++ b/dyneIII/live-init-scripts/scripts/live-premount/dyne_iso_explorer
@@ -1,6 +1,8 @@
#!/bin/sh
-# Original script by Denis Roio <jaromil@dyne.org>
+# dyne:III live-boot script
+# by Denis Roio <jaromil@dyne.org>
+# GNU GPL v3
PREREQ="blacklist udev"
@@ -18,7 +20,7 @@ prereqs)
esac
. /scripts/live-helpers
-
+. /scripts/live-functions
# we operate on boot type local
bootconf=$(egrep '^BOOT=' /conf/initramfs.conf | tail -1)
@@ -61,7 +63,7 @@ check_dyne() {
continue
fi
if [ -r "/dyne/${DYNE_ISO}" ]; then
- echo "ISO found in ${dev}"
+ log_success_msg "ISO ${DYNE_ISO} found in ${dev}"
# this is what adds parameters to boot
touch /conf/param.conf
echo "export FROMISO=${dev}/${DYNE_ISO}" >> /conf/param.conf