public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/openrc:master commit in: runlevels/
@ 2012-07-09  2:10 William Hubbs
  0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2012-07-09  2:10 UTC (permalink / raw
  To: gentoo-commits

commit:     add965706a3a239a7eb6750d6fc14090eb70dd12
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Jul  9 02:10:10 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 02:10:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=add96570

add the appropriate network scripts to the boot runlevel

---
 runlevels/Makefile |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/runlevels/Makefile b/runlevels/Makefile
index ac3796e..da2d4ea 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -1,5 +1,5 @@
-BOOT=		bootmisc fsck hostname localmount network \
-		root staticroute swap swapfiles sysctl urandom ${BOOT-${OS}}
+BOOT=		bootmisc fsck hostname localmount \
+		root swap swapfiles sysctl urandom ${BOOT-${OS}}
 DEFAULT=	local netmount
 SHUTDOWN=	savecache ${SHUTDOWN-${OS}}
 SYSINIT=	${SYSINIT-${OS}}
@@ -37,6 +37,14 @@ BOOT-NetBSD=	hostid newsyslog savecore syslogd
 # NetBSD specific stuff
 BOOT-NetBSD+=	devdb swap-blk ttys wscons
 
+ifeq(${MKOLDNET},yes)
+boot-FreeBSD += net.lo0
+boot-Linux += net.lo
+boot-NetBSD += net.lo0
+else
+boot += network staticroute
+endif
+
 all:
 
 install:



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/openrc:master commit in: runlevels/
@ 2012-07-09 14:28 William Hubbs
  0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2012-07-09 14:28 UTC (permalink / raw
  To: gentoo-commits

commit:     a1bf1025918d6af1ad093c27ead9f170be7064d9
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Jul  9 14:12:31 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 14:12:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a1bf1025

fix typo

---
 runlevels/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/runlevels/Makefile b/runlevels/Makefile
index da2d4ea..509bb5f 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -37,7 +37,7 @@ BOOT-NetBSD=	hostid newsyslog savecore syslogd
 # NetBSD specific stuff
 BOOT-NetBSD+=	devdb swap-blk ttys wscons
 
-ifeq(${MKOLDNET},yes)
+ifeq (${MKOLDNET},yes)
 boot-FreeBSD += net.lo0
 boot-Linux += net.lo
 boot-NetBSD += net.lo0



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/openrc:master commit in: runlevels/
@ 2012-07-10  2:11 William Hubbs
  0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2012-07-10  2:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ecb4d7c3f2b5ff7588a288d24c0dd462012a0389
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul 10 02:08:58 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 02:08:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ecb4d7c3

Revert "add the appropriate network scripts to the boot runlevel"

This reverts commit add965706a3a239a7eb6750d6fc14090eb70dd12.
This commit was broken so I need to revert it.

---
 runlevels/Makefile |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/runlevels/Makefile b/runlevels/Makefile
index 509bb5f..ac3796e 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -1,5 +1,5 @@
-BOOT=		bootmisc fsck hostname localmount \
-		root swap swapfiles sysctl urandom ${BOOT-${OS}}
+BOOT=		bootmisc fsck hostname localmount network \
+		root staticroute swap swapfiles sysctl urandom ${BOOT-${OS}}
 DEFAULT=	local netmount
 SHUTDOWN=	savecache ${SHUTDOWN-${OS}}
 SYSINIT=	${SYSINIT-${OS}}
@@ -37,14 +37,6 @@ BOOT-NetBSD=	hostid newsyslog savecore syslogd
 # NetBSD specific stuff
 BOOT-NetBSD+=	devdb swap-blk ttys wscons
 
-ifeq (${MKOLDNET},yes)
-boot-FreeBSD += net.lo0
-boot-Linux += net.lo
-boot-NetBSD += net.lo0
-else
-boot += network staticroute
-endif
-
 all:
 
 install:



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/openrc:master commit in: runlevels/
@ 2012-09-26 21:33 Robin H. Johnson
  0 siblings, 0 replies; 8+ messages in thread
From: Robin H. Johnson @ 2012-09-26 21:33 UTC (permalink / raw
  To: gentoo-commits

commit:     ac47b6abfa1c68173b68c74556ecd11da5a3cdf5
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 21:29:47 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 21:29:47 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ac47b6ab

runlevels: Include sysfs in the sysinit level.

net.* and module loading require sysfs now, and if udev is not in use,
it is not always loaded early enough, esp for net.lo. Force it to come
up during sysinit instead.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 runlevels/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/runlevels/Makefile b/runlevels/Makefile
index c42b307..0f134c8 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -40,7 +40,7 @@ BOOT-FreeBSD+=	adjkerntz dumpon syscons
 
 BOOT-Linux+=	hwclock keymaps modules mtab procfs termencoding
 SHUTDOWN-Linux=	killprocs mount-ro
-SYSINIT-Linux=	devfs dmesg
+SYSINIT-Linux=	devfs dmesg sysfs
 
 # Generic BSD stuff
 BOOT-NetBSD+=	hostid newsyslog savecore syslogd


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/openrc:master commit in: runlevels/
@ 2012-10-07 22:51 William Hubbs
  0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2012-10-07 22:51 UTC (permalink / raw
  To: gentoo-commits

commit:     da842085ce3d9a8c32fdaecabefd6fd2ab123cc0
Author:     Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
AuthorDate: Sat Sep 29 14:49:48 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Oct  5 19:27:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=da842085

Fix default runlevel symlink paths

runlevels/Makefile currently uses ${PREFIX} when creating the initial
runlevel symlinks, but the init files are installed to ${INITDIR},
which results in broken symlinks if ${SYSCONFDIR} is set to something
other than ${PREFIX}/etc

Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>

---
 runlevels/Makefile |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/runlevels/Makefile b/runlevels/Makefile
index e78e2d1..a4fd006 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -14,7 +14,7 @@ ifeq (${MKNET},)
 BOOT+= network staticroute
 endif
 
-INITDIR=	../init.d
+INITFILES=	../init.d
 
 MK=		../mk
 include ${MK}/sys.mk
@@ -54,34 +54,34 @@ install:
 		${INSTALL} -d ${SYSINITDIR} || exit $$?; \
 		for x in ${SYSINIT}; do \
 			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \
+				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
 			fi; \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \
+			ln -snf ${INITDIR}/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \
 	fi
 	if ! test -d "${BOOTDIR}"; then \
 		${INSTALL} -d ${BOOTDIR} || exit $$?; \
 		for x in ${BOOT}; do \
 			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \
+				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
 			fi; \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
+			ln -snf ${INITDIR}/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
 		done \
 	fi
 	if ! test -d "${DEFAULTDIR}"; then \
 		${INSTALL} -d ${DEFAULTDIR} || exit $$?; \
 		for x in ${DEFAULT}; do \
 			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \
+				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
 			fi; \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
+			ln -snf ${INITDIR}/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
 	fi
 	if ! test -d "${SHUTDOWNDIR}"; then \
 		${INSTALL} -d ${SHUTDOWNDIR} || exit $$?; \
 		for x in ${SHUTDOWN}; do \
 			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*-prefix" ${INITDIR}/"$$x" && continue; \
+				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
 			fi; \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \
+			ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \
 	fi
 
 check test::


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/openrc:master commit in: runlevels/
@ 2013-02-17  2:49 William Hubbs
  0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2013-02-17  2:49 UTC (permalink / raw
  To: gentoo-commits

commit:     414ef6466187c1452b97b69f946cdd150eaa465d
Author:     Andrew Gregory <andrew.gregory.8 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 12 03:13:29 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 02:46:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=414ef646

disable default -prefix services if MKPREFIX = yes

Certain services were not being enabled by default if PREFIX was set.
This appears to have been intended for Gentoo Prefix systems which are
indicated by MKPREFIX not PREFIX.

Signed-off-by: Andrew Gregory <andrew.gregory.8 <AT> gmail.com>

---
 runlevels/Makefile |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/runlevels/Makefile b/runlevels/Makefile
index e459d15..7bcf29f 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -53,7 +53,7 @@ install:
 	if ! test -d "${SYSINITDIR}"; then \
 		${INSTALL} -d ${SYSINITDIR} || exit $$?; \
 		for x in ${SYSINIT}; do \
-			if test -n "${PREFIX}"; then \
+			if test "${MKPREFIX}" = yes; then \
 				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
 			fi; \
 			ln -snf ${INITDIR}/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \
@@ -61,7 +61,7 @@ install:
 	if ! test -d "${BOOTDIR}"; then \
 		${INSTALL} -d ${BOOTDIR} || exit $$?; \
 		for x in ${BOOT}; do \
-			if test -n "${PREFIX}"; then \
+			if test "${MKPREFIX}" = yes; then \
 				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
 			fi; \
 			ln -snf ${INITDIR}/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
@@ -70,7 +70,7 @@ install:
 	if ! test -d "${DEFAULTDIR}"; then \
 		${INSTALL} -d ${DEFAULTDIR} || exit $$?; \
 		for x in ${DEFAULT}; do \
-			if test -n "${PREFIX}"; then \
+			if test "${MKPREFIX}" = yes; then \
 				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
 			fi; \
 			ln -snf ${INITDIR}/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
@@ -78,7 +78,7 @@ install:
 	if ! test -d "${SHUTDOWNDIR}"; then \
 		${INSTALL} -d ${SHUTDOWNDIR} || exit $$?; \
 		for x in ${SHUTDOWN}; do \
-			if test -n "${PREFIX}"; then \
+			if test "${MKPREFIX}" = yes; then \
 				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
 			fi; \
 			ln -snf ${INITDIR}/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/openrc:master commit in: runlevels/
@ 2016-05-12 21:49 Anthony G. Basile
  0 siblings, 0 replies; 8+ messages in thread
From: Anthony G. Basile @ 2016-05-12 21:49 UTC (permalink / raw
  To: gentoo-commits

commit:     b3a04e797e5e459842c2c239886ab6ea08a8dc29
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu May 12 21:48:15 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu May 12 21:49:56 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b3a04e79

runlevels/Makefile: add support for runlevel ‘nonetwork’

Traditional System V reserves runlevel 2 for multiuser with no
networking.  We add support for this which is already defined in
the inittab as

    l2:2:wait:/sbin/rc nonetwork

X-Gentoo-Bug: 533828
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=533828

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 runlevels/Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/runlevels/Makefile b/runlevels/Makefile
index 682d6e1..df6b53a 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -3,6 +3,7 @@ include ../mk/net.mk
 BOOT=		bootmisc fsck hostname localmount loopback \
 		root swap swapfiles sysctl urandom ${BOOT-${OS}}
 DEFAULT=	local netmount
+NONETWORK=	local
 SHUTDOWN=	savecache ${SHUTDOWN-${OS}}
 SYSINIT=	${SYSINIT-${OS}}
 
@@ -10,6 +11,7 @@ LEVELDIR=	${DESTDIR}/${SYSCONFDIR}/runlevels
 SYSINITDIR=	${LEVELDIR}/sysinit
 BOOTDIR=	${LEVELDIR}/boot
 DEFAULTDIR=	${LEVELDIR}/default
+NONETWORKDIR=	${LEVELDIR}/nonetwork
 SHUTDOWNDIR=	${LEVELDIR}/shutdown
 
 ifeq (${MKNET},yes)
@@ -72,6 +74,14 @@ install:
 			fi; \
 			ln -snf ${INITDIR}/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
 	fi
+	if ! test -d "${NONETWORKDIR}"; then \
+		${INSTALL} -d ${NONETWORKDIR} || exit $$?; \
+		for x in ${NONETWORK}; do \
+			if test "${MKPREFIX}" = yes; then \
+				grep -q "keyword .*-prefix" ${INITFILES}/"$$x" && continue; \
+			fi; \
+			ln -snf ${INITDIR}/"$$x" ${NONETWORKDIR}/"$$x" || exit $$?; done \
+	fi
 	if ! test -d "${SHUTDOWNDIR}"; then \
 		${INSTALL} -d ${SHUTDOWNDIR} || exit $$?; \
 		for x in ${SHUTDOWN}; do \


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] proj/openrc:master commit in: runlevels/
@ 2016-12-15 23:56 William Hubbs
  0 siblings, 0 replies; 8+ messages in thread
From: William Hubbs @ 2016-12-15 23:56 UTC (permalink / raw
  To: gentoo-commits

commit:     204971c6e2ea1e37fa037e09bff02eea3a07f843
Author:     Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Mon Dec 12 20:13:26 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 20:13:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=204971c6

runlevels: remove bad trailing backslash

 runlevels/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runlevels/Makefile b/runlevels/Makefile
index 103577a..8007bdd 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -36,7 +36,7 @@ BOOT-FreeBSD+=	hostid modules newsyslog savecore syslogd
 # FreeBSD specific stuff
 BOOT-FreeBSD+=	adjkerntz dumpon syscons
 
-BOOT-Linux+=	binfmt hwclock keymaps modules mtab procfs termencoding \
+BOOT-Linux+=	binfmt hwclock keymaps modules mtab procfs termencoding
 SHUTDOWN-Linux=	killprocs mount-ro
 SYSINIT-Linux=	devfs dmesg sysfs
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-12-15 23:56 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-12 21:49 [gentoo-commits] proj/openrc:master commit in: runlevels/ Anthony G. Basile
  -- strict thread matches above, loose matches on Subject: below --
2016-12-15 23:56 William Hubbs
2013-02-17  2:49 William Hubbs
2012-10-07 22:51 William Hubbs
2012-09-26 21:33 Robin H. Johnson
2012-07-10  2:11 William Hubbs
2012-07-09 14:28 William Hubbs
2012-07-09  2:10 William Hubbs

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox