|
 |
a52f674 |
From 0e3ff7da8e53b30ae0a5534beceee46adc14b3ef Mon Sep 17 00:00:00 2001
|
|
|
930e1b8 |
From: Tom Gundersen <teg@jklm.no>
|
|
|
930e1b8 |
Date: Thu, 17 Oct 2013 19:49:19 +0200
|
|
|
930e1b8 |
Subject: [PATCH] static-nodes: don't call mkdir
|
|
|
930e1b8 |
|
|
|
930e1b8 |
This is no longer necessary with kmod-15. Bump the requirement.
|
|
|
930e1b8 |
---
|
|
|
930e1b8 |
README | 2 +-
|
|
|
930e1b8 |
configure.ac | 2 +-
|
|
|
930e1b8 |
units/kmod-static-nodes.service.in | 1 -
|
|
|
930e1b8 |
3 files changed, 2 insertions(+), 3 deletions(-)
|
|
|
930e1b8 |
|
|
|
930e1b8 |
diff --git a/README b/README
|
|
|
930e1b8 |
index b39cd37..cf0a18d 100644
|
|
|
930e1b8 |
--- a/README
|
|
|
930e1b8 |
+++ b/README
|
|
|
930e1b8 |
@@ -95,7 +95,7 @@ REQUIREMENTS:
|
|
|
930e1b8 |
dbus >= 1.4.0
|
|
|
930e1b8 |
libcap
|
|
|
930e1b8 |
libblkid >= 2.20 (from util-linux) (optional)
|
|
|
930e1b8 |
- libkmod >= 14 (optional)
|
|
|
930e1b8 |
+ libkmod >= 15 (optional)
|
|
|
930e1b8 |
PAM >= 1.1.2 (optional)
|
|
|
930e1b8 |
libcryptsetup (optional)
|
|
|
930e1b8 |
libaudit (optional)
|
|
|
930e1b8 |
diff --git a/configure.ac b/configure.ac
|
|
|
930e1b8 |
index 4f26092..5bc31c5 100644
|
|
|
930e1b8 |
--- a/configure.ac
|
|
|
930e1b8 |
+++ b/configure.ac
|
|
|
930e1b8 |
@@ -269,7 +269,7 @@ AC_ARG_ENABLE(kmod, AS_HELP_STRING([--disable-kmod], [disable loadable modules s
|
|
|
930e1b8 |
if test "x$enable_kmod" != "xno"; then
|
|
|
930e1b8 |
PKG_CHECK_EXISTS([ libkmod ], have_kmod=yes, have_kmod=no)
|
|
|
930e1b8 |
if test "x$have_kmod" = "xyes"; then
|
|
|
930e1b8 |
- PKG_CHECK_MODULES(KMOD, [ libkmod >= 14 ],
|
|
|
930e1b8 |
+ PKG_CHECK_MODULES(KMOD, [ libkmod >= 15 ],
|
|
|
930e1b8 |
[AC_DEFINE(HAVE_KMOD, 1, [Define if kmod is available])],
|
|
|
930e1b8 |
AC_MSG_ERROR([*** kmod version >= 14 not found]))
|
|
|
930e1b8 |
fi
|
|
|
930e1b8 |
diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in
|
|
|
930e1b8 |
index ff4017b..368f980 100644
|
|
|
930e1b8 |
--- a/units/kmod-static-nodes.service.in
|
|
|
930e1b8 |
+++ b/units/kmod-static-nodes.service.in
|
|
|
930e1b8 |
@@ -15,5 +15,4 @@ ConditionPathExists=/lib/modules/%v/modules.devname
|
|
|
930e1b8 |
[Service]
|
|
|
930e1b8 |
Type=oneshot
|
|
|
930e1b8 |
RemainAfterExit=yes
|
|
|
930e1b8 |
-ExecStartPre=@MKDIR_P@ /run/tmpfiles.d
|
|
|
930e1b8 |
ExecStart=@KMOD@ static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf
|