3 files changed, 5 insertions, 2 deletions

diff --git a/base.ks b/base.ks
index 5f2281e..888faee 100644
--- a/base.ks
+++ b/base.ks
@@ -456,6 +456,9 @@ rm -f /boot/initrd*
 # make sure there aren't core files lying around
 rm -f /core*
 
+# try to work-around issues with NM and APs
+rm -f /etc/NetworkManager/dispatcher.d/05-netfs
+
 # permanently set %__dbi_cdb rpm macro to work around jffs2's lack of writeable mmap()
 mkdir -p /etc/rpm
 echo "%__dbi_cdb create private nommap" > /etc/rpm/macros.rpmdb
diff --git a/olpc.ks b/olpc.ks
index d428172..3605123 100644
--- a/olpc.ks
+++ b/olpc.ks
@@ -4,7 +4,7 @@
 
 bootloader --timeout=1
 part / --size 1024
-services --enabled=NetworkManager --disabled=acpid,avahi-daemon,auditd,cups,dnsmasq,exim, ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
+services --enabled=NetworkManager --disabled=acpid,auditd,cups,dnsmasq,exim,ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
 
 %packages --excludedocs --instLangs en_US
 @admin-tools
diff --git a/soas.ks b/soas.ks
index aca7f65..429ca4f 100644
--- a/soas.ks
+++ b/soas.ks
@@ -3,7 +3,7 @@
 
 bootloader --timeout=1
 part / --size 1024
-services --enabled=NetworkManager --disabled=acpid,avahi-daemon,auditd,cups,dnsmasq,exim, ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
+services --enabled=NetworkManager --disabled=acpid,auditd,cups,dnsmasq,exim,ip6tables,iptables,irda,kerneloops,mdmonitor,netfs,network,nfs,nfslock,nscd,portreserve,rpcbind,rpcgssd,rpcidmapd,sshd
 
 %packages --excludedocs --instLangs en_US
 @base-x