From eed33725e68fdf4db658c334e6636266bc2c31b6 Mon Sep 17 00:00:00 2001
From: Sebastian Dziallas <sebastian@when.com>
Date: Tue, 18 Aug 2009 15:38:04 +0000
Subject: include abrt and its requirements now again

---
diff --git a/soas-appliance.ks b/soas-appliance.ks
index 8d3e76c..67c6082 100644
--- a/soas-appliance.ks
+++ b/soas-appliance.ks
@@ -8,7 +8,7 @@ xconfig --startxonboot
 
 bootloader --timeout=1 --append="acpi=force"
 network --bootproto=dhcp --device=eth0 --onboot=on
-services --enabled=network --disabled=acpid,avahi-daemon,auditd,cups,dnsmasq,exim, ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
+services --enabled=abrt,network --disabled=acpid,avahi-daemon,auditd,cups,dnsmasq,exim, ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
 
 device virtio_blk
 device virtio_pci
@@ -68,6 +68,9 @@ system-config-keyboard
 # pull plymouth theme
 plymouth-theme-soas
 
+# enable automatic bug reporting
+abrt*
+
 # sound
 pulseaudio
 alsa-plugins-pulseaudio
@@ -108,7 +111,6 @@ google-droid-serif-fonts
 -cracklib-dicts
 -nss_db
 -acpid
--anacron
 -mailcap
 -nano
 -wavpack
@@ -123,8 +125,6 @@ google-droid-serif-fonts
 -sox
 -hplip
 -hpijs
--sendmail
--ssmtp
 -numactl
 -isdn4k-utils
 -autofs
@@ -338,6 +338,9 @@ cat > /etc/sysconfig/desktop <<EOF
 DISPLAYMANAGER=/usr/sbin/olpc-dm
 EOF
 
+# setup e-mail for bug reports
+sed -i 's/root@localhost/feedback@sugarlabs.org/g' /etc/abrt/plugins/Mailx.conf
+
 # try to work-around issues with NM and APs
 rm -f /etc/NetworkManager/dispatcher.d/05-netfs
 
diff --git a/soas-base.ks b/soas-base.ks
index fe11093..3c4fe91 100644
--- a/soas-base.ks
+++ b/soas-base.ks
@@ -7,7 +7,7 @@ firewall --disabled
 xconfig --startxonboot
 bootloader --timeout=1
 part / --size 2048
-services --enabled=NetworkManager --disabled=acpid,auditd,cups,dnsmasq,exim,ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
+services --enabled=abrt,NetworkManager --disabled=acpid,auditd,cups,dnsmasq,exim,ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
 
 # We're on Rawhide now!
 repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386 --excludepkgs=generic-release,generic-release-notes,kdebase-workspace,metacity,plymouth,plymouth-*,PolicyKit-kde
@@ -23,7 +23,6 @@ kernel
 -cracklib-dicts
 -nss_db
 -acpid
--anacron
 -mailcap
 -nano
 -wavpack
@@ -38,8 +37,6 @@ kernel
 -sox
 -hplip
 -hpijs
--sendmail
--ssmtp
 -numactl
 -isdn4k-utils
 -autofs
diff --git a/soas-sugar.ks b/soas-sugar.ks
index b86f840..e452e00 100644
--- a/soas-sugar.ks
+++ b/soas-sugar.ks
@@ -43,6 +43,9 @@ gnome-power-manager
 # additional wifi support
 b43-openfwwf
 
+# enable automatic bug reporting
+abrt*
+
 # include first boot configuration
 firstboot
 smolt-firstboot
@@ -158,6 +161,9 @@ rm -f /etc/X11/xorg-*.conf
 
 echo "/usr/sbin/olpc-dm" > /etc/X11/prefdm
 
+# setup e-mail for bug reports
+sed -i 's/root@localhost/feedback@sugarlabs.org/g' /etc/abrt/plugins/Mailx.conf
+
 cat > /etc/sysconfig/desktop <<EOF
 DISPLAYMANAGER=/usr/sbin/olpc-dm
 EOF
--
cgit v0.9.1