From 156bae21d4bc8f94ebe59b2e18c1702b192bf84d Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 11 Aug 2010 23:22:34 +0200
Subject: [PATCH] Remove uneeded reboot after setup. Todo: change the message
 at end of setup...

---
 doc/packages-list.txt             | 29 ++++++++++++++---------------
 src/initscripts/init.d/firstsetup | 26 ++++++--------------------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index d3f54fa545..5e401310b1 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -37,7 +37,7 @@
 * Unix-Syslog-0.100
 * XML-Parser-2.34
 * alsa-lib-1.0.23
-* alsa-lib-1.0.23-kmod-2.6.32.17-ipfire
+* alsa-lib-1.0.23-kmod-2.6.32.18-ipfire
 * amavisd-new-2.5.2
 * apcupsd-3.14.4
 * applejuice-0.31
@@ -67,18 +67,17 @@
 * clamav-0.96.1
 * cmake-2.4.8
 * collectd-4.9.1
-* compat-wireless-2.6.34.1-kmod-2.6.32.17-ipfire
-* compat-wireless-2.6.35-1-kmod-2.6.32.17-ipfire
+* compat-wireless-2.6.35-1-kmod-2.6.32.18-ipfire
 * coreutils-5.96
 * cpio-2.11
 * cpufrequtils-007
-* cryptodev-20091126-kmod-2.6.32.17-ipfire
+* cryptodev-20091126-kmod-2.6.32.18-ipfire
 * cups-1.4.2
 * curl-7.19.5
 * cyrus-imapd-2.2.12
 * cyrus-sasl-2.1.21
 * dahdi-2.2.1
-* dahdi-2.2.1-kmod-2.6.32.17-ipfire
+* dahdi-2.2.1-kmod-2.6.32.18-ipfire
 * db-4.4.20
 * dbus-1.0.3
 * ddrescue-1.12
@@ -88,8 +87,8 @@
 * dnsmasq-2.45
 * dosfstools-3.0.9
 * dracut-006
-* e1000-8.0.19-kmod-2.6.32.17-ipfire
-* e1000e-1.1.19-kmod-2.6.32.17-ipfire
+* e1000-8.0.19-kmod-2.6.32.18-ipfire
+* e1000e-1.1.19-kmod-2.6.32.18-ipfire
 * e2fsprogs-1.41.11
 * ebtables-v2.0.8-2
 * ed-0.2
@@ -158,7 +157,7 @@
 * joe-3.7
 * jpegsrc.v6b
 * kbd-1.12
-* kqemu-1.4.0pre1-kmod-2.6.32.17-ipfire
+* kqemu-1.4.0pre1-kmod-2.6.32.18-ipfire
 * kudzu-1.2.64
 * l7-protocols-2009-05-10
 * lame-3.97
@@ -192,7 +191,7 @@
 * libwww-perl-5.803
 * libxml2-2.6.26
 * libxslt-1.1.17
-* linux-2.6.32.17-ipfire
+* linux-2.6.32.18-ipfire
 * linux-atm-2.4.1
 * linux-firmware-20100318
 * linux-libc-headers-2.6.12.0
@@ -203,9 +202,9 @@
 * lynis-1.2.9
 * lzo-2.02
 * m4-1.4.4
-* mISDN-20100525-kmod-2.6.32.17-ipfire
+* mISDN-20100525-kmod-2.6.32.18-ipfire
 * mISDNuser-20100525
-* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.17-ipfire
+* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.18-ipfire
 * make-3.81
 * man-db-2.4.3
 * man-pages-2.34
@@ -274,9 +273,9 @@
 * psmisc-22.2
 * qemu-0.11.1-kqemu
 * qemu-0.12.3
-* r8101-1.016.00-kmod-2.6.32.17-ipfire
-* r8168-8.018.00-kmod-2.6.32.17-ipfire
-* r8169-6.013.00-kmod-2.6.32.17-ipfire
+* r8101-1.016.00-kmod-2.6.32.18-ipfire
+* r8168-8.018.00-kmod-2.6.32.18-ipfire
+* r8169-6.013.00-kmod-2.6.32.18-ipfire
 * readline-5.1
 * reiser4progs-1.0.6
 * reiserfsprogs-3.6.21
@@ -330,7 +329,7 @@
 * usb-modeswitch-1.1.2
 * usbutils-0.72
 * util-linux-2.12r
-* v4l-dvb-b576509ea6d2-kmod-2.6.32.17-ipfire
+* v4l-dvb-b576509ea6d2-kmod-2.6.32.18-ipfire
 * vdr-1.6.0
 * vdradmin-am-3.6.7
 * vim-7.0
diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index c3cf427c4f..892031bd81 100644
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -1,22 +1,8 @@
 #!/bin/bash
 /usr/local/sbin/setup /dev/tty2 INSTALL
-/usr/bin/clear
-echo "Reboot ..."
-echo "Sending all processes the TERM signal..."
-/sbin/killall5 -15
-sleep 3
-echo "Sending all processes the KILL signal..."
-/sbin/killall5 -15
-sleep 3
-echo "Unmounting Filesystems..."
-/bin/umount /sys
-/bin/umount /dev/pts
-/bin/umount /proc
-/bin/umount /boot
-/bin/umount /var/log/rrd
-/bin/umount /var/lock
-/bin/umount /var/run
-/bin/umount /var
-rm -f /etc/rc.d/rcsysinit.d/S75firstsetup \
-&& /bin/mount -n -o remount,ro / \
-&& /sbin/reboot -f
+echo Restarting udev...
+killall udevd
+/sbin/udevd --daemon
+/sbin/udevadm trigger
+/sbin/udevadm settle
+rm -f /etc/rc.d/rcsysinit.d/S75firstsetup
-- 
2.39.2