From 2bd7f97b7269da6deee02d3d5ddc9114ef938dc2 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Fri, 11 Jan 2008 09:32:06 +0000
Subject: Just have the one runlevels folder with OS includes.

---
 runlevels.BSD/Makefile     | 5 -----
 runlevels.FreeBSD/Makefile | 4 ----
 runlevels.Linux/Makefile   | 5 -----
 runlevels.NetBSD/Makefile  | 4 ----
 runlevels/Makefile         | 4 ++++
 runlevels/Makefile.BSD     | 2 ++
 runlevels/Makefile.FreeBSD | 1 +
 runlevels/Makefile.Linux   | 2 ++
 runlevels/Makefile.NetBSD  | 1 +
 9 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 runlevels.BSD/Makefile
 delete mode 100644 runlevels.FreeBSD/Makefile
 delete mode 100644 runlevels.Linux/Makefile
 delete mode 100644 runlevels.NetBSD/Makefile
 create mode 100644 runlevels/Makefile.BSD
 create mode 100644 runlevels/Makefile.FreeBSD
 create mode 100644 runlevels/Makefile.Linux
 create mode 100644 runlevels/Makefile.NetBSD

diff --git a/runlevels.BSD/Makefile b/runlevels.BSD/Makefile
deleted file mode 100644
index 7e8bbef1..00000000
--- a/runlevels.BSD/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOT=		hostid net.lo0 newsyslog savecore syslogd
-DEFAULT=	local.rc mixer powerd 
-
-MK=		../mk
-include ${MK}/runlevels.mk
diff --git a/runlevels.FreeBSD/Makefile b/runlevels.FreeBSD/Makefile
deleted file mode 100644
index b01dc2f2..00000000
--- a/runlevels.FreeBSD/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOT=	clock dumpon syscons
-
-MK=	../mk
-include ${MK}/runlevels.mk
diff --git a/runlevels.Linux/Makefile b/runlevels.Linux/Makefile
deleted file mode 100644
index 0e8557b8..00000000
--- a/runlevels.Linux/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-BOOT=		clock consolefont keymaps modules net.lo procfs
-DEFAULT=	hdparm
-
-MK=			../mk
-include ${MK}/runlevels.mk
diff --git a/runlevels.NetBSD/Makefile b/runlevels.NetBSD/Makefile
deleted file mode 100644
index 31d01d84..00000000
--- a/runlevels.NetBSD/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-BOOT=	ttys
-
-MK=	../mk
-include ${MK}/runlevels.mk
diff --git a/runlevels/Makefile b/runlevels/Makefile
index 7737678e..11b606b0 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -7,4 +7,8 @@ BOOTDIR=	${LEVELDIR}/boot
 DEFAULTDIR=	${LEVELDIR}/default
 
 MK=		../mk
+include ${MK}/os.mk
+include Makefile.${OS}
+include Makefile.${SUBOS}
+
 include ${MK}/runlevels.mk
diff --git a/runlevels/Makefile.BSD b/runlevels/Makefile.BSD
new file mode 100644
index 00000000..255d117a
--- /dev/null
+++ b/runlevels/Makefile.BSD
@@ -0,0 +1,2 @@
+BOOT+=		hostid net.lo0 newsyslog savecore syslogd
+DEFAULT+=	local.rc mixer powerd 
diff --git a/runlevels/Makefile.FreeBSD b/runlevels/Makefile.FreeBSD
new file mode 100644
index 00000000..85d15fe1
--- /dev/null
+++ b/runlevels/Makefile.FreeBSD
@@ -0,0 +1 @@
+BOOT+=	clock dumpon syscons
diff --git a/runlevels/Makefile.Linux b/runlevels/Makefile.Linux
new file mode 100644
index 00000000..205f0971
--- /dev/null
+++ b/runlevels/Makefile.Linux
@@ -0,0 +1,2 @@
+BOOT+=		clock consolefont keymaps modules net.lo procfs
+DEFAULT+=	hdparm
diff --git a/runlevels/Makefile.NetBSD b/runlevels/Makefile.NetBSD
new file mode 100644
index 00000000..02a99036
--- /dev/null
+++ b/runlevels/Makefile.NetBSD
@@ -0,0 +1 @@
+BOOT+=	ttys
-- 
cgit v1.2.3