[Lunar-commits] <moonbase> systemd: Update to 29, add FANOTIFY warning (for readahead)

[Auke Kok]

commit e9d30b8c02bb0cd67c5e1f231c34e7f4ecf5ee5b
Author: Auke Kok <sofar at foo-projects.org>
Date:   Sat Jun 18 07:42:27 2011 +0200

    systemd: Update to 29, add FANOTIFY warning (for readahead)
    
    I'm making the kernel option tests skippable. systemd may work without
    them, so that seems more fair.
---
 zbeta/systemd/DETAILS   |    8 ++++----
 zbeta/systemd/PRE_BUILD |   21 +++++++++++++--------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/zbeta/systemd/DETAILS b/zbeta/systemd/DETAILS
index c1dfa77..7888a0f 100644
--- a/zbeta/systemd/DETAILS
+++ b/zbeta/systemd/DETAILS
@@ -1,12 +1,12 @@
           MODULE=systemd
-         VERSION=28
+         VERSION=29
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://www.freedesktop.org/software/systemd
-      SOURCE_VFY=sha1:8c8e04f4577afcc7fa5f28205d581594fe69367b
+      SOURCE_VFY=sha1:5dc36e8d900085af31a96a6bafaba228bc8225c7
         WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
          ENTERED=20100919
-         UPDATED=20110528
-           SHORT="A sysvinit replacement"
+         UPDATED=20110617
+           SHORT="A system and program management daemon"
 
 cat << EOF
 systemd is a system and session manager for Linux, compatible with SysV
diff --git a/zbeta/systemd/PRE_BUILD b/zbeta/systemd/PRE_BUILD
index 8f65dba..625f57c 100644
--- a/zbeta/systemd/PRE_BUILD
+++ b/zbeta/systemd/PRE_BUILD
@@ -1,10 +1,15 @@
-if ! kernel_option_present CONFIG_DEVTMPFS &&
-   ! kernel_option_present CONFIG_CGROUPS
-then
-    message "${PROBLEM_COLOR}PROBLEM: ${MODULE_COLOR}system${DEFAULT_COLOR} detected incompatible kernel options."
-    message "Please ensure that CONFIG_DEVTMPFS and CONFIG_CGROUPS are set,"
-    message "then recompile your kernel and try 'lin systemd' again."
-    exit 1
-fi
+for O in \
+  CONFIG_FANOTIFY \
+  CONFIG_DEVTMPFS \
+  CONFIG_CGROUPS
+do
+  if ! kernel_option_present $O ; then
+    message "${MESSAGE_COLOR}incompatible kernel option setting: ${PROBLEM_COLOR}$O${DEFAULT_COLOR}${MESSAGE_COLOR}"
+    message "Please ensure this kernel option is enabled, recompile your kernel and try again.${DEFAULT_COLOR}"
+    if ! query "Ignore this warning?" n ; then
+      exit 1
+    fi
+  fi
+done
 
 default_pre_build