From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 75778139694 for ; Thu, 16 Mar 2017 15:26:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC2FC21C07D; Thu, 16 Mar 2017 15:26:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9860621C07D for ; Thu, 16 Mar 2017 15:26:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1BB403412CB for ; Thu, 16 Mar 2017 15:26:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E19E6A52 for ; Thu, 16 Mar 2017 15:26:06 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1489677399.9bd63b5d4a16601712a65eb8962214cdd4d26ce5.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/adjkerntz.in init.d/binfmt.in init.d/devdb.in init.d/dumpon.in init.d/fsck.in init.d/hostid.in init.d/hostname.in init.d/hwclock.in init.d/keymaps.in init.d/localmount.in init.d/loopback.in init.d/mtab.in init.d/network.in init.d/newsyslog.in init.d/procfs.in init.d/root.in init.d/savecore.in init.d/staticroute.in init.d/swap-blk.in init.d/swap.in init.d/swclock.in init.d/syscons.in init.d/sysctl.in init.d/syslogd.in init.d/termencoding.in init.d/ttys.in init.d/urandom.in init.d/wscons.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 9bd63b5d4a16601712a65eb8962214cdd4d26ce5 X-VCS-Branch: master Date: Thu, 16 Mar 2017 15:26:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b9e8504f-b447-4d73-b54d-d26212a96b0a X-Archives-Hash: 41115f61545798f863a809a160420cab commit: 9bd63b5d4a16601712a65eb8962214cdd4d26ce5 Author: William Hubbs gmail com> AuthorDate: Thu Mar 16 15:16:39 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Mar 16 15:16:39 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=9bd63b5d update dependencies for clock service The clock services had a very long list of "before" dependencies that referred to other services within OpenRC. For ease of maintenance, convert these to "after clock" dependencies in the individual services. init.d/adjkerntz.in | 1 + init.d/binfmt.in | 2 +- init.d/devdb.in | 1 + init.d/dumpon.in | 1 + init.d/fsck.in | 1 + init.d/hostid.in | 1 + init.d/hostname.in | 1 + init.d/hwclock.in | 3 --- init.d/keymaps.in | 2 +- init.d/localmount.in | 2 +- init.d/loopback.in | 1 + init.d/mtab.in | 1 + init.d/network.in | 2 +- init.d/newsyslog.in | 1 + init.d/procfs.in | 1 + init.d/root.in | 1 + init.d/savecore.in | 1 + init.d/staticroute.in | 4 ++-- init.d/swap-blk.in | 1 + init.d/swap.in | 1 + init.d/swclock.in | 4 ---- init.d/syscons.in | 1 + init.d/sysctl.in | 1 + init.d/syslogd.in | 2 +- init.d/termencoding.in | 2 +- init.d/ttys.in | 2 +- init.d/urandom.in | 1 + init.d/wscons.in | 1 + 28 files changed, 27 insertions(+), 16 deletions(-) diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in index 7f8b0076..ba373c14 100644 --- a/init.d/adjkerntz.in +++ b/init.d/adjkerntz.in @@ -23,6 +23,7 @@ fi depend() { + after swclock provide clock # BSD adjkerntz needs to be able to write to /etc if [ "$clock" = "UTC" -a -e /etc/wall_cmos_clock ] || diff --git a/init.d/binfmt.in b/init.d/binfmt.in index 4afb83be..67120eaf 100644 --- a/init.d/binfmt.in +++ b/init.d/binfmt.in @@ -13,7 +13,7 @@ description="Register misc binary format handlers" depend() { - after procfs + after clock procfs use modules devfs keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver } diff --git a/init.d/devdb.in b/init.d/devdb.in index 3fdf5306..a6d38066 100644 --- a/init.d/devdb.in +++ b/init.d/devdb.in @@ -13,6 +13,7 @@ description="Creates the dev database" depend() { + after clock need localmount } diff --git a/init.d/dumpon.in b/init.d/dumpon.in index 349276e3..8a72e69d 100644 --- a/init.d/dumpon.in +++ b/init.d/dumpon.in @@ -12,6 +12,7 @@ description="Configures a specific kernel dump device." depend() { + after clock need swap keyword -jail -prefix } diff --git a/init.d/fsck.in b/init.d/fsck.in index 7d12482f..7052d808 100644 --- a/init.d/fsck.in +++ b/init.d/fsck.in @@ -15,6 +15,7 @@ _IFS=" depend() { + after clock use dev clock modules keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml } diff --git a/init.d/hostid.in b/init.d/hostid.in index ec6f6979..107b7f5c 100644 --- a/init.d/hostid.in +++ b/init.d/hostid.in @@ -15,6 +15,7 @@ extra_commands="reset" depend() { use root + after clock before devd net keyword -jail -prefix } diff --git a/init.d/hostname.in b/init.d/hostname.in index 253d338d..af01241b 100644 --- a/init.d/hostname.in +++ b/init.d/hostname.in @@ -12,6 +12,7 @@ description="Sets the hostname of the machine." depend() { + after clock keyword -docker -lxc -prefix -systemd-nspawn } diff --git a/init.d/hwclock.in b/init.d/hwclock.in index 3bfcab1d..0fce88f1 100644 --- a/init.d/hwclock.in +++ b/init.d/hwclock.in @@ -33,9 +33,6 @@ depend() want modules if yesno $clock_adjfile; then use root - else - before binfmt bootmisc fsck hostname keymaps localmount loopback mtab - before procfs root swap sysctl termencoding urandom fi keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu } diff --git a/init.d/keymaps.in b/init.d/keymaps.in index dbe054ae..2cc8a39f 100644 --- a/init.d/keymaps.in +++ b/init.d/keymaps.in @@ -14,7 +14,7 @@ description="Applies a keymap for the consoles." depend() { need localmount termencoding - after bootmisc + after bootmisc clock keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu } diff --git a/init.d/localmount.in b/init.d/localmount.in index 9920dc9e..6785a0be 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -15,7 +15,7 @@ depend() { need fsck use lvm modules mtab root - after lvm modules root + after clock lvm modules root keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver } diff --git a/init.d/loopback.in b/init.d/loopback.in index 706ea797..70faf2b8 100644 --- a/init.d/loopback.in +++ b/init.d/loopback.in @@ -13,6 +13,7 @@ description="Configures the loopback interface." depend() { + after clock keyword -jail -prefix -systemd-nspawn -vserver } diff --git a/init.d/mtab.in b/init.d/mtab.in index 99eb90d0..80ef275c 100644 --- a/init.d/mtab.in +++ b/init.d/mtab.in @@ -13,6 +13,7 @@ description="Update /etc/mtab to match what the kernel knows about" depend() { + after clock need root keyword -prefix -systemd-nspawn } diff --git a/init.d/network.in b/init.d/network.in index de31695f..56d3e7b3 100644 --- a/init.d/network.in +++ b/init.d/network.in @@ -18,7 +18,7 @@ __nl=" depend() { need localmount - after bootmisc + after bootmisc clock if [ -n "$(interfaces)" ]; then provide net fi diff --git a/init.d/newsyslog.in b/init.d/newsyslog.in index da1b0ab5..bcfff862 100644 --- a/init.d/newsyslog.in +++ b/init.d/newsyslog.in @@ -13,6 +13,7 @@ required_files="/etc/newsyslog.conf" depend() { + after clock need localmount keyword -prefix } diff --git a/init.d/procfs.in b/init.d/procfs.in index 2abeb03a..343b30d1 100644 --- a/init.d/procfs.in +++ b/init.d/procfs.in @@ -13,6 +13,7 @@ description="Mounts misc filesystems in /proc." depend() { + after clock use devfs want modules need localmount diff --git a/init.d/root.in b/init.d/root.in index ec22699d..9d053448 100644 --- a/init.d/root.in +++ b/init.d/root.in @@ -13,6 +13,7 @@ description="Mount the root fs read/write" depend() { + after clock need fsck keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver } diff --git a/init.d/savecore.in b/init.d/savecore.in index 8640fe54..b568d5ab 100644 --- a/init.d/savecore.in +++ b/init.d/savecore.in @@ -14,6 +14,7 @@ description="Saves a kernel dump." depend() { need dumpon localmount + after clock before encswap keyword -jail -prefix } diff --git a/init.d/staticroute.in b/init.d/staticroute.in index 85f90597..d970b519 100644 --- a/init.d/staticroute.in +++ b/init.d/staticroute.in @@ -1,4 +1,4 @@ -#!@SBINDIR@/openrc-run +S#!@BINDIR@/openrc-run # Copyright (c) 2009-2015 The OpenRC Authors. # See the Authors file at the top-level directory of this distribution and # https://github.com/OpenRC/openrc/blob/master/AUTHORS @@ -14,9 +14,9 @@ description="Configures static routes." __nl=" " - depend() { + after clock provide net use network keyword -jail -prefix -vserver diff --git a/init.d/swap-blk.in b/init.d/swap-blk.in index 277cc88d..415cfaf6 100644 --- a/init.d/swap-blk.in +++ b/init.d/swap-blk.in @@ -11,6 +11,7 @@ depend() { + after clock before fsck keyword -jail -prefix } diff --git a/init.d/swap.in b/init.d/swap.in index 63087e86..546cb5f5 100644 --- a/init.d/swap.in +++ b/init.d/swap.in @@ -11,6 +11,7 @@ depend() { + after clock before localmount keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver } diff --git a/init.d/swclock.in b/init.d/swclock.in index 67baaab0..b5556eb5 100644 --- a/init.d/swclock.in +++ b/init.d/swclock.in @@ -13,10 +13,6 @@ description="Sets the local clock to the mtime of a given file." depend() { - before adjkerntz binfmt bootmisc devdb dumpon fsck hostid hostname keymaps - before localmount loopback modules mtab network newsyslog procfs root - before savecore staticroute swap swap-blk syscons sysctl syslogd - before termencoding ttys urandom wscons provide clock keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu } diff --git a/init.d/syscons.in b/init.d/syscons.in index c915762b..9fde54e9 100644 --- a/init.d/syscons.in +++ b/init.d/syscons.in @@ -10,6 +10,7 @@ # except according to the terms contained in the LICENSE file. depend() { + after clock need localmount keyword -jail -prefix } diff --git a/init.d/sysctl.in b/init.d/sysctl.in index cb756f3a..ae9f17fe 100644 --- a/init.d/sysctl.in +++ b/init.d/sysctl.in @@ -11,6 +11,7 @@ depend() { + after clock before bootmisc logger keyword -prefix -systemd-nspawn -vserver } diff --git a/init.d/syslogd.in b/init.d/syslogd.in index 7ddde9a6..504b953b 100644 --- a/init.d/syslogd.in +++ b/init.d/syslogd.in @@ -22,6 +22,6 @@ depend() provide logger use net newsyslog need localmount - after bootmisc + after bootmisc clock keyword -prefix } diff --git a/init.d/termencoding.in b/init.d/termencoding.in index 9f33eb6c..86f5b588 100644 --- a/init.d/termencoding.in +++ b/init.d/termencoding.in @@ -18,7 +18,7 @@ depend() { keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu use root - after bootmisc + after bootmisc clock } start() diff --git a/init.d/ttys.in b/init.d/ttys.in index db9a8f01..e32f3e69 100644 --- a/init.d/ttys.in +++ b/init.d/ttys.in @@ -11,7 +11,7 @@ depend() { - after fsck + after clock fsck keyword -prefix } diff --git a/init.d/urandom.in b/init.d/urandom.in index 54706ac9..91b54f3a 100644 --- a/init.d/urandom.in +++ b/init.d/urandom.in @@ -14,6 +14,7 @@ description="Initializes the random number generator." depend() { + after clock need localmount keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn } diff --git a/init.d/wscons.in b/init.d/wscons.in index cf5aee99..1f4acf01 100644 --- a/init.d/wscons.in +++ b/init.d/wscons.in @@ -11,6 +11,7 @@ depend() { + after clock need localmount keyword -prefix }