From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 30 Dec 2013 09:35:25 +0000 (+0100)
Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=481988c68d1380d918f42cb109a72c854826ffc7;hp=f7165e5aed61866f8d82141c9ac152468a964f4c

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

diff --git a/lfs/bluetooth b/lfs/bluetooth
index 33e126cfa..dc5eec7ea 100644
--- a/lfs/bluetooth
+++ b/lfs/bluetooth
@@ -109,6 +109,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_SRC)/bluez-hcidump-1.42 && make $(MAKETUNING)
 	cd $(DIR_SRC)/bluez-hcidump-1.42 && make install
 	mv -f /etc/udev/bluetooth.rules /lib/udev/rules.d/24-bluetooth.rules
+	# Patch udev rules for new udev version
+	sed -i -e "s/SYSFS{/ATTRS{/g" /lib/udev/rules.d/24-bluetooth.rules
+	sed -i -e "s/BUS==/SUBSYSTEMS==/g" /lib/udev/rules.d/24-bluetooth.rules
 	# Change bluetooth peername to Hostname-devicenumber
 	sed -i -e 's|name "BlueZ (%d)";|name "%h-%d";|g' /etc/bluetooth/hcid.conf
 	# Create empty config files
diff --git a/src/initscripts/init.d/firstsetup b/src/initscripts/init.d/firstsetup
index 247d69ab9..16e10f73e 100644
--- a/src/initscripts/init.d/firstsetup
+++ b/src/initscripts/init.d/firstsetup
@@ -45,6 +45,7 @@ fi
 
 echo Restarting udev...
 killall udevd
+/sbin/udevadm hwdb --update
 /sbin/udevd --daemon
 /sbin/udevadm trigger
 /sbin/udevadm settle