Port all modules to Fedora 16

Includes package list updates, port to systemd, etc.

11 files changed, 37 insertions, 25 deletions

diff --git a/modules/base/ksmain.10.core.inc b/modules/base/ksmain.10.core.inc
index 0e7c39e..cbc3355 100644
--- a/modules/base/ksmain.10.core.inc
+++ b/modules/base/ksmain.10.core.inc
@@ -5,5 +5,5 @@ selinux --disabled
 firewall --disabled
 xconfig --startxonboot
 part / --size 4096 --fstype=ext3
-services --enabled=avahi-daemon,crond,messagebus,NetworkManager --disabled=dnsmasq,ip6tables,iptables,mdmonitor,netfs,network,sshd
+services --enabled=crond --disabled=dnsmasq,ip6tables,iptables,mdmonitor,netfs,network,sshd
 
diff --git a/modules/base/kspkglist.10.core.inc b/modules/base/kspkglist.10.core.inc
index 8a54c52..ed8ac75 100644
--- a/modules/base/kspkglist.10.core.inc
+++ b/modules/base/kspkglist.10.core.inc
@@ -16,6 +16,7 @@ rpm
 yum
 tree
 nano
+less
 
 # basic debugging
 strace
diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc
index 36f234d..602f767 100644
--- a/modules/base/kspost.10.core.inc
+++ b/modules/base/kspost.10.core.inc
@@ -54,10 +54,10 @@ SYSFONT=sun12x22
 __EOF__
 
 # OLPC custom VT layout and serial console setup (#9517, #10354)
-sed -i -e 's/mingetty/mingetty --loginpause --autologin root --noclear/' \
-	/etc/init/tty.conf
-sed -i -e 's:ACTIVE_CONSOLES=/dev/tty\[1-6\]:ACTIVE_CONSOLES=/dev/tty[1-3]:' \
-	/etc/sysconfig/init
+sed -i -e 's/agetty.*/mingetty --loginpause --autologin root --noclear %I/' \
+	/lib/systemd/system/getty\@.service
+sed -i -e 's:agetty.*:agetty -L -l /bin/bash -w -n %I 115200 vt100:' \
+	/lib/systemd/system/serial-getty\@.service
 
 # Enable tmpfs mounts dictated by rwtab (#9637)
 mkdir -p /security/state
@@ -83,15 +83,26 @@ cat >/etc/statetab.d/olpc <<EOF
 /var/lib/random-seed
 EOF
 
+# systemd stuff that is not interesting for us
+#systemctl disable systemd-readahead-collect.service
+#systemctl disable systemd-readahead-replay.service
+#systemctl disable systemd-readahead-done.service
+systemctl disable fedora-loadmodules.service
+systemctl disable fedora-storage-init-late.service
+systemctl disable fedora-storage-init.service
+systemctl disable fedora-wait-storage.service
+#systemctl disable mdmonitor-takeover.service
+#systemctl disable system-setup-keyboard.service
+
 #prefdm tweaks
-sed -i -e 's/respawn limit 10/respawn limit 3/' /etc/init/prefdm.conf
+#sed -i -e 's/respawn limit 10/respawn limit 3/' /etc/init/prefdm.conf
 
-cat >>/etc/init/prefdm.conf <<EOF
+#cat >>/etc/init/prefdm.conf <<EOF
 # make sure dcon is unfrozen if something goes wrong.
-post-stop script
-  echo 0 > /sys/devices/platform/dcon/freeze
-end script
-EOF
+#post-stop script
+#  echo 0 > /sys/devices/platform/dcon/freeze
+#end script
+#EOF
 
 # OLPC CA certificate (#9624)
 # this is used by wget, but the Web activity uses cert8.db in its own
@@ -156,7 +167,6 @@ rm -f /etc/avahi/etc/localtime
 
 # kill a load of non-interesting anacron tasks (#10247)
 chmod -x /etc/cron.daily/logrotate
-chmod -x /etc/cron.weekly/99-raid-check
 
 # suppress generation of certain SSH host keys in the same way we did
 # it on XO-1 builds, so as to reduce first boot time by several
diff --git a/modules/gnome/kspkglist.50.gnome.inc b/modules/gnome/kspkglist.50.gnome.inc
index 0c732fd..6d6197c 100644
--- a/modules/gnome/kspkglist.50.gnome.inc
+++ b/modules/gnome/kspkglist.50.gnome.inc
@@ -4,6 +4,7 @@ gnome-desktop
 gnome-panel
 gnome-session
 gnome-terminal
+gnome-settings-daemon
 metacity
 nautilus
 
@@ -36,7 +37,6 @@ gimp
 # audio & video
 audacity
 totem
-totem-gstreamer
 totem-mozplugin
 
 # more desktop stuff
diff --git a/modules/gnome/kspost.50.gconf.inc b/modules/gnome/kspost.50.gconf.inc
index 9a706ee..22b45c4 100644
--- a/modules/gnome/kspost.50.gconf.inc
+++ b/modules/gnome/kspost.50.gconf.inc
@@ -24,9 +24,3 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
 # disable annoying pop-ups from IM settings daemon (we use our own IM settings mechanism for now)
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /apps/imsettings-applet/notify_on_bubble false
 
-# Set Nautilus to browser mode by default
-gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type bool --set /apps/nautilus/preferences/always_use_browser true
-
-# Remove email-launcher icon from panel
-gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type list --list-type string --set  /apps/panel/general/object_id_list [menu_bar,web_launcher]
-
diff --git a/modules/jffs2_image/kspost.50.jffs2.inc b/modules/jffs2_image/kspost.50.jffs2.inc
index 4b678ba..63f89d3 100644
--- a/modules/jffs2_image/kspost.50.jffs2.inc
+++ b/modules/jffs2_image/kspost.50.jffs2.inc
@@ -1,4 +1,4 @@
 # 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
+echo "%_dbi_config nommap" > /etc/rpm/macros.rpmdb
 
diff --git a/modules/sugar/kspkglist.50.sugar.inc b/modules/sugar/kspkglist.50.sugar.inc
index d7d09a2..a91ed43 100644
--- a/modules/sugar/kspkglist.50.sugar.inc
+++ b/modules/sugar/kspkglist.50.sugar.inc
@@ -5,7 +5,6 @@ sugar
 libxml2-python
 hulahop
 pyabiword
-gnome-python2-evince
 udisks
 espeak
 etoys
@@ -39,7 +38,7 @@ pybox2d
 gstreamer-plugins-espeak
 
 # using a non-upstream updater temporarily (#10641)
-sugar-update-control
+# sugar-update-control # FIXME f16
 
 # explicitly specify dependencies on GNOME's implementation of certain
 # components, otherwise the KDE ones will be brought in by default
diff --git a/modules/x11/kspost.60.misc.inc b/modules/x11/kspost.60.misc.inc
index 8f269b5..1b284e3 100644
--- a/modules/x11/kspost.60.misc.inc
+++ b/modules/x11/kspost.60.misc.inc
@@ -88,9 +88,6 @@ if [ -e /usr/lib/xulrunner-*/greprefs/all.js ]; then
 	sed -i -e 's:\(layout.css.dpi",\) -1:\1 96:' /usr/lib/xulrunner-*/greprefs/all.js
 fi
 
-# remove unneccesary package mesa-dri-drivers (#11036)
-rpm -e --nodeps mesa-dri-drivers
-
 # remove gstreamer pulse element so that totem doesn't try to use it (#10158)
 [ -e /usr/lib/gstreamer-0.10/libgstpulse.so ] && rm /usr/lib/gstreamer-0.10/libgstpulse.so
 
diff --git a/modules/xo1/kspost.50.xo1-tweaks.inc b/modules/xo1/kspost.50.xo1-tweaks.inc
index ff7f368..fbad7e9 100644
--- a/modules/xo1/kspost.50.xo1-tweaks.inc
+++ b/modules/xo1/kspost.50.xo1-tweaks.inc
@@ -13,3 +13,7 @@ gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults
 # add /ofw, can be removed when we move to newer kernels with /proc/device-tree
 mkdir /ofw
 echo "none            /ofw            promfs		  defaults    0 0" >> /etc/fstab
+
+# enable serial console on ttyS0
+ln -sf /lib/systemd/system/serial-getty@.service \
+	/etc/systemd/system/getty.target.wants/serial-getty@ttyS0.service
diff --git a/modules/xo1_5/kspost.50.xo15-tweaks.inc b/modules/xo1_5/kspost.50.xo15-tweaks.inc
index e3109ec..8591c30 100644
--- a/modules/xo1_5/kspost.50.xo15-tweaks.inc
+++ b/modules/xo1_5/kspost.50.xo15-tweaks.inc
@@ -1,3 +1,7 @@
 # add /ofw, can be removed when we move to newer kernels with /proc/device-tree
 mkdir /ofw
 echo "none            /ofw            promfs		  defaults    0 0" >> /etc/fstab
+
+# enable serial console on ttyS0
+ln -sf /lib/systemd/system/serial-getty@.service \
+	/etc/systemd/system/getty.target.wants/serial-getty@ttyS0.service
diff --git a/modules/xo1_75/kspost.50.xo1_75-tweaks.inc b/modules/xo1_75/kspost.50.xo1_75-tweaks.inc
index e69de29..ae5e726 100644
--- a/modules/xo1_75/kspost.50.xo1_75-tweaks.inc
+++ b/modules/xo1_75/kspost.50.xo1_75-tweaks.inc
@@ -0,0 +1,3 @@
+# enable serial console on ttyS2
+ln -sf /lib/systemd/system/serial-getty@.service \
+	/etc/systemd/system/getty.target.wants/serial-getty@ttyS2.service