[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 481988c68d1380d918f42cb109a72c854826ffc7

[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 481988c68d1380d918f42cb109a72c854826ffc7

[git]

[-- Attachment #1: Type: text/plain, Size: 3030 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, fifteen has been updated
       via  481988c68d1380d918f42cb109a72c854826ffc7 (commit)
       via  aa8512fac63ff7451392d3d8d8114a286ec638e9 (commit)
       via  3d2c3affcd2992461fac5bba54dbff551eaafb72 (commit)
       via  a538898a469237653e1f0ada0238e7f4168a1991 (commit)
      from  f7165e5aed61866f8d82141c9ac152468a964f4c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 481988c68d1380d918f42cb109a72c854826ffc7
Merge: aa8512f f7165e5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Dec 30 10:35:25 2013 +0100

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

commit aa8512fac63ff7451392d3d8d8114a286ec638e9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Dec 30 10:34:33 2013 +0100

    firstsetup: init udev hwdb at first boot.

commit 3d2c3affcd2992461fac5bba54dbff551eaafb72
Merge: a538898 63efc01
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Dec 29 20:32:47 2013 +0100

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

commit a538898a469237653e1f0ada0238e7f4168a1991
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun Dec 29 20:14:01 2013 +0100

    bluetooth: update udev rules.

-----------------------------------------------------------------------

Summary of changes:
 lfs/bluetooth                     | 3 +++
 src/initscripts/init.d/firstsetup | 1 +
 2 files changed, 4 insertions(+)

Difference in files:
diff --git a/lfs/bluetooth b/lfs/bluetooth
index 33e126c..dc5eec7 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 247d69a..16e10f7 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


hooks/post-receive
--
IPFire 2.x development tree