Merge remote-tracking branch 'origin/master' into kernel-update

[ipfire-2.x.git] / src / initscripts / init.d / firstsetup

diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index cef0b8a03768975449bd8ae6dc2111653b6a30e4..b658cfa027936973e4f39f16f9bb88a26b9f8538 100644 (file)
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -1,9 +1,36 @@
 #!/bin/bash
+# Edit the serial console entry at /etc/inittab matching to console parameter.
+ser_console() {
+       while test x"$1" != x
+       do
+               case $1 in
+                       console=*)
+                               scon=${1##console=};
+                               sed -i -e "s|^7:2345:respawn:/sbin/agetty.*|7:2345:respawn:/sbin/agetty ${scon%%,*} ${scon##*,}|g" /etc/inittab
+                               shift
+                       ;;
+                       *)
+                               shift
+                       ;;
+               esac
+       done
+}
+cmdline=`cat /proc/cmdline`
+ser_console $cmdline
+# reload inittab
+/sbin/init q
+#
+/etc/init.d/sysklogd start
 export LANG=en_US.utf8
 /usr/local/sbin/setup /dev/tty2 INSTALL
+if [ "${?}" == "1" ]; then
+       echo Setup not finished. Rebooting ...
+       reboot -f
+fi
 echo Restarting udev...
 killall udevd
 /sbin/udevd --daemon
 /sbin/udevadm trigger
 /sbin/udevadm settle
+/etc/init.d/sysklogd stop
 rm -f /etc/rc.d/rcsysinit.d/S75firstsetup