diff options
| author | Daniel Baumann <daniel@debian.org> | 2008-03-09 21:27:25 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:31:06 +0100 |
| commit | f2ac76aedcba41e749082a2fb77eec4175e7a6e9 (patch) | |
| tree | e8616af65f150b74b8044fef56ead6dca23e261c /scripts | |
| parent | 4dafd2894df6f093d5350bd6ec0a0c650aa04ad3 (diff) | |
| download | live-boot-f2ac76aedcba41e749082a2fb77eec4175e7a6e9.tar.gz live-boot-f2ac76aedcba41e749082a2fb77eec4175e7a6e9.zip | |
Merging casper 1.119.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live-bottom/14locales | 5 | ||||
| -rwxr-xr-x | scripts/live-bottom/30accessibility | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales index 3cb58dd..db26f0b 100755 --- a/scripts/live-bottom/14locales +++ b/scripts/live-bottom/14locales @@ -44,8 +44,6 @@ if [ -n "${grep_file}" ] then # use rootfs configured locale locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' ) -else - grep_file=/root/etc/default/locale fi if [ -n "${LOCALE}" ] @@ -102,7 +100,8 @@ EOF really_export LANG - printf 'LANG=%s\n' "${LANG}" > "${grep_file}" + printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale + printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen chroot /root /usr/sbin/locale-gen fi diff --git a/scripts/live-bottom/30accessibility b/scripts/live-bottom/30accessibility index eaf3a50..6b61db1 100755 --- a/scripts/live-bottom/30accessibility +++ b/scripts/live-bottom/30accessibility @@ -79,6 +79,7 @@ case ${ACCESS} in gct -s -t bool /desktop/gnome/interface/accessibility true gct -s -t bool /desktop/gnome/applications/at/visual/startup true gct -s -t bool /apps/gksu/disable-grab true + gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity ;; braille=ask) @@ -86,6 +87,7 @@ case ${ACCESS} in gct -s -t bool /desktop/gnome/interface/accessibility true gct -s -t bool /desktop/gnome/applications/at/visual/startup true gct -s -t bool /apps/gksu/disable-grab true + gct -s -t string /desktop/gnome/applications/window_manager/default /usr/bin/metacity if type orca > /dev/null 2>&1 then |