summaryrefslogtreecommitdiffstats
path: root/extra/hal
diff options
context:
space:
mode:
authorThierry N <thierryn1 at hispeed dot ch>2009-08-10 23:11:24 +0200
committerThierry N <thierryn1 at hispeed dot ch>2009-08-10 23:11:24 +0200
commitacde9e36d477de93466f0299944152e2081682ae (patch)
treea48408c356f45adbecb51c067ff85d9608f797cd /extra/hal
parente21c99ef1c4939a51ca74a1d05ddfca6bd99a2b4 (diff)
downloadnutyx-extra-acde9e36d477de93466f0299944152e2081682ae.tar.gz
nutyx-extra-acde9e36d477de93466f0299944152e2081682ae.tar.bz2
nutyx-extra-acde9e36d477de93466f0299944152e2081682ae.tar.xz
nutyx-extra-acde9e36d477de93466f0299944152e2081682ae.zip
Ajout de hal#0.5.13-1
Diffstat (limited to 'extra/hal')
-rw-r--r--extra/hal/.footprint190
-rw-r--r--extra/hal/.md5sum7
-rwxr-xr-xextra/hal/10-keymap.fdi8
-rwxr-xr-xextra/hal/Pkgfile49
-rwxr-xr-xextra/hal/haldaemon47
-rwxr-xr-xextra/hal/halusers.conf14
-rwxr-xr-xextra/hal/no-fixed-drives.fdi14
-rwxr-xr-xextra/hal/use_udevadm_not_udevinfo.patch.gzbin0 -> 677 bytes
8 files changed, 329 insertions, 0 deletions
diff --git a/extra/hal/.footprint b/extra/hal/.footprint
new file mode 100644
index 000000000..b5fe0dbb5
--- /dev/null
+++ b/extra/hal/.footprint
@@ -0,0 +1,190 @@
+drwxr-xr-x root/root etc/
+drwxr-xr-x root/root etc/dbus-1/
+drwxr-xr-x root/root etc/dbus-1/system.d/
+-rw-r--r-- root/root etc/dbus-1/system.d/hal.conf
+-rwxr-xr-x root/root etc/dbus-1/system.d/halusers.conf
+drwxr-xr-x root/root etc/hal/
+drwxr-xr-x root/root etc/hal/fdi/
+drwxr-xr-x root/root etc/hal/fdi/information/
+drwxr-xr-x root/root etc/hal/fdi/policy/
+-rwxr-xr-x root/root etc/hal/fdi/policy/10-keymap.fdi
+lrwxrwxrwx root/root etc/hal/fdi/policy/10-x11-input.fdi -> /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
+-rwxr-xr-x root/root etc/hal/fdi/policy/no-fixed-drives.fdi
+drwxr-xr-x root/root etc/hal/fdi/preprobe/
+drwxr-xr-x root/root etc/rc.d/
+drwxr-xr-x root/root etc/rc.d/init.d/
+-rwxr-xr-x root/root etc/rc.d/init.d/haldaemon
+drwxr-xr-x root/root etc/rc.d/rc0.d/
+lrwxrwxrwx root/root etc/rc.d/rc0.d/K29haldaemon -> ../init.d/haldaemon
+drwxr-xr-x root/root etc/rc.d/rc1.d/
+lrwxrwxrwx root/root etc/rc.d/rc1.d/K29haldaemon -> ../init.d/haldaemon
+drwxr-xr-x root/root etc/rc.d/rc2.d/
+lrwxrwxrwx root/root etc/rc.d/rc2.d/S21haldaemon -> ../init.d/haldaemon
+drwxr-xr-x root/root etc/rc.d/rc3.d/
+lrwxrwxrwx root/root etc/rc.d/rc3.d/S21haldaemon -> ../init.d/haldaemon
+drwxr-xr-x root/root etc/rc.d/rc4.d/
+lrwxrwxrwx root/root etc/rc.d/rc4.d/S21haldaemon -> ../init.d/haldaemon
+drwxr-xr-x root/root etc/rc.d/rc5.d/
+lrwxrwxrwx root/root etc/rc.d/rc5.d/S21haldaemon -> ../init.d/haldaemon
+drwxr-xr-x root/root etc/rc.d/rc6.d/
+lrwxrwxrwx root/root etc/rc.d/rc6.d/K29haldaemon -> ../init.d/haldaemon
+drwxr-xr-x root/root etc/rc.d/rcsysinit.d/
+drwxr-xr-x root/root etc/sysconfig/
+drwxr-xr-x root/root etc/udev/
+drwxr-xr-x root/root etc/udev/rules.d/
+-rw-r--r-- root/root etc/udev/rules.d/90-hal.rules
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/hal-device
+-rwxr-xr-x root/root usr/bin/hal-disable-polling
+-rwxr-xr-x root/root usr/bin/hal-find-by-capability
+-rwxr-xr-x root/root usr/bin/hal-find-by-property
+-rwxr-xr-x root/root usr/bin/hal-get-property
+-rwxr-xr-x root/root usr/bin/hal-is-caller-locked-out
+-rwxr-xr-x root/root usr/bin/hal-lock
+-rwxr-xr-x root/root usr/bin/hal-set-property
+-rwxr-xr-x root/root usr/bin/lshal
+drwxr-xr-x root/root usr/include/
+drwxr-xr-x root/root usr/include/hal/
+-rw-r--r-- root/root usr/include/hal/libhal-storage.h
+-rw-r--r-- root/root usr/include/hal/libhal.h
+drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/hal/
+-rwxr-xr-x root/root usr/lib/hal/hal-storage-cleanup-all-mountpoints
+-rwxr-xr-x root/root usr/lib/hal/hal-storage-cleanup-mountpoint
+-rwxr-xr-x root/root usr/lib/hal/hal-storage-closetray
+-rwxr-xr-x root/root usr/lib/hal/hal-storage-eject
+-rwxr-xr-x root/root usr/lib/hal/hal-storage-mount
+-rwxr-xr-x root/root usr/lib/hal/hal-storage-unmount
+-rwxr-xr-x root/root usr/lib/hal/hal-system-power-pm-is-supported
+-rwxr-xr-x root/root usr/lib/hal/hal-system-power-pmu
+-rwxr-xr-x root/root usr/lib/hal/hal-system-setserial
+-rwxr-xr-x root/root usr/lib/hal/hal-system-sonypic
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-acpi
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-cpufreq
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-generic-backlight
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-hid-ups
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-imac-backlight
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-input
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-ipw-killswitch
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-leds
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-macbook-backlight
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-macbookpro-backlight
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-pmu
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-rfkill-killswitch
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-storage
+-rwxr-xr-x root/root usr/lib/hal/hald-addon-usb-csr
+-rwxr-xr-x root/root usr/lib/hal/hald-generate-fdi-cache
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-hiddev
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-ieee1394-unit
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-input
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-net-bluetooth
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-pc-floppy
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-printer
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-serial
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-smbios
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-storage
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-video4linux
+-rwxr-xr-x root/root usr/lib/hal/hald-probe-volume
+-rwxr-xr-x root/root usr/lib/hal/hald-runner
+drwxr-xr-x root/root usr/lib/hal/scripts/
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-dockstation-undock
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-functions
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-luks-remove
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-luks-setup
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-luks-teardown
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-killswitch-get-power
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-killswitch-set-power
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-lcd-get-brightness
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-lcd-set-brightness
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-power-hibernate
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-power-reboot
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-power-set-power-save
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-power-shutdown
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-power-suspend
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-power-suspend-hybrid
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-wol-enable
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-wol-enabled
+-rwxr-xr-x root/root usr/lib/hal/scripts/hal-system-wol-supported
+drwxr-xr-x root/root usr/lib/hal/scripts/linux/
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-dockstation-undock-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-luks-remove-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-luks-setup-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-luks-teardown-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-killswitch-get-power-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-killswitch-set-power-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-lcd-get-brightness-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-lcd-set-brightness-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-hibernate-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-reboot-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-set-power-save-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-shutdown-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-suspend-hybrid-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-power-suspend-linux
+lrwxrwxrwx root/root usr/lib/hal/scripts/linux/hal-system-wol-enable-linux -> hal-system-wol-linux
+lrwxrwxrwx root/root usr/lib/hal/scripts/linux/hal-system-wol-enabled-linux -> hal-system-wol-linux
+-rwxr-xr-x root/root usr/lib/hal/scripts/linux/hal-system-wol-linux
+lrwxrwxrwx root/root usr/lib/hal/scripts/linux/hal-system-wol-supported-linux -> hal-system-wol-linux
+-rw-r--r-- root/root usr/lib/libhal-storage.a
+-rwxr-xr-x root/root usr/lib/libhal-storage.la
+lrwxrwxrwx root/root usr/lib/libhal-storage.so -> libhal-storage.so.1.0.0
+lrwxrwxrwx root/root usr/lib/libhal-storage.so.1 -> libhal-storage.so.1.0.0
+-rwxr-xr-x root/root usr/lib/libhal-storage.so.1.0.0
+-rw-r--r-- root/root usr/lib/libhal.a
+-rwxr-xr-x root/root usr/lib/libhal.la
+lrwxrwxrwx root/root usr/lib/libhal.so -> libhal.so.1.0.0
+lrwxrwxrwx root/root usr/lib/libhal.so.1 -> libhal.so.1.0.0
+-rwxr-xr-x root/root usr/lib/libhal.so.1.0.0
+drwxr-xr-x root/root usr/lib/pkgconfig/
+-rw-r--r-- root/root usr/lib/pkgconfig/hal-storage.pc
+-rw-r--r-- root/root usr/lib/pkgconfig/hal.pc
+drwxr-xr-x root/root usr/sbin/
+-rwxr-xr-x root/root usr/sbin/hald
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/hal/
+drwxr-xr-x root/root usr/share/hal/fdi/
+-rw-r--r-- root/root usr/share/hal/fdi/fdi.dtd
+drwxr-xr-x root/root usr/share/hal/fdi/information/
+drwxr-xr-x root/root usr/share/hal/fdi/information/10freedesktop/
+drwxr-xr-x root/root usr/share/hal/fdi/information/20thirdparty/
+drwxr-xr-x root/root usr/share/hal/fdi/policy/
+drwxr-xr-x root/root usr/share/hal/fdi/policy/10osvendor/
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-cpufreq.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-dockstation.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-imac-backlight.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-input-policy.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-leds.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-macbook-backlight.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-macbookpro-utils.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-rfkill-switch.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-tabletPCs.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-usbcsr-mice.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/15-storage-luks.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/20-storage-methods.fdi
+-rw-r--r-- root/root usr/share/hal/fdi/policy/10osvendor/30-wol.fdi
+drwxr-xr-x root/root usr/share/hal/fdi/policy/20thirdparty/
+drwxr-xr-x root/root usr/share/hal/fdi/preprobe/
+drwxr-xr-x root/root usr/share/hal/fdi/preprobe/10osvendor/
+drwxr-xr-x root/root usr/share/hal/fdi/preprobe/20thirdparty/
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/man1/
+-rw-r--r-- root/root usr/share/man/man1/hal-disable-polling.1.gz
+-rw-r--r-- root/root usr/share/man/man1/hal-find-by-capability.1.gz
+-rw-r--r-- root/root usr/share/man/man1/hal-find-by-property.1.gz
+-rw-r--r-- root/root usr/share/man/man1/hal-get-property.1.gz
+-rw-r--r-- root/root usr/share/man/man1/hal-is-caller-locked-out.1.gz
+-rw-r--r-- root/root usr/share/man/man1/hal-lock.1.gz
+-rw-r--r-- root/root usr/share/man/man1/hal-set-property.1.gz
+-rw-r--r-- root/root usr/share/man/man1/lshal.1.gz
+drwxr-xr-x root/root usr/share/man/man8/
+-rw-r--r-- root/root usr/share/man/man8/hald.8.gz
+drwxr-xr-x root/root var/
+drwxr-xr-x root/root var/cache/
+drwxr-xr-x haldaemon/haldaemon var/cache/hald/
+drwxr-xr-x root/root var/run/
+drwxr-xr-x haldaemon/haldaemon var/run/hald/
+drwxr-xr-x root/root var/run/hald/hald-local/
+drwxr-xr-x root/root var/run/hald/hald-runner/
diff --git a/extra/hal/.md5sum b/extra/hal/.md5sum
new file mode 100644
index 000000000..6c82bef35
--- /dev/null
+++ b/extra/hal/.md5sum
@@ -0,0 +1,7 @@
+2ce75b2d8e3408137a7fb449a9d892e1 10-keymap.fdi
+46ecc5d2e5bd964fb78099688f01bb6a hal-0.5.13.tar.gz
+6fc99d15d38945c17a291ea93e664664 hal-info-20080508.tar.gz
+e96ea4d2d6e81d2a53cf63e2e93dc9e4 haldaemon
+47290dc30a6e2e05a9aa7a0d06833350 halusers.conf
+be2df8f5cf8e7decdc1551f8151b6c60 no-fixed-drives.fdi
+49ccb7f5da3c86d228d6c36a624a1509 use_udevadm_not_udevinfo.patch.gz
diff --git a/extra/hal/10-keymap.fdi b/extra/hal/10-keymap.fdi
new file mode 100755
index 000000000..81622b795
--- /dev/null
+++ b/extra/hal/10-keymap.fdi
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
+<match key="info.capabilities" contains="input.keyboard">
+ <merge key="input.x11_driver" type="string">keyboard</merge>
+ <merge key="input.xkb.layout" type="string">fr</merge>
+ <merge key="input.xkb.model" type="string">pc101</merge>
+ <merge key="input.xkb.rules" type="string">xorg</merge>
+</match>
+
diff --git a/extra/hal/Pkgfile b/extra/hal/Pkgfile
new file mode 100755
index 000000000..b8d377f7d
--- /dev/null
+++ b/extra/hal/Pkgfile
@@ -0,0 +1,49 @@
+# Description: Couche d'abstraction matériel
+# URL: http://freedesktop.org/wiki/Software_2fhal
+# Maintainer: NuTyX coreteam
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: dbus-glib, glib, usbutils, pciutils, libusb, eject, hal-info
+
+name=hal
+version=0.5.13
+release=1
+source=(http://hal.freedesktop.org/releases/$name-$version.tar.gz\
+ http://hal.freedesktop.org/releases/hal-info-20080508.tar.gz\
+ haldaemon halusers.conf no-fixed-drives.fdi 10-keymap.fdi \
+ use_udevadm_not_udevinfo.patch.gz)
+
+build() {
+ source /etc/blfs-bootscripts
+ wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
+ tar xvf $scripts-$scriptsversion.tar.bz2
+ cd $name-$version
+# zcat ../use_udevadm_not_udevinfo.patch.gz | patch -p1 --verbose
+
+ sed -i -e 's%, 1.8.6%&, 1.8.7%' \
+ -e 's% or 1.8.6%/1.8.6 or 1.8.7%' \
+ -e 's%6))%6) ||\
+ (major == 1 \&\& minor == 8 \&\& micro == 7))%' \
+ configure
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man \
+ --libexecdir=/usr/lib/$name \
+ --sysconfdir=/etc --with-udev-prefix=/etc \
+ --localstatedir=/var \
+ --with-pci-ids=/usr/share/pci.ids.gz \
+ --disable-policy-kit \
+ --disable-console-kit
+ make
+ make DESTDIR=$PKG install
+
+ mkdir -p $PKG/etc/hal/fdi/policy
+ mkdir -p $PKG/etc/dbus-1/system.d
+ mv ../halusers.conf $PKG/etc/dbus-1/system.d/
+ mv ../{no-fixed-drives.fdi,10-keymap.fdi} $PKG/etc/hal/fdi/policy/
+ cd ../$scripts-$scriptsversion
+ make DESTDIR=$PKG install-haldaemon
+ install -m755 ../haldaemon $PKG/etc/rc.d/init.d/
+ rm -rf $PKG/usr/share/gtk-doc
+ ln -sv /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi \
+ $PKG/etc/hal/fdi/policy/
+}
+
diff --git a/extra/hal/haldaemon b/extra/hal/haldaemon
new file mode 100755
index 000000000..64affe7cf
--- /dev/null
+++ b/extra/hal/haldaemon
@@ -0,0 +1,47 @@
+#!/bin/sh
+# Begin $rc_base/init.d/haldaemon
+
+# Based on sysklogd script from LFS-3.1 and earlier.
+# Rewritten by Gerard Beekmans - gerard@linuxfromscratch.org
+
+#$LastChangedBy: randy $
+#$Date: 2007/09/27 15:12:01 $
+# $Id: haldaemon,v 1.1 2007/09/27 15:12:01 install Exp $
+. /etc/sysconfig/rc
+. $rc_functions
+newid=19
+newuser=haldaemon
+newgroup=haldaemon
+getent group $newgroup > /dev/null || /usr/sbin/groupadd -g $newid $newgroup
+getent passwd $newuser > /dev/null || /usr/sbin/useradd -g $newgroup \
+-u $newid -s /bin/false -d /dev/null -u $newid -c "HAL Daemon User" $newuser
+getent group halusers > /dev/null || /usr/sbin/groupadd -g 61 halusers
+
+case "$1" in
+ start)
+ boot_mesg "Starting the HAL Daemon..."
+ loadproc /usr/sbin/hald --use-syslog
+ ;;
+
+ stop)
+ boot_mesg "Stopping the HAL Daemon..."
+ killproc /usr/sbin/hald
+ ;;
+
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+
+ status)
+ statusproc /usr/sbin/hald
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/haldaemon
diff --git a/extra/hal/halusers.conf b/extra/hal/halusers.conf
new file mode 100755
index 000000000..b4e13cf29
--- /dev/null
+++ b/extra/hal/halusers.conf
@@ -0,0 +1,14 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+ <!-- Allow users in the halusers group invoke HAL methods -->
+ <policy group="halusers">
+ <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
+ <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
+ <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
+ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+ </policy>
+
+</busconfig>
diff --git a/extra/hal/no-fixed-drives.fdi b/extra/hal/no-fixed-drives.fdi
new file mode 100755
index 000000000..6832ee2c5
--- /dev/null
+++ b/extra/hal/no-fixed-drives.fdi
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
+
+<!-- Don't allow HAL methods on disks that are not
+ removable or hotpluggable -->
+
+<deviceinfo version="0.2">
+<device>
+ <match key="@block.storage_device:storage.hotpluggable" bool="false">
+ <match key="@block.storage_device:storage.removable" bool="false">
+ <merge key="volume.ignore" type="bool">true</merge>
+ </match>
+ </match>
+</device>
+</deviceinfo>
diff --git a/extra/hal/use_udevadm_not_udevinfo.patch.gz b/extra/hal/use_udevadm_not_udevinfo.patch.gz
new file mode 100755
index 000000000..0a47b6ca7
--- /dev/null
+++ b/extra/hal/use_udevadm_not_udevinfo.patch.gz
Binary files differ