diff options
| author | Martin Dengler <martin@martindengler.com> | 2009-09-28 16:32:34 (GMT) |
|---|---|---|
| committer | Martin Dengler <martin@martindengler.com> | 2009-09-28 16:32:34 (GMT) |
| commit | 5815f89bede50129970feffe7ffc9c39b3e6449a (patch) | |
| tree | 1f9059c0aff6ee56a1bfb1c76e6b4d7733cca2da | |
| parent | d0db21fedea12152aec076fff3054a801220b9fd (diff) | |
revert 8c8014aacabcc356a932467ab9c6dacff74e020e partially
| -rw-r--r-- | soas-liveuserscripts-eliminate.ks | 26 | ||||
| -rw-r--r-- | soas-xo.ks | 5 |
2 files changed, 26 insertions, 5 deletions
diff --git a/soas-liveuserscripts-eliminate.ks b/soas-liveuserscripts-eliminate.ks index 4392d40..4e223e5 100644 --- a/soas-liveuserscripts-eliminate.ks +++ b/soas-liveuserscripts-eliminate.ks @@ -265,6 +265,32 @@ rm -f *.pdf copy-to-datastore.py ################## +# BEGIN Xclients setup +# FIXME: this should be unnecessary and might break things +cat >> /home/$CREATE_USERNAME/.Xclients << FOE +xsetroot -solid white + +eval \$(dbus-launch --sh-syntax --exit-with-session) + +RESOLUTION=\$(xdpyinfo | grep resolution | sed "s/.* \\([0-9][0-9]*\\)x.*/\\1/") +if [ "\$RESOLUTION" -gt 150 -o \\( -e /sys/class/dmi/id/product_name -a "\$(< /sys/class/dmi/id/product_name )" = "XO" \\) ]; then + SUGAR_SCALING=100 +else + SUGAR_SCALING=72 +fi + +export SUGAR_SCALING +SUGAR_SCALING=\$SUGAR_SCALING sugar +FOE + +chmod a+x /home/$CREATE_USERNAME/.Xclients +chown $CREATE_USERNAME:$CREATE_USERNAME /home/$CREATE_USERNAME/.Xclients +# END Xclients setup +################## + + + +################## # BEGIN make sugar default cat > /home/$CREATE_USERNAME/.dmrc <<EOF [Desktop] @@ -65,11 +65,6 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults echo "SYSFONT=sun12x22" >> /etc/sysconfig/i18n -# use appropriate theme for XO -# FIXME: fix upstream at [FILE BUG] -mv /usr/share/sugar/data/sugar-72.gtkrc{,-orig} -cp -p /usr/share/sugar/data/sugar-{100,72}.gtkrc - # dpms settings # FIXME: get olpc-powerd to do this |