From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E9B84138CBB for ; Fri, 1 May 2015 14:21:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45E0FE0837; Fri, 1 May 2015 14:21:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5D6BE0837 for ; Fri, 1 May 2015 14:21:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 598B2340CAC for ; Fri, 1 May 2015 14:21:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D2359A7 for ; Fri, 1 May 2015 14:21:22 +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: <1430489649.7bd456ed7bf35da2d7a53650baa33637e178064e.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/binfmt.in init.d/consolefont.in init.d/devfs.in init.d/dmesg.in init.d/fsck.in init.d/hostname.in init.d/hwclock.in init.d/keymaps.in init.d/localmount.in init.d/loopback.in init.d/modules.in init.d/mount-ro.in init.d/mtab.in init.d/netmount.in init.d/numlock.in init.d/procfs.in init.d/root.in init.d/swap.in init.d/swapfiles.in init.d/swclock.in init.d/sysctl.Linux.in init.d/sysfs.in init.d/termencoding.in init.d/urandom.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 7bd456ed7bf35da2d7a53650baa33637e178064e X-VCS-Branch: master Date: Fri, 1 May 2015 14:21:22 +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: 86c43c75-8971-4edf-a852-5137dba54495 X-Archives-Hash: 9dbeae8bef81fbe065987cd26af349f1 commit: 7bd456ed7bf35da2d7a53650baa33637e178064e Author: Mike Gilbert gentoo org> AuthorDate: Wed Apr 29 01:03:49 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri May 1 14:14:09 2015 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=7bd456ed Disable service scripts for systemd-nspawn This adds the -systemd-nspawn keyword to service scripts which are not intended to run in systemd-nspawn containers. This fixes #52. X-Gentoo-Bug: 548058 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=548058 init.d/binfmt.in | 2 +- init.d/consolefont.in | 2 +- init.d/devfs.in | 2 +- init.d/dmesg.in | 2 +- init.d/fsck.in | 2 +- init.d/hostname.in | 2 +- init.d/hwclock.in | 2 +- init.d/keymaps.in | 2 +- init.d/localmount.in | 2 +- init.d/loopback.in | 2 +- init.d/modules.in | 2 +- init.d/mount-ro.in | 2 +- init.d/mtab.in | 2 +- init.d/netmount.in | 2 +- init.d/numlock.in | 2 +- init.d/procfs.in | 2 +- init.d/root.in | 2 +- init.d/swap.in | 2 +- init.d/swapfiles.in | 2 +- init.d/swclock.in | 2 +- init.d/sysctl.Linux.in | 2 +- init.d/sysfs.in | 2 +- init.d/termencoding.in | 2 +- init.d/urandom.in | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/init.d/binfmt.in b/init.d/binfmt.in index 651b131..7de9aa5 100644 --- a/init.d/binfmt.in +++ b/init.d/binfmt.in @@ -8,7 +8,7 @@ depend() { after procfs use modules devfs - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/consolefont.in b/init.d/consolefont.in index 7ec93d6..e56cc09 100644 --- a/init.d/consolefont.in +++ b/init.d/consolefont.in @@ -8,7 +8,7 @@ depend() { need localmount termencoding after hotplug bootmisc - keyword -openvz -prefix -uml -vserver -xenu -lxc + keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc } start() diff --git a/init.d/devfs.in b/init.d/devfs.in index 5af68f9..86bda24 100644 --- a/init.d/devfs.in +++ b/init.d/devfs.in @@ -8,7 +8,7 @@ depend() { provide dev-mount before dev - keyword -prefix -vserver -lxc + keyword -prefix -systemd-nspawn -vserver -lxc } mount_dev() diff --git a/init.d/dmesg.in b/init.d/dmesg.in index 5b001fc..6e1ae53 100644 --- a/init.d/dmesg.in +++ b/init.d/dmesg.in @@ -7,7 +7,7 @@ description="Set the dmesg level for a cleaner boot" depend() { before dev modules - keyword -lxc -prefix -vserver + keyword -lxc -prefix -systemd-nspawn -vserver } start() diff --git a/init.d/fsck.in b/init.d/fsck.in index d3b6607..79e74e5 100644 --- a/init.d/fsck.in +++ b/init.d/fsck.in @@ -9,7 +9,7 @@ _IFS=" depend() { use dev clock modules - keyword -jail -openvz -prefix -timeout -vserver -lxc -uml + keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml } _abort() { diff --git a/init.d/hostname.in b/init.d/hostname.in index eaeb79a..5b8b75d 100644 --- a/init.d/hostname.in +++ b/init.d/hostname.in @@ -5,7 +5,7 @@ description="Sets the hostname of the machine." depend() { - keyword -prefix -lxc + keyword -prefix -systemd-nspawn -lxc } start() diff --git a/init.d/hwclock.in b/init.d/hwclock.in index 4b0da02..1dde2d6 100644 --- a/init.d/hwclock.in +++ b/init.d/hwclock.in @@ -28,7 +28,7 @@ depend() else before * fi - keyword -openvz -prefix -uml -vserver -xenu -lxc + keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc } setupopts() diff --git a/init.d/keymaps.in b/init.d/keymaps.in index eeed22a..af42485 100644 --- a/init.d/keymaps.in +++ b/init.d/keymaps.in @@ -8,7 +8,7 @@ depend() { need localmount termencoding after bootmisc - keyword -openvz -prefix -uml -vserver -xenu -lxc + keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc } start() diff --git a/init.d/localmount.in b/init.d/localmount.in index 1335aa9..b2e8ef1 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -9,7 +9,7 @@ depend() need fsck use lvm modules mtab after lvm modules - keyword -jail -prefix -vserver -lxc + keyword -jail -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/loopback.in b/init.d/loopback.in index ec45a98..4602dd0 100644 --- a/init.d/loopback.in +++ b/init.d/loopback.in @@ -6,7 +6,7 @@ description="Configures the loopback interface." depend() { - keyword -jail -prefix -vserver + keyword -jail -prefix -systemd-nspawn -vserver } start() diff --git a/init.d/modules.in b/init.d/modules.in index acce97e..e10e7ae 100644 --- a/init.d/modules.in +++ b/init.d/modules.in @@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules." depend() { use isapnp - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in index a6438b5..d3f7acc 100644 --- a/init.d/mount-ro.in +++ b/init.d/mount-ro.in @@ -7,7 +7,7 @@ description="Re-mount filesytems read-only for a clean reboot." depend() { need killprocs savecache - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/mtab.in b/init.d/mtab.in index 3ac39ed..51575b4 100644 --- a/init.d/mtab.in +++ b/init.d/mtab.in @@ -7,7 +7,7 @@ description="Update /etc/mtab to match what the kernel knows about" depend() { need root - keyword -prefix + keyword -prefix -systemd-nspawn } start() diff --git a/init.d/netmount.in b/init.d/netmount.in index 7c1b122..66ba409 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -9,7 +9,7 @@ depend() config /etc/fstab use afc-client amd nfsclient autofs openvpn use dns - keyword -jail -prefix -vserver -lxc + keyword -jail -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/numlock.in b/init.d/numlock.in index 1b6d0a5..cdc0da0 100644 --- a/init.d/numlock.in +++ b/init.d/numlock.in @@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} depend() { need localmount - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } _setleds() diff --git a/init.d/procfs.in b/init.d/procfs.in index 167a1aa..a9fcb9a 100644 --- a/init.d/procfs.in +++ b/init.d/procfs.in @@ -8,7 +8,7 @@ depend() { use modules devfs need localmount - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/root.in b/init.d/root.in index 1668368..0395dd1 100644 --- a/init.d/root.in +++ b/init.d/root.in @@ -7,7 +7,7 @@ description="Mount the root fs read/write" depend() { need fsck - keyword -jail -openvz -prefix -vserver -lxc + keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/swap.in b/init.d/swap.in index a64ea60..41d4eac 100644 --- a/init.d/swap.in +++ b/init.d/swap.in @@ -5,7 +5,7 @@ depend() { before localmount - keyword -jail -openvz -prefix -vserver -lxc + keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in index 1c80500..5c80762 100644 --- a/init.d/swapfiles.in +++ b/init.d/swapfiles.in @@ -5,7 +5,7 @@ depend() { need localmount - keyword -jail -openvz -prefix -vserver -lxc + keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/swclock.in b/init.d/swclock.in index b74d49a..b3ea17b 100644 --- a/init.d/swclock.in +++ b/init.d/swclock.in @@ -8,7 +8,7 @@ depend() { before * provide clock - keyword -openvz -prefix -uml -vserver -xenu -lxc + keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc } # swclock is an OpenRC built in diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in index 1defcec..186c6ed 100644 --- a/init.d/sysctl.Linux.in +++ b/init.d/sysctl.Linux.in @@ -5,7 +5,7 @@ depend() { before bootmisc logger - keyword -prefix -vserver + keyword -prefix -systemd-nspawn -vserver } start() diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 6e52a9d..5641abe 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -8,7 +8,7 @@ sysfs_opts=nodev,noexec,nosuid depend() { - keyword -lxc -prefix -vserver + keyword -lxc -prefix -systemd-nspawn -vserver } mount_sys() diff --git a/init.d/termencoding.in b/init.d/termencoding.in index d3aa027..59ca625 100644 --- a/init.d/termencoding.in +++ b/init.d/termencoding.in @@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} depend() { - keyword -lxc -openvz -prefix -uml -vserver -xenu + keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu use root after bootmisc } diff --git a/init.d/urandom.in b/init.d/urandom.in index ded4113..0dd2ba6 100644 --- a/init.d/urandom.in +++ b/init.d/urandom.in @@ -8,7 +8,7 @@ description="Initializes the random number generator." depend() { need localmount - keyword -jail -lxc -openvz -prefix + keyword -jail -lxc -openvz -prefix -systemd-nspawn } save_seed()