summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2010-08-18 19:41:03 -0400
committerDave Jones <davej@redhat.com>2010-08-18 19:50:33 -0400
commit95f99faff4642ad24b9f62227cbb96cfc4576038 (patch)
treecbe2a789876e534f768145e5270dd4c29c0bc18f
parentc3126dc3b565782fe7d81e6bdf45040d321928f9 (diff)
downloadkernel-95f99faff4642ad24b9f62227cbb96cfc4576038.tar.gz
kernel-95f99faff4642ad24b9f62227cbb96cfc4576038.tar.xz
kernel-95f99faff4642ad24b9f62227cbb96cfc4576038.zip
systemd is dependant upon autofs, so build it in instead of modular.
-rw-r--r--config-generic3
-rw-r--r--kernel.spec3
2 files changed, 5 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 3726766e7..7fc76ef51 100644
--- a/config-generic
+++ b/config-generic
@@ -3358,7 +3358,8 @@ CONFIG_QUOTACTL=y
CONFIG_DNOTIFY=y
# Autofsv3 is obsolete.
# CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=m
+# systemd is dependant upon AUTOFS, so build it in.
+CONFIG_AUTOFS4_FS=y
CONFIG_EXOFS_FS=m
# CONFIG_EXOFS_DEBUG is not set
CONFIG_NILFS2_FS=m
diff --git a/kernel.spec b/kernel.spec
index 7d0bdc2ce..f4eabe43d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1865,6 +1865,9 @@ fi
# || ||
%changelog
+* Wed Aug 18 2010 Dave Jones <davej@redhat.com>
+- systemd is dependant upon autofs, so build it in instead of modular.
+
* Wed Aug 18 2010 Chuck Ebbert <cebbert@redhat.com>
- Linux 2.6.36-rc1-git1