From de6e4d3f50822c64ce14d61991fdda148be442e9 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Thu, 10 Jan 2008 23:48:53 +0000
Subject: More NetBSD tweaks.

---
 init.d.BSD/hostid          | 17 ++++++++++-------
 init.d.BSD/sysctl          |  2 +-
 init.d.NetBSD/Makefile     |  5 +++++
 init.d.NetBSD/ttys         | 15 +++++++++++++++
 runlevels.FreeBSD/Makefile |  2 +-
 runlevels.NetBSD/Makefile  |  4 ++++
 6 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 init.d.NetBSD/Makefile
 create mode 100644 init.d.NetBSD/ttys
 create mode 100644 runlevels.NetBSD/Makefile

diff --git a/init.d.BSD/hostid b/init.d.BSD/hostid
index 9df83550..5f8bfb04 100644
--- a/init.d.BSD/hostid
+++ b/init.d.BSD/hostid
@@ -34,18 +34,21 @@ depend() {
 _set() {
 	local id=0
 
-	[ -n "$1" ] && id=$1
-	ebegin "Setting Host UUID: ${id}"
-	sysctl kern.hostuuid="${id}" >/dev/null
-	eend $? || return 1
-
 	if [ -n "$1" ]; then
 		id=$(echo "$1" | md5)
 		id="0x${id%????????????????????????}"
 	fi
 	ebegin "Setting Host ID: ${id}"
-	sysctl kern.hostid="${id}" >/dev/null
-	eend $?
+	sysctl -w kern.hostid="${id}" >/dev/null
+	eend $? || return 1
+
+	if sysctl -n kern.hostuuid >/dev/null 2>&1; then
+		[ -n "$1" ] && id=$1
+		ebegin "Setting Host UUID: ${id}"
+		sysctl kern.hostuuid="${id}" >/dev/null
+		eend $? || return 1
+	fi
+
 }
 
 # First we check to see if there is a system UUID
diff --git a/init.d.BSD/sysctl b/init.d.BSD/sysctl
index d4c27ee5..fa13751d 100644
--- a/init.d.BSD/sysctl
+++ b/init.d.BSD/sysctl
@@ -37,7 +37,7 @@ start() {
 		case "${var}" in
 			""|"#"*) continue;;
 		esac
-		sysctl "${var}" >/dev/null || retval=1
+		sysctl -w "${var}" >/dev/null || retval=1
 	done < /etc/sysctl.conf
 	eend ${retval} "Some errors were encountered"
 	eend $?
diff --git a/init.d.NetBSD/Makefile b/init.d.NetBSD/Makefile
new file mode 100644
index 00000000..da0be63d
--- /dev/null
+++ b/init.d.NetBSD/Makefile
@@ -0,0 +1,5 @@
+DIR=	/etc/init.d
+BIN=	${CONTENTS} 
+
+MK=	../mk
+include ${MK}/scripts.mk
diff --git a/init.d.NetBSD/ttys b/init.d.NetBSD/ttys
new file mode 100644
index 00000000..31e8c090
--- /dev/null
+++ b/init.d.NetBSD/ttys
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+
+start()
+{
+	ebegin "Setting tty flags"
+	ttyflags -a
+	eend $? || return $?
+	
+	if [ -c /dev/ttyp0 ]; then
+		chmod 666 /dev/tty[p-uw-zP-T][0-9a-zA-Z]
+	fi
+	if [ -c /dev/ttyv1 ]; then
+		chmod 666 /dev/ttyv[0-9a-zA-Z]
+	fi
+}
diff --git a/runlevels.FreeBSD/Makefile b/runlevels.FreeBSD/Makefile
index 601cf026..b01dc2f2 100644
--- a/runlevels.FreeBSD/Makefile
+++ b/runlevels.FreeBSD/Makefile
@@ -1,4 +1,4 @@
-BOOT=	clock dumpon hostid syscons
+BOOT=	clock dumpon syscons
 
 MK=	../mk
 include ${MK}/runlevels.mk
diff --git a/runlevels.NetBSD/Makefile b/runlevels.NetBSD/Makefile
new file mode 100644
index 00000000..31d01d84
--- /dev/null
+++ b/runlevels.NetBSD/Makefile
@@ -0,0 +1,4 @@
+BOOT=	ttys
+
+MK=	../mk
+include ${MK}/runlevels.mk
-- 
cgit v1.2.3