From 0acc4183f3becc213d7645498a6d5dd49244e6b2 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Apr 2010 18:43:43 +0200
Subject: [PATCH] Adding upstream version 1.66+debian.

---
 scripts/casper-bottom/22gnome_panel_data    | 2 +-
 scripts/casper-bottom/22screensaver         | 2 +-
 scripts/casper-bottom/30accessibility       | 2 +-
 scripts/casper-bottom/32disable_hibernation | 2 +-
 ubiquity-hooks/30accessibility              | 9 +++++----
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/casper-bottom/22gnome_panel_data b/scripts/casper-bottom/22gnome_panel_data
index e87c94f..5509ce1 100755
--- a/scripts/casper-bottom/22gnome_panel_data
+++ b/scripts/casper-bottom/22gnome_panel_data
@@ -28,7 +28,7 @@ fi
 
 panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
 if [ -n "$panel_version" ]; then
-    chroot /root su $USERNAME -- gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
+    chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/panel/global/disable_lock_screen true
 fi
 
 log_end_msg
diff --git a/scripts/casper-bottom/22screensaver b/scripts/casper-bottom/22screensaver
index 2a98b1a..6719f5f 100755
--- a/scripts/casper-bottom/22screensaver
+++ b/scripts/casper-bottom/22screensaver
@@ -22,7 +22,7 @@ log_begin_msg "$DESCRIPTION"
 
 gnome_screensaver_version=$(chroot /root dpkg-query -W --showformat='${Version}' gnome-screensaver 2>/dev/null) || gnome_screensaver_version=""
 if [ -n "$gnome_screensaver_version" ]; then
-    chroot /root su $USERNAME -- gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
+    chroot /root sudo -u "$USERNAME" gconftool-2 -t bool -s /apps/gnome-screensaver/lock false
 fi
 
 log_end_msg
diff --git a/scripts/casper-bottom/30accessibility b/scripts/casper-bottom/30accessibility
index c6015e1..8352fb6 100755
--- a/scripts/casper-bottom/30accessibility
+++ b/scripts/casper-bottom/30accessibility
@@ -21,7 +21,7 @@ esac
 log_begin_msg "$DESCRIPTION"
 
 gct() {
-    chroot /root su $USERNAME -- gconftool-2 "$@"
+    chroot /root sudo -u "$USERNAME" gconftool-2 "$@"
 }
 
 for x in $(cat /proc/cmdline); do
diff --git a/scripts/casper-bottom/32disable_hibernation b/scripts/casper-bottom/32disable_hibernation
index 7b7d976..badcef6 100755
--- a/scripts/casper-bottom/32disable_hibernation
+++ b/scripts/casper-bottom/32disable_hibernation
@@ -24,7 +24,7 @@ log_begin_msg "$DESCRIPTION"
 gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-power-manager 2>/dev/null) || panel_version=""
 if [ -n "$gpm_version" ]; then
     casper-reconfigure /root gnome-power-manager
-    chroot /root su $USERNAME -- gconftool-2 -s -t bool /apps/gnome-power-manager/can_hibernate false
+    chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_hibernate false
 fi
 
 if [ -f /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kcmlaptoprc ]; then
diff --git a/ubiquity-hooks/30accessibility b/ubiquity-hooks/30accessibility
index ab1c2e9..9fcfc26 100755
--- a/ubiquity-hooks/30accessibility
+++ b/ubiquity-hooks/30accessibility
@@ -4,10 +4,11 @@
 
 PREREQ=""
 DESCRIPTION="Configuring accessibility options..."
-USERNAME=$(db_get passwd/username)
+db_get passwd/username
+USERNAME="$RET"
 
 gct() {
-    chroot /target su $USERNAME -- gconftool-2 "$@"
+    chroot /target sudo -u "$USERNAME" gconftool-2 "$@"
 }
 
 for x in $(cat /proc/cmdline); do
@@ -21,8 +22,8 @@ for x in $(cat /proc/cmdline); do
                         gct -s -t string /apps/metacity/general/theme Atlanta
                         gct -s -t string /desktop/gnome/background/picture_filename ""
                         gct -s -t string /desktop/gnome/background/picture_options none
-                        gct "-s -t string /desktop/gnome/background/primary_color \#666666"
-                        gct "-s -t string /desktop/gnome/background/secondary_color \#7F7F7F"
+                        gct -s -t string /desktop/gnome/background/primary_color \#666666
+                        gct -s -t string /desktop/gnome/background/secondary_color \#7F7F7F
                         gct -s -t string /desktop/gnome/background/color_shading_type solid
                         gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
                         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
-- 
2.1.4