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 0d3f448c9ee6ce611e7e566b6ce4f2cecc00c40b..16e10f73e4eb8ce2da27a5c2c445aad7a2ce0f24 100644 (file)
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -35,15 +35,17 @@ if [ "${?}" == "1" ]; then
 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