From e1edc65e62609055ba91663b2f13445b7c807d3e Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Thu, 7 Jul 2011 18:38:55 -0400
Subject: [PATCH] runtime-{postinstall,cleanup}: more F15 fixes

* don't remove /usr/lib/locale and locale-archive in F15
* make sure /var/run isn't a symlink
---
 share/runtime-cleanup.tmpl     | 10 +++++-----
 share/runtime-postinstall.tmpl |  8 +++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index 28aebc1e..86b1eb09 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -56,11 +56,6 @@ remove /var/lib/rpm/* /var/lib/yum
 ## icons cache
 remove /usr/share/icons/*/icon-theme.cache
 
-## remove generated locales - anaconda knows how to restore them at runtime
-removefrom glibc-common /usr/lib/locale/*
-## locale-archive is not in the glibc-common filelist
-remove /usr/lib/locale/locale-archive
-
 ## clean up kernel modules
 <%
 removekmods = """
@@ -99,6 +94,10 @@ remove /modules/*/{build,source,*.map}
     removefrom systemd-units /lib/systemd/system/quota*
     removefrom systemd-units /lib/systemd/system/smartcard*
     removefrom systemd-units /lib/systemd/system/systemd-remount-api-vfs.service
+    ## remove generated locales - anaconda knows how to restore them at runtime
+    removefrom glibc-common /usr/lib/locale/*
+    ## locale-archive is not in the glibc-common filelist
+    remove /usr/lib/locale/locale-archive
 %else:
     ## F15 - remove systemd init stuff
     remove /cgroup /var/cache /var/log
@@ -108,6 +107,7 @@ remove /modules/*/{build,source,*.map}
     removefrom initscripts /lib/systemd/*
     removefrom systemd /bin/* /lib/systemd/* /usr/share/systemd/*
     removefrom util-linux /sbin/agetty
+    removefrom glibc-common /usr/share/i18n/*
 %endif
 
 ## other package specific removals
diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl
index e253293c..5cff8e71 100644
--- a/share/runtime-postinstall.tmpl
+++ b/share/runtime-postinstall.tmpl
@@ -42,9 +42,11 @@ move etc/yum.repos.d etc/anaconda.repos.d
     symlink init sbin/halt
     symlink init sbin/poweroff
     symlink init sbin/reboot
-    remove sbin/runlevel sbin/shutdown sbin/telinit
-    ## Since systemd won't be creating paths for us..
-    mkdir /var/run/dbus
+    remove sbin/runlevel sbin/telinit
+    ## Since systemd won't be setting up sockets in /run for us..
+    remove var/run
+    move run var
+    mkdir var/run/dbus
 %endif
 symlink /sbin/init init
 install ${configdir}/network etc/sysconfig