Adding casper 1.79+debian-1.

4 files changed, 24 insertions, 6 deletions

diff --git a/scripts/casper b/scripts/casper
index c462247..f070aa2 100644
--- a/scripts/casper
+++ b/scripts/casper
@@ -95,7 +95,7 @@ parse_cmdline ()
                 PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
                 ;;
             console=*)
-                export DEFCONSOLE="${x#*=}" ;;
+                export DEFCONSOLE=$(sed -e 's%.*console=%console=%' /proc/cmdline) ;;
         esac
     done
 
@@ -426,6 +426,7 @@ setup_unionfs() {
     rofsstring=${rofsstring%:}
 
     mkdir -p /cow
+
     cowdevice="tmpfs"
     cow_fstype="tmpfs"
 
diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index 129ca35..116b1d6 100755
--- a/scripts/casper-bottom/23networking
+++ b/scripts/casper-bottom/23networking
@@ -33,7 +33,12 @@ iface lo inet loopback
 
 EOF
 
-udevtrigger
+if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+    udevtrigger -Bpci -Iclass="0x02*"
+else
+    udevtrigger
+fi
+udevsettle
 
 if [ -z "${NETBOOT}" -a -n "${STATICIP}" -a "${STATICIP}" != "frommedia" ]; then
     parsed=$(echo "${STATICIP}" | sed -e 's/:/ /g')
diff --git a/scripts/casper-bottom/30accessibility b/scripts/casper-bottom/30accessibility
index 943f5a0..8b6f875 100755
--- a/scripts/casper-bottom/30accessibility
+++ b/scripts/casper-bottom/30accessibility
@@ -51,6 +51,9 @@ case ${ACCESS} in
         gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
 
         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/
+        if [ -d /root/usr/share/xubuntu-default-settings/accessibility ]; then
+            cp -a /root/usr/share/xubuntu-default-settings/accessibility/* /root/etc/xdg/
+        fi
         ;;
     # Moderate Visual Impairment
     v2)
@@ -58,7 +61,9 @@ case ${ACCESS} in
         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
         #gct -s -t bool /apps/gnopernicus/srcore/mag_active true
         #gct -s -t bool /apps/gnopernicus/srcore/sp_active false
-
+        if [ -e /root/usr/share/python-support/gnome-orca/orca/settings.py ]; then
+            sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /root/usr/share/python-support/gnome-orca/orca/settings.py
+        fi
         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
         ;;
     # Blindness
@@ -81,6 +86,10 @@ case ${ACCESS} in
         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
 
         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
+        if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+            sed -i 's/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
+        fi
+
         ;;
     # Motor Difficulties - pointing devices
     m2)
@@ -92,6 +101,9 @@ case ${ACCESS} in
         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [onboard]
 
         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/,/usr/share/kubuntu-default-settings/kde-profile/motor-difficulties-pointing-devices/
+        if [ -e /root/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+            sed -i '/Sticky/ s/0/1/' /root/etc/xdg/xfce4/mcs_settings/keyboard.xml
+        fi
         ;;
 esac
 
diff --git a/scripts/casper-bottom/32disable_hibernation b/scripts/casper-bottom/32disable_hibernation
index e27e2c4..ae4badd 100755
--- a/scripts/casper-bottom/32disable_hibernation
+++ b/scripts/casper-bottom/32disable_hibernation
@@ -28,9 +28,9 @@ if [ -n "$gpm_version" ]; then
     chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_suspend false
 fi
 
-if [ -f /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kcmlaptoprc ]; then
-    sed -i s/EnableHibernate=true/EnableHibernate=false/ \
-        /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/kcmlaptoprc
+if [ -d /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config ]; then
+    echo "disableSuspend=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
+    echo "disableHibernate=1" >> /root/usr/share/kubuntu-default-settings/kde-profile/default/share/config/power-managerrc
 fi
 
 log_end_msg