* init.d/syslog: accept options. be more vserver friendly

	
* init.d/keymap: new script

* init.d/bootmisc.sh: use /var/log/dmesg as other linux'es.

* use busybox version of ctty hack and readahead

* replace send-pr with sendbug

8 files changed, 30 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 070796d..7eb5f0d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.5.1
+VERSION=1.6.0
 
 PV 		=alpine-baselayout-$(VERSION)
 TARBALL 	=$(PV).tar.gz
@@ -14,11 +14,12 @@ SBIN_FILES	=runscript-alpine.sh functions.sh rc_add rc_delete rc_status\
 RC_SH_FILES 	=rc-services.sh
 UDHCPC_FILES 	=default.script 
 LIB_MDEV_FILES 	=ide_links sd_links subdir_dev usbdev
-USR_BIN_FILES	=send-pr
-GNATS_FILES	=send-pr.template send-pr.conf
+#USR_BIN_FILES	=send-pr
+#GNATS_FILES	=send-pr.template send-pr.conf
+SENDBUG_FILES	=sendbug.conf
 CRONTABS 	=crontab
 DISTFILES 	=$(ETC_FILES) $(SBIN_FILES) $(UDHCPC_FILES) $(RC_SH_FILES)\
-		$(LIB_MDEV_FILES) $(GNATS_FILES) $(USR_BIN_FILES) Makefile
+		$(LIB_MDEV_FILES) $(SENDBUG_FILES) Makefile
 
 all:	$(GENERATED_FILES)
 	for i in $(SUBDIRS) ; do \
@@ -60,7 +61,7 @@ install:
 		$(DESTDIR)/etc/crontabs \
 		$(DESTDIR)/lib/rcscripts/sh \
 		$(DESTDIR)/usr/share/udhcpc \
-		$(DESTDIR)/etc/gnats \
+		$(DESTDIR)/etc/sendbug \
 		$(DESTDIR)/usr/bin \
 		$(DESTDIR)/lib/mdev \
 		$(DESTDIR)/var/spool/cron \
@@ -73,14 +74,14 @@ install:
 		cd $$i && make install && cd .. ;\
 	done
 	install -m 0644 $(ETC_FILES) $(DESTDIR)/etc
-	install -m 0644 $(GNATS_FILES) $(DESTDIR)/etc/gnats
+	install -m 0644 $(SENDBUG_FILES) $(DESTDIR)/etc/sendbug
 	chmod 600 $(DESTDIR)/etc/shadow
 	install -m 0644 $(CONFD_FILES) $(DESTDIR)/etc/conf.d
 	install -m 0755 $(SBIN_FILES) $(DESTDIR)/sbin
 	install -m 0755 $(UDHCPC_FILES) $(DESTDIR)/usr/share/udhcpc
 	install -m 0755 $(RC_SH_FILES) $(DESTDIR)/lib/rcscripts/sh
 	install -m 0755 $(LIB_MDEV_FILES) $(DESTDIR)/lib/mdev
-	install -m 0755 $(USR_BIN_FILES) $(DESTDIR)/usr/bin
+#	install -m 0755 $(USR_BIN_FILES) $(DESTDIR)/usr/bin
 	mv $(DESTDIR)/etc/crontab $(DESTDIR)/etc/crontabs/root
 	ln -s /etc/crontabs $(DESTDIR)/var/spool/cron/crontabs
 
diff --git a/conf.d/syslog b/conf.d/syslog
new file mode 100644
index 0000000..14c39c7
--- /dev/null
+++ b/conf.d/syslog
@@ -0,0 +1,2 @@
+SYSLOGD_OPTS=""
+KLOGD_OPTS=""
diff --git a/init.d/Makefile b/init.d/Makefile
index 83050fa..99b80d8 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -8,6 +8,7 @@ SCRIPTS = alpinecfg.sh \
 	hwclock \
 	hwdrivers \
 	inetd \
+	keymap \
 	localinit \
 	localmount \
 	mdev \
diff --git a/init.d/bootmisc.sh b/init.d/bootmisc.sh
index 6629ea6..be2a035 100755
--- a/init.d/bootmisc.sh
+++ b/init.d/bootmisc.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-mkdir -p /var/run
-dmesg -s 65536 > /var/run/dmesg.boot
+mkdir -p /var/log
+dmesg -s 65536 > /var/log/dmesg
 
diff --git a/init.d/keymap b/init.d/keymap
new file mode 100644
index 0000000..7524d53
--- /dev/null
+++ b/init.d/keymap
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+
+
+start() {
+	[ -z "$KEYMAP" ] && return
+	ebegin "Setting keymap"
+	zcat "$KEYMAP" | loadkmap
+	eend $?
+}
+
+stop() {
+	return
+}
diff --git a/init.d/syslog b/init.d/syslog
index ad7361d..c44e43b 100755
--- a/init.d/syslog
+++ b/init.d/syslog
@@ -9,7 +9,7 @@ start() {
 
 stop () {
 	ebegin "Stopping system logging"
-	killall klogd
+	killall klogd 2>/dev/null
 	killall syslogd
 	eend $?
 }
diff --git a/inittab b/inittab
index e07f9ae..379097a 100644
--- a/inittab
+++ b/inittab
@@ -4,7 +4,7 @@
 ::wait:/etc/init.d/rcL
 
 # Set up a couple of getty's
-::respawn:/sbin/cttyhack /sbin/getty - 9600 vt100
+::respawn:/usr/bin/cttyhack /sbin/getty - 9600 vt100
 tty2::respawn:/sbin/getty 38400 tty2
 tty3::respawn:/sbin/getty 38400 tty3
 tty4::respawn:/sbin/getty 38400 tty4
diff --git a/sendbug.conf b/sendbug.conf
new file mode 100644
index 0000000..353a8fd
--- /dev/null
+++ b/sendbug.conf
@@ -0,0 +1,2 @@
+mailfrom=
+mailto=bugs@alpinelinux.org