Merge remote-tracking branch 'stevee/core90-fixes'

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

diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index 0d3f448c9ee6ce611e7e566b6ce4f2cecc00c40b..70c30b4e230fb8b9fcff9e4f607394f2f948e8b1 100644 (file)
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -28,22 +28,24 @@ ser_console $cmdline
 #
 /etc/init.d/sysklogd start
 export LANG=en_US.utf8
-/usr/local/sbin/setup /dev/tty2 INSTALL
+/usr/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
-rm -rf /opt/pakfire/db/*/meta-linux-pae
 if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; 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
+       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