Index: unk/server/common/patches/openafs-localcsdb.patch
===================================================================
--- /trunk/server/common/patches/openafs-localcsdb.patch	(revision 2169)
+++ 	(revision )
@@ -1,11 +1,0 @@
---- openafs-1.4/src/packaging/RedHat/openafs-client.init.orig	2009-04-14 04:28:32.000000000 -0400
-+++ openafs-1.4/src/packaging/RedHat/openafs-client.init	2009-04-14 04:27:08.000000000 -0400
-@@ -14,7 +14,7 @@
- 
- start() {
-         echo -n $"Updating CellServDB: "
--        cat /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist > \
-+        cat /usr/vice/etc/CellServDB.local > \
-                /usr/vice/etc/CellServDB
-         chmod 644 /usr/vice/etc/CellServDB
-         echo
Index: /trunk/server/common/patches/openafs-systemd-csdb.patch
===================================================================
--- /trunk/server/common/patches/openafs-systemd-csdb.patch	(revision 2170)
+++ /trunk/server/common/patches/openafs-systemd-csdb.patch	(revision 2170)
@@ -0,0 +1,11 @@
+--- a/src/packaging/RedHat/openafs-client.service	2012-03-26 17:04:18.177919348 -0400
++++ b/src/packaging/RedHat/openafs-client.service	2012-03-26 17:15:17.206630779 -0400
+@@ -6,7 +6,7 @@
+ [Service]
+ Type=forking
+ EnvironmentFile=/etc/sysconfig/openafs
+-ExecStartPre=/bin/sed -n 'w/usr/vice/etc/CellServDB' /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.dist
++ExecStartPre=-/bin/sed -n 'w/usr/vice/etc/CellServDB' /usr/vice/etc/CellServDB.local /usr/vice/etc/CellServDB.mousetrap
+ ExecStartPre=/bin/chmod 0644 /usr/vice/etc/CellServDB
+ ExecStartPre=/sbin/modprobe openafs
+ ExecStart=/usr/vice/etc/afsd $AFSD_ARGS
Index: /trunk/server/fedora/specs/openafs.spec.patch
===================================================================
--- /trunk/server/fedora/specs/openafs.spec.patch	(revision 2169)
+++ /trunk/server/fedora/specs/openafs.spec.patch	(revision 2170)
@@ -15,7 +15,7 @@
  
 +Patch1000: openafs-scripts.patch
-+Patch1001: openafs-localcsdb.patch
-+Patch1002: openafs-systemd.patch
-+Patch1003: openafs-systemd-crond.patch
++Patch1001: openafs-systemd.patch
++Patch1002: openafs-systemd-crond.patch
++Patch1003: openafs-systemd-csdb.patch
 +Patch1004: openafs-linux-3.1-rcu.patch
 +Patch1005: openafs-linux-3.1-fsync.patch
@@ -89,7 +89,7 @@
 +# Apply the Scripts patch
 +%patch1000 -p1 -b .scripts
-+%patch1001 -p1 -b .localcsdb
-+%patch1002 -p1 -b .systemd
-+%patch1003 -p1 -b .systemd-crond
++%patch1001 -p1 -b .systemd
++%patch1002 -p1 -b .systemd-crond
++%patch1003 -p1 -b .systemd-csdb
 +%patch1004 -p1 -b .rcu
 +%patch1005 -p1 -b .fsync