push alsroot's patches and prevent installation of old pkgs

2 files changed, 36 insertions, 10 deletions

diff --git a/soas-base.ks b/soas-base.ks
index 4f90ccb..dcabdb2 100644
--- a/soas-base.ks
+++ b/soas-base.ks
@@ -7,7 +7,7 @@ firewall --enabled
 bootloader --timeout=1
 xconfig --startxonboot
 part / --size 2048
-services --enabled=NetworkManager --disabled=network,sshd
+services --enabled=NetworkManager,speech-dispatcherd --disabled=network,sshd
 
 repo --name=released --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-10&arch=i386
 repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f10&arch=i386 --excludepkgs=xorg-x11-drv-geode
diff --git a/soas-sugar.ks b/soas-sugar.ks
index b8019ca..429fceb 100644
--- a/soas-sugar.ks
+++ b/soas-sugar.ks
@@ -6,14 +6,14 @@ repo --name=honey --baseurl=http://people.sugarlabs.org/~alsroot/soas/
 %packages
 
 # sugar!
-@sugar-desktop
-gtksourceview2
-
-# additional activities
 sugar-fructose
 sugar-glucose
 sugar-honey
 
+# additional system stuff
+alsa-utils
+gtksourceview2
+
 # e-mail client
 alpine
 
@@ -76,13 +76,14 @@ default_user	liveuser
 FOE
 
 # setup Xclients
-echo "sugar" > /home/liveuser/.Xclients
+echo "xsetroot -def" > /home/liveuser/.Xclients
+echo "SUGAR_SCALING=72 sugar" >> /home/liveuser/.Xclients
 chmod a+x /home/liveuser/.Xclients
 chown liveuser:liveuser /home/liveuser/.Xclients
 
 # setup support for QEMU
-if [ \`grep -c QEMU /proc/cpuinfo\` -ne 0 ]; then
-  cat > /etc/X11/xorg.conf <<FOE
+grep QEMU /sys/firmware/acpi/tables/APIC >/dev/null \
+    && cat > /etc/X11/xorg.conf <<FOE
 Section "ServerLayout"
         Identifier     "Default layout"
         Screen      0  "Screen0" 0 0
@@ -120,7 +121,6 @@ Section "Screen"
         EndSubSection
 EndSection
 FOE
-fi
 
 # setup activity directory
 mkdir -p /home/liveuser/Activities
@@ -129,6 +129,33 @@ for bundle in \`find /usr/share/sugar/bundles -maxdepth 1\` ; do
   ln -s \$bundle /home/liveuser/Activities
 done
 
+# free the alsa
+echo 'chmod 0666 /dev/snd/*' >> /etc/rc.d/rc.local
+
+# if system doesn't support hardware mixing
+aplay -l | grep '\/[0-9]\+$' | head -n1 | grep '\/1$' \
+    && cat > /etc/asound.conf <<FOE
+pcm.!default {
+    type plug
+    slave.pcm "dmixer"
+}
+pcm.dmixer {
+    type dmix
+    ipc_key 1024
+    ipc_perm 0666
+    slave {
+        pcm "hw:0,0"
+        period_time 0
+        period_size 1024
+        buffer_size 8192
+    }
+}
+bindings {
+    0 0
+    1 1
+}
+FOE
+
 EOF
 
 %end
@@ -136,7 +163,6 @@ EOF
 %post --nochroot
 
 ACTIVITIES="
-http://dev.laptop.org/~morgan/bundles/other/Paint-23.xo
 http://dev.laptop.org/~cscott/bundles/Pippy-30.xo
 http://sugarlabs.org/wiki/images/9/9f/InfoSlicer-1.xo
 "