From 35b7b1ab86b8dd62e86029b837c8a8e1135a2423 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 12 Jun 2009 09:40:49 +0000
Subject: use rc-update quietly. some sysinit/boot svc are added from initramfs

---
 setup-alpine.in  | 16 ++++------------
 setup-keymap.in  |  2 +-
 setup-webconf.in |  5 ++---
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/setup-alpine.in b/setup-alpine.in
index 0ca2af0..3472f53 100644
--- a/setup-alpine.in
+++ b/setup-alpine.in
@@ -33,20 +33,12 @@ grep '^iface.*dhcp' $ROOT/etc/network/interfaces > /dev/null ||\
 # set root password
 [ -z "$NOCOMMIT" ] && while ! passwd ; do echo "Please retry." ; done
 
-for i in devfs dmesg; do
-	rc-update add $i sysinit
-done
+rc-update -q add networking boot 
 
-# add some boot services
-for i in hwclock modules sysctl hostname syslog bootmisc; do
-	rc-update add $i boot
-done
-
-for i in networking; do
-	rc-update add $i default
-done
+# enable new hostname
+/etc/init.d/hostname --quiet restart
 
 # start up the services
-rc sysinit
 rc boot
 rc default
+
diff --git a/setup-keymap.in b/setup-keymap.in
index 5f53dc1..770af50 100644
--- a/setup-keymap.in
+++ b/setup-keymap.in
@@ -45,7 +45,7 @@ setup_mapfile() {
 		echo "KEYMAP=/etc/keymap/$name.gz" >> "$conf"
 		# we actually load the keymap now
 		zcat /etc/keymap/$name.gz | loadkmap
-		rc-update add keymaps boot
+		rc-update -q add keymaps boot
 		goodbye 0
 	fi
 }
diff --git a/setup-webconf.in b/setup-webconf.in
index 849e683..f950db1 100644
--- a/setup-webconf.in
+++ b/setup-webconf.in
@@ -94,7 +94,6 @@ MINI_HTTPD_OPTS="-C /etc/mini_httpd.conf"
 MINI_HTTPD_DOCROOT=/var/www/localhost/htdocs
 EOF
 
-pidof mini_httpd >/dev/null && /etc/init.d/mini_httpd stop
-rc-update add mini_httpd default
-/etc/init.d/mini_httpd start
+rc-update -q add mini_httpd default
+/etc/init.d/mini_httpd restart
 
-- 
cgit v1.2.3