Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Dec 2013 09:35:25 +0000 (10:35 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 30 Dec 2013 09:35:25 +0000 (10:35 +0100)
lfs/bluetooth
src/initscripts/init.d/firstsetup

index 33e126cfaaea42a272f2d4b077d5a1cc6ca12ef4..dc5eec7ea567ca15c60000e6187cebcd39c42cfa 100644 (file)
@@ -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
index 247d69ab96b11adb43d22730cd3a7fe89984bef4..16e10f73e4eb8ce2da27a5c2c445aad7a2ce0f24 100644 (file)
@@ -45,6 +45,7 @@ fi
 
 echo Restarting udev...
 killall udevd
+/sbin/udevadm hwdb --update
 /sbin/udevd --daemon
 /sbin/udevadm trigger
 /sbin/udevadm settle