use olpc-utils

1 files changed, 5 insertions, 148 deletions

diff --git a/soas-xo.ks b/soas-xo.ks
index 93e83db..78987ce 100644
--- a/soas-xo.ks
+++ b/soas-xo.ks
@@ -2,6 +2,7 @@
 %include soas-aslo-and-content.ks
 
 repo --name=olpc-kernel-xo-1 --cost=2 --baseurl=http://dev.laptop.org/~mdengler/xo-1
+repo --name=olpc --cost=3 --baseurl=http://dev.laptop.org/~dsd/xo1.5-rpms
 
 %packages --excludedocs --instLangs en_US
 
@@ -14,6 +15,8 @@ xcompmgr
 olpc-kbdshim
 olpc-powerd
 
+olpc-utils
+
 kernel-2.6.30
 -mkinitrd
 -kpartx
@@ -116,6 +119,8 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
 
 
 # nicer console font for our little screen
+# FIXME: olpc-configure sets this up too, but it's too late for first boot.
+# but perhaps we could fix that so that it gets applied.
 echo "SYSFONT=sun12x22" >> /etc/sysconfig/i18n
 
 
@@ -143,20 +148,6 @@ for activity_dir in $BUNDLES_DIR/* ; do
     ln -s $activity_dir /home/$CREATE_USERNAME/Activities
 done
 
-# setup Xclients
-cat > /home/$CREATE_USERNAME/.Xclients <<FOE
-
-eval \$(dbus-launch --sh-syntax --exit-with-session)
-
-exec sugar
-FOE
-chmod a+x /home/$CREATE_USERNAME/.Xclients
-chown $CREATE_USERNAME:$CREATE_USERNAME /home/$CREATE_USERNAME/.Xclients
-
-
-# fix issues with dbus and ck
-rm /etc/X11/xinit/xinitrc.d/00-start-message-bus.sh
-
 
 # END avoid livesys scripts at every boot
 ##################
@@ -262,140 +253,6 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
 
 
 ##################
-# BEGIN slim autostart
-cat >> /etc/slim.conf << FOE
-auto_login	yes
-default_user	$CREATE_USERNAME
-FOE
-# END slim autostart
-##################
-
-
-
-##################
-# BEGIN fix keyboard layout
-cat > /etc/sysconfig/keyboard <<EOF
-KEYBOARDTYPE="pc"
-KEYTABLE="us"
-LAYOUT="us"
-MODEL="olpc"
-OPTIONS=""
-VARIANT="olpc"
-EOF
-
-cat > /usr/share/hal/fdi/information/10freedesktop/30-keymap-olpc.fdi <<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
-
-
-<!-- FIXME: this isn't a great way to detect a C2 / XO-1 -->
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.product" string="OLPC HGPK ALPS HGPK">
-      <merge key="/org/freedesktop/Hal/devices/computer:system.hardware.product" type="string">C2</merge>
-      <merge key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" type="string">OLPC</merge>
-      <merge key="/org/freedesktop/Hal/devices/computer:system.hardware.version" type="string">OLPC C2</merge>
-    </match>
-  </device>
-</deviceinfo>
-
-<deviceinfo version="0.2">
-  <device>
-
-    <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="OLPC C2">
-
-      <match key="@input.originating_device:info.linux.driver" string="atkbd">
-        <append key="input.keymap.data" type="strlist">59:fn</append>
-        <append key="input.keymap.data" type="strlist">e001:fn_esc</append>
-
-        <append key="input.keymap.data" type="strlist">e079:camera</append>
-        <!-- FN-CAMERA is 'Mic', KEY_SOUND is as close as I see. -->
-        <append key="input.keymap.data" type="strlist">e078:sound</append>
-
-        <append key="input.keymap.data" type="strlist">e03b:fn_f1</append>
-        <append key="input.keymap.data" type="strlist">e03c:fn_f2</append>
-        <append key="input.keymap.data" type="strlist">e03d:fn_f3</append>
-        <append key="input.keymap.data" type="strlist">e03e:fn_f4</append>
-        <append key="input.keymap.data" type="strlist">e03f:fn_f5</append>
-        <append key="input.keymap.data" type="strlist">e040:fn_f6</append>
-        <append key="input.keymap.data" type="strlist">e041:fn_f7</append>
-        <append key="input.keymap.data" type="strlist">e042:fn_f8</append>
-        <append key="input.keymap.data" type="strlist">e043:fn_f9</append>
-        <append key="input.keymap.data" type="strlist">e044:fn_f10</append>
-        <append key="input.keymap.data" type="strlist">e057:fn_f11</append>
-        <append key="input.keymap.data" type="strlist">e058:fn_f12</append>
-
-        <!-- Using KEY_F13-KEY_F21 for the .5 F keys right now. -->
-        <append key="input.keymap.data" type="strlist">e077:fn_f13</append>
-        <append key="input.keymap.data" type="strlist">e076:fn_f14</append>
-        <append key="input.keymap.data" type="strlist">e075:fn_f15</append>
-        <append key="input.keymap.data" type="strlist">e074:fn_f16</append>
-        <append key="input.keymap.data" type="strlist">e073:fn_f17</append>
-        <append key="input.keymap.data" type="strlist">e072:fn_f18</append>
-        <append key="input.keymap.data" type="strlist">e071:fn_f19</append>
-        <append key="input.keymap.data" type="strlist">e070:fn_f20</append>
-        <append key="input.keymap.data" type="strlist">e06f:fn_f21</append>
-
-        <append key="input.keymap.data" type="strlist">e06e:chat</append>
-        <!-- FIXME: FN-CHAT, just mapping to KEY_CHAT right now -->
-        <append key="input.keymap.data" type="strlist">e064:chat</append>
-
-        <!-- Frame and Fn-frame , which is listed as 'Win App', try -->
-        <append key="input.keymap.data" type="strlist">e05d:menu</append>
-        <append key="input.keymap.data" type="strlist">e05a:prog1</append>
-
-        <!-- The FN of some keys is other keys -->
-        <append key="input.keymap.data" type="strlist">e053:delete</append>
-        <append key="input.keymap.data" type="strlist">e052:insert</append>
-        <append key="input.keymap.data" type="strlist">e049:pageup</append>
-        <append key="input.keymap.data" type="strlist">e051:pagedown</append>
-        <append key="input.keymap.data" type="strlist">e047:home</append>
-        <append key="input.keymap.data" type="strlist">e04f:end</append>
-
-        <!-- FIXME: These should be the language key. Don't ask what they
-             are doing as KEY_HP. It will make your brain hurt. -->
-        <append key="input.keymap.data" type="strlist">73:hp</append>
-        <append key="input.keymap.data" type="strlist">7e:hp</append>
-
-        <!-- L/R grab -->
-        <append key="input.keymap.data" type="strlist">e05b:leftmeta</append>
-        <append key="input.keymap.data" type="strlist">e05c:rightmeta</append>
-        <!-- FIXME: right grab seems to be releasing on a different scancode -->
-        <append key="input.keymap.data" type="strlist">85:rightmeta</append>
-
-        <!-- Fn-space toggles the backlight.
-             At least in a dream I had last night. -->
-        <append key="input.keymap.data" type="strlist">e056:kbdillumtoggle</append>
-
-        <!-- Set the D-PAD keys to map to up/down/left/right for now -->
-        <append key="input.keymap.data" type="strlist">65:kp8</append>
-        <append key="input.keymap.data" type="strlist">66:kp2</append>
-        <append key="input.keymap.data" type="strlist">67:kp4</append>
-        <append key="input.keymap.data" type="strlist">68:kp6</append>
-
-        <!-- set the game keys to map to pgup/pgdn/home/end -->
-        <append key="input.keymap.data" type="strlist">e065:kp9</append>
-        <append key="input.keymap.data" type="strlist">e066:kp3</append>
-        <append key="input.keymap.data" type="strlist">e067:kp7</append>
-        <append key="input.keymap.data" type="strlist">e068:kp1</append>
-
-        <append key="input.keymap.data" type="strlist">69:switchvideomode</append>
-
-        <append key="info.capabilities" type="strlist">input.keymap</append>
-
-      </match>
-
-    </match>
-  </device>
-</deviceinfo>
-
-EOF
-
-# END fix keyboard layout
-##################
-
-
-
-##################
 # BEGIN enable serial console
 
 echo ttyS0 >> /etc/securetty