From patchwork Wed May 1 23:11:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1093932 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VlJp4Ay6"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44vZ0W1rscz9s9N for ; Thu, 2 May 2019 09:11:55 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 140FD87F52; Wed, 1 May 2019 23:11:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 489JzjhidIuR; Wed, 1 May 2019 23:11:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 4F22487EE3; Wed, 1 May 2019 23:11:49 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0EEF91BF2CE for ; Wed, 1 May 2019 23:11:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0C32A86479 for ; Wed, 1 May 2019 23:11:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F0-iIBptrqeS for ; Wed, 1 May 2019 23:11:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 2BB5B84078 for ; Wed, 1 May 2019 23:11:47 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id j6so493706qtq.1 for ; Wed, 01 May 2019 16:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YZ2w1erDiyaVPxW1bqmcdRbB37AEppkmgog/14yc6t4=; b=VlJp4Ay6RCRic2xm+A/ZbqnLNalyvuuEni9eydUTsvv3wRP6uPN6GPVByIRtzbBw2t wZEcT6870Xiim2HW/nplyyxXBQT8HIUVSks0kMrL12emIwu/a/R29uYjZkHHzopmipJW AuKFZ5H6xdSBTahUxxe8veCpfr3U8cNHv6P0XvSbvg9VQ+yVEhMMa/wVzjZVOB4gnXPE 9Gc9fmNA29Zv/1FSCU3HzBJiHlXUGRx16MHIHqELt7eOyxHay5k9np0nPor3dK7HWipO OfDHmoMw/eZTwyz/SdcrYh2roizYNEEcNx60hJ3YC47AWo2MkB7pV3tgOoSXwN4Ty+wn BScA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YZ2w1erDiyaVPxW1bqmcdRbB37AEppkmgog/14yc6t4=; b=KOsBx+FU8G905WN25uR9qrG1uMcmJJ9LiIRVV4IB/CfNk4C64cxPQtsImvq63puCN2 Ags3lUWB3XzspMeBDjtcD4eStUHJgEOmAKMFSUTFBifmFCgft/OD9ZCQH3rMOh4bNfCk 9VIpmwjYY2aV2vfgc5518kFWK50rcK55067zWswzFFQmxqbFfsR8x9DR4Vd172m+4s8N 4Mf7ilc/RNnFijs8hQqqtkuzISpKntMiqaqXLH8Oqvw4XAt9H4sVDLTGszxI7oMKGAqb XkDN3qVZJApC2x2dVYEI7KCIxTgb+BSU6ZMQ8DEqsUsek6FFY2ivT5KlA/A3MG7mYRHL n0sw== X-Gm-Message-State: APjAAAX5NVpZzEsFR0WbvQzR7HD7czGEax5cGxXRM0FuiemmnG/W9bZz xro/KC8tBK7caIiUX0ZhO1cstOAejSiGRg== X-Google-Smtp-Source: APXvYqz3vqE/YppiAca/mV7nuZsWP9PhrDMyjlrmBckeeozl2WynYsigGyZcwmZ77/pdg7v5l3+GdQ== X-Received: by 2002:ac8:3166:: with SMTP id h35mr626294qtb.268.1556752306044; Wed, 01 May 2019 16:11:46 -0700 (PDT) Received: from p7-1130br.casantos.org ([177.156.131.99]) by smtp.gmail.com with ESMTPSA id f1sm10232380qkc.50.2019.05.01.16.11.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 May 2019 16:11:45 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Wed, 1 May 2019 20:11:39 -0300 Message-Id: <20190501231140.6365-1-unixmania@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 1/2] package/procps-ng: add init script for sysctl X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Add a simple init script that invokes sysctl early in the initialization process to configure kernel parameters. This is already performed by systemd (systemd-sysctl) but there is no sysvinit/busybox counterpart. Files are read from directories in the following list in the given order from top to bottom: /run/sysctl.d/*.conf /etc/sysctl.d/*.conf /usr/local/lib/sysctl.d/*.conf /usr/lib/sysctl.d/*.conf /lib/sysctl.d/*.conf /etc/sysctl.conf Signed-off-by: Carlos Santos --- Changes v2->v3: - Update SOB, since I don't work for DATACOM anymore. Changes v1->v2: - The "--system" option activates "--ignore", which is bad because invalid variable settings in the configuration files will not be reported on the system log. Use some scripting to mimic the --system behavior but still reporting errors. - Redirect sysctl's standard output to syslog with facility.level "kern.info" and standard error to syslog with facility.level "kern.err". - Do not pass "--quiet" to sysctl, since we wanto to see the results. - Use "Running" and "Rerunning" instead of "Starting", since we do not really start anything, just run a program. - Do nothing on "stop", since ther is no running daemon to stop. --- package/procps-ng/S02sysctl | 64 ++++++++++++++++++++++++++++++++++ package/procps-ng/procps-ng.mk | 5 +++ 2 files changed, 69 insertions(+) create mode 100644 package/procps-ng/S02sysctl --- package/procps-ng/S02sysctl | 64 ++++++++++++++++++++++++++++++++++ package/procps-ng/procps-ng.mk | 5 +++ 2 files changed, 69 insertions(+) create mode 100644 package/procps-ng/S02sysctl diff --git a/package/procps-ng/S02sysctl b/package/procps-ng/S02sysctl new file mode 100644 index 0000000000..3a58578de4 --- /dev/null +++ b/package/procps-ng/S02sysctl @@ -0,0 +1,64 @@ +#!/bin/sh + +PROGRAM="sysctl" + +SYSCTL_ARGS="" + +# shellcheck source=/dev/null +[ -r "/etc/default/$PROGRAM" ] && . "/etc/default/$PROGRAM" + +# Files are read from directories in the SYSCTL_SOURCES list, in the given +# order. A file may be used more than once, since there can be multiple +# symlinks to it. No attempt is made to prevent this. +SYSCTL_SOURCES="/etc/sysctl.d/ /usr/local/lib/sysctl.d/ /usr/lib/sysctl.d/ /lib/sysctl.d/ /etc/sysctl.conf" + +# The "--system" option activates "--ignore", which is bad because invalid +# variable settings in the configuration files will not be reported on the +# system log. Use some scripting to mimic the --system behavior but still +# reporting errors. Users not interested on error report can put "-e" in +# SYSCTL_ARGS. +# +# The file redirections do the following: +# +# - stdout is redirected to syslog with facility.level "kern.info" +# - stderr is redirected to syslog with facility.level "kern.err" +# - file dscriptor 4 is used to pass the result to the "start" function. +# +run_program() { + # shellcheck disable=SC2086 # we need the word splitting + find $SYSCTL_SOURCES -maxdepth 1 -name '*.conf' -print0 2> /dev/null | \ + xargs -0 -r -n 1 readlink -f | { + prog_status="OK" + while :; do + read -r file + if [ -z "$file" ]; then + echo "$prog_status" >&4 + break + fi + echo "* Applying $file ..." + /sbin/sysctl -p "$file" $SYSCTL_ARGS || prog_status="FAIL" + done 2>&1 >&3 | /usr/bin/logger -t sysctl -p kern.err + } 3>&1 | /usr/bin/logger -t sysctl -p kern.info +} + +start() { + printf '%s %s: ' "$1" "$PROGRAM" + status=$(run_program 4>&1) + echo "$status" + if [ "$status" = "OK" ]; then + return 0 + fi + return 1 +} + +case "$1" in + start) + start "Running";; + restart|reload) + start "Rerunning";; + stop) + :;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 03b74784d2..6a41e9b322 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -44,4 +44,9 @@ ifeq ($(BR2_STATIC_LIBS),y) PROCPS_NG_CONF_OPTS += --disable-numa endif +define PROCPS_NG_INSTALL_INIT_SYSV + $(INSTALL) -D -m 755 package/procps-ng/S02sysctl \ + $(TARGET_DIR)/etc/init.d/S02sysctl +endef + $(eval $(autotools-package))