File sysctl-handle-boot-sysctl.conf-kernel_release.p... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File sysctl-handle-boot-sysctl.conf-kernel_release.patch of Package systemd (Revision 74381b91623daf4d9343cc740d454a58)

Currently displaying revision 74381b91623daf4d9343cc740d454a58 , Show latest

From 752a4370ecb5643a432ad73b1e22c80cd304948f Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Fri, 17 May 2013 13:31:46 +0200
Subject: [PATCH] sysctl: handle /boot/sysctl.conf-<kernel_release>

Add support for kernel release sysctl.conf files (for per-flavor
configuration), needed by openSUSE (bnc#809420).
---
 src/sysctl/sysctl.c             |    8 ++++++++
 units/systemd-sysctl.service.in |    2 ++
 2 files changed, 10 insertions(+)

Index: systemd-218/src/sysctl/sysctl.c
===================================================================
--- systemd-218.orig/src/sysctl/sysctl.c
+++ systemd-218/src/sysctl/sysctl.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <limits.h>
 #include <getopt.h>
+#include <sys/utsname.h>
 
 #include "log.h"
 #include "strv.h"
@@ -310,6 +311,13 @@ int main(int argc, char *argv[]) {
         } else {
                 _cleanup_strv_free_ char **files = NULL;
                 char **f;
+                char kernel_sysctl[PATH_MAX];
+                struct utsname uts;
+
+                assert_se(uname(&uts) >= 0);
+
+                snprintf(kernel_sysctl, sizeof(kernel_sysctl), "/boot/sysctl.conf-%s", uts.release);
+                r = parse_file(sysctl_options, kernel_sysctl, true);
 
                 r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
                 if (r < 0) {
Index: systemd-218/units/systemd-sysctl.service.in
===================================================================
--- systemd-218.orig/units/systemd-sysctl.service.in
+++ systemd-218/units/systemd-sysctl.service.in
@@ -13,6 +13,8 @@ Conflicts=shutdown.target
 After=systemd-modules-load.service
 Before=sysinit.target shutdown.target
 ConditionPathIsReadWrite=/proc/sys/
+ConditionPathExistsGlob=|/boot/sysctl.conf-%v
+RequiresMountsFor=/boot
 
 [Service]
 Type=oneshot

Places

File sysctl-handle-boot-sysctl.conf-kernel_release.patch of Package systemd (Revision 74381b91623daf4d9343cc740d454a58)

Places