Author: fernando
Date: Sat Mar 29 08:55:43 2014
New Revision: 12910
Log:
Modify Bluez bootscripts (for new version of package 5.17).
Added:
trunk/BOOK/archive/bootscripts_blfs_sysconfig_bluetooth
- copied unchanged from r12909, trunk/bootscripts/blfs/sysconfig/bluetooth
Deleted:
trunk/bootscripts/blfs/sysconfig/bluetooth
Modified:
trunk/bootscripts/Makefile
trunk/bootscripts/blfs/init.d/bluetooth
Copied: trunk/BOOK/archive/bootscripts_blfs_sysconfig_bluetooth (from r12909,
trunk/bootscripts/blfs/sysconfig/bluetooth)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/BOOK/archive/bootscripts_blfs_sysconfig_bluetooth Sat Mar 29
08:55:43 2014 (r12910, copy of r12909,
trunk/bootscripts/blfs/sysconfig/bluetooth)
@@ -0,0 +1,30 @@
+# Begin /etc/sysconfig/bluetooth
+
+# Run the bluetooth HID daemon (default: false)
+#HIDD_ENABLE="true"
+
+# Activate rfcomm ports (default: false)
+#RFCOMM_ENABLE="true"
+
+# Run bluetooth dial-up networking daemon (default: false)
+# Note: You need to pass coressponding options to the daemon
+# since it does not run without any options.
+#DUND_ENABLE="true"
+
+# Run bluetooth PAN daemon (default: false)
+# Note: You need to pass coressponding options to the daemon
+# since it does not run without any options.
+#PAND_ENABLE="true"
+
+# Options for hidd, dund and pand (default: none)
+
+# See man 1 hidd for available options.
+#HIDD_OPTIONS=""
+
+# See man 1 dund for available options.
+#DUND_OPTIONS=""
+
+# See man 1 pand for available options.
+#PAND_OPTIONS=""
+
+# End /etc/sysconfig/bluetooth
Modified: trunk/bootscripts/Makefile
==============================================================================
--- trunk/bootscripts/Makefile Sat Mar 29 03:19:25 2014 (r12909)
+++ trunk/bootscripts/Makefile Sat Mar 29 08:55:43 2014 (r12910)
@@ -113,7 +113,6 @@
install-bluetooth: create-dirs
install -m ${MODE} blfs/init.d/bluetooth ${EXTDIR}/rc.d/init.d/bluetooth
- install -m ${CONFMODE} blfs/sysconfig/bluetooth
${EXTDIR}/sysconfig/bluetooth
ln -sf ../init.d/bluetooth ${EXTDIR}/rc.d/rc0.d/K27bluetooth
ln -sf ../init.d/bluetooth ${EXTDIR}/rc.d/rc1.d/K27bluetooth
ln -sf ../init.d/bluetooth ${EXTDIR}/rc.d/rc2.d/S35bluetooth
@@ -611,7 +610,6 @@
uninstall-bluetooth:
rm -f ${EXTDIR}/rc.d/init.d/bluetooth
- rm -f ${EXTDIR}/sysconfig/bluetooth
rm -f ${EXTDIR}/rc.d/rc0.d/K27bluetooth
rm -f ${EXTDIR}/rc.d/rc1.d/K27bluetooth
rm -f ${EXTDIR}/rc.d/rc2.d/S35bluetooth
Modified: trunk/bootscripts/blfs/init.d/bluetooth
==============================================================================
--- trunk/bootscripts/blfs/init.d/bluetooth Sat Mar 29 03:19:25 2014
(r12909)
+++ trunk/bootscripts/blfs/init.d/bluetooth Sat Mar 29 08:55:43 2014
(r12910)
@@ -24,99 +24,27 @@
. /lib/lsb/init-functions
-HIDD_ENABLE="false"
-PAND_ENABLE="false"
-DUND_ENABLE="false"
-
-RFCOMM_ENABLE="false"
-
-HIDD_OPTIONS=""
-PAND_OPTIONS=""
-DUND_OPTIONS=""
-
-if [ -f "/etc/sysconfig/bluetooth" ]; then
- . /etc/sysconfig/bluetooth
-fi
-
case "${1}" in
start)
-
- log_info_msg "Starting Bluetooth daemon bluetooth \n"
- start_daemon /usr/sbin/bluetoothd
-
- if [ "$HIDD_ENABLE" = "true" ]; then
- log_info_msg "Starting Bluetooth HID daemon hidd \n"
- start_daemon /usr/sbin/hidd "$HIDD_OPTIONS"
- fi
-
- if [ "$RFCOMM_ENABLE" = "true" ]; then
- /usr/bin/rfcomm -f /etc/bluetooth/rfcomm.conf bind all || true
- fi
-
- if [ "$PAND_ENABLE" = "true" ]; then
- log_info_msg "Starting Bluetooth PAN daemon pand \n"
- start_daemon /usr/bin/pand "$PAND_OPTIONS"
- fi
-
- if [ "$DUND_ENABLE" = "true" ]; then
- log_info_msg "Starting Bluetooth DUN daemon dund \n"
- start_daemon /usr/bin/dund "$DUND_OPTIONS"
- fi
+ log_info_msg "Starting Bluetooth daemon bluetoothd"
+ start_daemon /usr/lib/bluetooth/bluetoothd
evaluate_retval
-
;;
stop)
-
- if [ "$DUND_ENABLE" = "true" ]; then
- log_info_msg "Stopping Bluetooth DUN daemon dund \n"
- killproc /usr/bin/dund
- fi
-
- if [ "$PAND_ENABLE" = "true" ]; then
- log_info_msg "Stopping Bluetooth PAN daemon pand \n"
- killproc /usr/bin/pand
- fi
-
- if [ "$RFCOMM_ENABLE" = "true" ]; then
- /usr/bin/rfcomm release all || true
- fi
-
- if [ "$HIDD_ENABLE" = "true" ]; then
- log_info_msg "Stopping Bluetooth HID daemon hidd \n"
- killproc /usr/sbin/hidd
- fi
-
- log_info_msg "Stopping Bluetooth daemon bluetoothd \n"
- killproc /usr/sbin/bluetoothd
+ log_info_msg "Stopping Bluetooth daemon bluetoothd"
+ killproc /usr/lib/bluetooth/bluetoothd
evaluate_retval
-
;;
restart)
-
${0} stop
sleep 1
${0} start
-
;;
status)
-
- statusproc /usr/sbin/bluetoothd
-
- if [ "$HIDD_ENABLE" = "true" ]; then
- statusproc /usr/sbin/hidd
- fi
-
- if [ "$PAND_ENABLE" = "true" ]; then
- statusproc /usr/bin/pand
- fi
-
- if [ "$DUND_ENABLE" = "true" ]; then
- statusproc /usr/bin/dund
- fi
-
+ statusproc /usr/lib/bluetooth/bluetoothd
;;
*)
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page