Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

[people/teissler/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..16e10f73e4eb8ce2da27a5c2c445aad7a2ce0f24 100644 (file)
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -1,9 +1,53 @@
 #!/bin/bash
+
+# Exit if firstsetup was already done...
+if [ -e /var/ipfire/main/firstsetup_ok ]; then
+       exit 0;
+fi
+
+# 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
+
+# plan install pae kernel at next pakfire update if pae is supported
+if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+       if [ ! -e /opt/pakfire/db/installed/meta-linux-pae ]; then
+               echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+               echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+               echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
+       fi
+fi
+
 echo Restarting udev...
 killall udevd
+/sbin/udevadm hwdb --update
 /sbin/udevd --daemon
 /sbin/udevadm trigger
 /sbin/udevadm settle
-rm -f /etc/rc.d/rcsysinit.d/S75firstsetup
+/etc/init.d/sysklogd stop
+touch /var/ipfire/main/firstsetup_ok