Adding upstream version 1.79+debian.

diff --git a/bin/casper-reconfigure b/bin/casper-reconfigure
index 51f999b..ccae2c5 100755 (executable)
--- a/bin/casper-reconfigure
+++ b/bin/casper-reconfigure
@@ -43,7 +43,7 @@ package="$2"
 version=$(runcommandinroot "$root" dpkg-query -W --showformat='${Version}' "$package" 2>/dev/null) || version=""
 
 if [ -z "$version" ]; then
-    echo "$0: package '$package' is not installed"
+    echo >&2 "$0: package '$package' is not installed"
     exit 0
 fi
 

diff --git a/scripts/casper b/scripts/casper
index 346a6ca..776b57f 100644 (file)
--- a/scripts/casper
+++ b/scripts/casper
@@ -235,6 +235,13 @@ setup_unionfs() {
     
     mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt"
 
+    # move the first mount; no head in busybox-initramfs
+    for d in $(mount -t squashfs | cut -d\  -f 3); do
+        mkdir -p "${rootmnt}/rofs"
+        mount -o move "${d}" "${rootmnt}/rofs"
+        break
+    done
+
     if grep -q showmounts /proc/cmdline; then
         for d in $(mount -t squashfs | cut -d\  -f 3); do
             mkdir -p "${rootmnt}/casper/${d##*/}"

diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index 4d98798..a17a02c 100755 (executable)
--- a/scripts/casper-bottom/23networking
+++ b/scripts/casper-bottom/23networking
@@ -28,6 +28,7 @@ iface lo inet loopback
 EOF
 
 udevtrigger -Bpci -Iclass="0x02*"
+udevsettle
 
 for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*; do
     [ -e $interface ] || continue

diff --git a/scripts/casper-bottom/30accessibility b/scripts/casper-bottom/30accessibility
index 8cd633b..f2462e3 100755 (executable)
--- a/scripts/casper-bottom/30accessibility
+++ b/scripts/casper-bottom/30accessibility
@@ -52,14 +52,17 @@ for x in $(cat /proc/cmdline); do
                         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
                         access=v2)
                         gct -s -t bool /desktop/gnome/interface/accessibility true
                         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
@@ -67,8 +70,6 @@ for x in $(cat /proc/cmdline); do
                         gct -s -t bool /desktop/gnome/sound/enable_esd false
                         gct -s -t bool /desktop/gnome/interface/accessibility true
                         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
-                        #gct -s -t bool /apps/gnopernicus/srcore/sp_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/mag_active false
                         ;;
                         # Minor Motor Difficulties
                         access=m1)
@@ -82,6 +83,9 @@ for x in $(cat /proc/cmdline); do
                         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
                         access=m2)
@@ -93,6 +97,9 @@ for x in $(cat /proc/cmdline); do
                         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
 done

diff --git a/scripts/casper-bottom/32disable_hibernation b/scripts/casper-bottom/32disable_hibernation
index e27e2c4..ae4badd 100755 (executable)
--- 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

diff --git a/ubiquity-hooks/30accessibility b/ubiquity-hooks/30accessibility
index 80daccd..51f85e0 100755 (executable)
--- a/ubiquity-hooks/30accessibility
+++ b/ubiquity-hooks/30accessibility
@@ -12,8 +12,8 @@ gct() {
 }
 
 kderc_addtoprefixes() {
-    if [ -e "/root/etc/kderc" ]; then
-        sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /root/etc/kderc
+    if [ -e "/target/etc/kderc" ]; then
+        sed -i "s|\\(prefixes=/usr/share/kubuntu-default-settings/kde-profile/default/\\)|\\1,$1|" /target/etc/kderc
     fi
 }
 
@@ -34,23 +34,34 @@ for x in $(cat /proc/cmdline); do
                         gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
                         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 /target/usr/share/xubuntu-default-settings/accessibility ]; then
+                            cp -a /target/usr/share/xubuntu-default-settings/accessibility/* /target/etc/xdg/
+                        fi
                         ;;
                         # Moderate Visual Impairment
                         access=v2)
                         gct -s -t bool /desktop/gnome/interface/accessibility true
                         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
-                        kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/lesser-visual-impairment/,/usr/share/kubuntu-default-settings/kde-profile/moderate-visual-impairment/
 
+                        if [ -d /usr/share/xubuntu-default-settings ]; then
+                          apt-install gnome-orca gnome-mag
+                        fi
+
+                        if [ -e /target/usr/share/python-support/gnome-orca/orca/settings.py ]; then
+                            sed -i '/^enableSpeech\W/ s/True/False/;/^enableMagnifier/ s/False/True/' /target/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
                         access=v3)
                         gct -s -t bool /desktop/gnome/sound/enable_esd false
                         gct -s -t bool /desktop/gnome/interface/accessibility true
                         gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [orca]
-                        #gct -s -t bool /apps/gnopernicus/srcore/sp_active true
-                        #gct -s -t bool /apps/gnopernicus/srcore/mag_active false
+
+                        if [ -d /usr/share/xubuntu-default-settings ]; then
+                          apt-install gnome-orca
+                        fi
                         ;;
                         # Minor Motor Difficulties
                         access=m1)
@@ -63,6 +74,9 @@ for x in $(cat /proc/cmdline); do
                         gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
                         gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
                         kderc_addtoprefixes /usr/share/kubuntu-default-settings/kde-profile/minor-motor-difficulties/
+                        if [ -e /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+                            sed -i 's/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
+                        fi
                         ;;
                         # Motor Difficulties - pointing devices
                         access=m2)
@@ -73,6 +87,9 @@ for x in $(cat /proc/cmdline); do
                         gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
                         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 /target/etc/xdg/xfce4/mcs_settings/keyboard.xml ]; then
+                            sed -i '/Sticky/ s/0/1/' /target/etc/xdg/xfce4/mcs_settings/keyboard.xml
+                        fi
                         ;;
                esac
 done