move hald/linux2 to hald/linux and renamed backend

Since there is no longer a hald/linux dir in the repository, we can move
hald/linux2 to hald/linux and rename the related HALD_BACKEND to linux.

51 files changed, 18 insertions, 18 deletions

diff --git a/configure.in b/configure.in
index 1d229241..be68d8fb 100644
--- a/configure.in
+++ b/configure.in
@@ -213,7 +213,7 @@ AC_CHECK_HEADERS(pci/pci.h, [
 	USE_LIBPCI=no AM_CONDITIONAL(HAVE_LIBPCI,false)])
 
 
-AC_ARG_WITH(backend, [  --with-backend=<name>   backend to use (linux2/solaris/dummy)],
+AC_ARG_WITH(backend, [  --with-backend=<name>   backend to use (linux/solaris/dummy)],
                       [
                       backend=$withval
                       ]
@@ -229,7 +229,7 @@ else
                    HALD_BACKEND="freebsd"
                    ;;
 	*-linux*)
-		   HALD_BACKEND="linux2"
+		   HALD_BACKEND="linux"
       		   ;;
         *)
 		   HALD_BACKEND="dummy"
@@ -237,7 +237,7 @@ else
     esac
 fi
 AM_CONDITIONAL(HALD_COMPILE_DUMMY, test x$HALD_BACKEND = xdummy, [Compiling for Dummy backend])
-AM_CONDITIONAL(HALD_COMPILE_LINUX2, test x$HALD_BACKEND = xlinux2, [Compiling for Linux])
+AM_CONDITIONAL(HALD_COMPILE_LINUX, test x$HALD_BACKEND = xlinux, [Compiling for Linux])
 AM_CONDITIONAL(HALD_COMPILE_FREEBSD, test x$HALD_BACKEND = xfreebsd, [Compiling for FreeBSD])
 AM_CONDITIONAL(HALD_COMPILE_SOLARIS, test x$HALD_BACKEND = xsolaris, [Compiling for Solaris])
 AC_SUBST(HALD_BACKEND)
@@ -443,9 +443,9 @@ hal.conf
 Makefile
 hald/Makefile
 hald/dummy/Makefile
-hald/linux2/Makefile
-hald/linux2/probing/Makefile
-hald/linux2/addons/Makefile
+hald/linux/Makefile
+hald/linux/probing/Makefile
+hald/linux/addons/Makefile
 hald/solaris/Makefile
 hald/haldaemon
 hald-runner/Makefile
diff --git a/hald/Makefile.am b/hald/Makefile.am
index b3323900..e02e3212 100644
--- a/hald/Makefile.am
+++ b/hald/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = dummy linux2 solaris .
+SUBDIRS = dummy linux solaris .
 
 INCLUDES = \
 	-DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \
diff --git a/hald/debug-hald.sh b/hald/debug-hald.sh
index beae4668..49f460b5 100755
--- a/hald/debug-hald.sh
+++ b/hald/debug-hald.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export HALD_RUNNER_PATH=`pwd`/linux2:`pwd`/linux2/probing:`pwd`/linux2/addons:`pwd`/.:`pwd`/../tools:`pwd`/../tools/linux
+export HALD_RUNNER_PATH=`pwd`/linux:`pwd`/linux/probing:`pwd`/linux/addons:`pwd`/.:`pwd`/../tools:`pwd`/../tools/linux
 export PATH=`pwd`/../hald-runner:$PATH
 export HAL_FDI_SOURCE_PREPROBE=../fdi/preprobe
 export HAL_FDI_SOURCE_INFORMATION=../fdi/information
diff --git a/hald/linux2/.gitignore b/hald/linux/.gitignore
index 4bec0e4b..4bec0e4b 100644
--- a/hald/linux2/.gitignore
+++ b/hald/linux/.gitignore
diff --git a/hald/linux2/Makefile.am b/hald/linux/Makefile.am
index d7b90a31..a3bf2bc3 100644
--- a/hald/linux2/Makefile.am
+++ b/hald/linux/Makefile.am
@@ -10,11 +10,11 @@ INCLUDES = \
 	-I$(top_srcdir) -I.. \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@
 
-if HALD_COMPILE_LINUX2
-noinst_LTLIBRARIES = libhald_linux2.la
+if HALD_COMPILE_LINUX
+noinst_LTLIBRARIES = libhald_linux.la
 endif
 
-libhald_linux2_la_SOURCES =					\
+libhald_linux_la_SOURCES =					\
 				osspec.c			\
 	osspec_linux.h						\
 	hotplug.h		hotplug.c			\
diff --git a/hald/linux2/acpi.c b/hald/linux/acpi.c
index 4274d77e..4274d77e 100644
--- a/hald/linux2/acpi.c
+++ b/hald/linux/acpi.c
diff --git a/hald/linux2/acpi.h b/hald/linux/acpi.h
index f7ed07a1..f7ed07a1 100644
--- a/hald/linux2/acpi.h
+++ b/hald/linux/acpi.h
diff --git a/hald/linux2/addons/.gitignore b/hald/linux/addons/.gitignore
index 6c2e5097..6c2e5097 100644
--- a/hald/linux2/addons/.gitignore
+++ b/hald/linux/addons/.gitignore
diff --git a/hald/linux2/addons/Makefile.am b/hald/linux/addons/Makefile.am
index 19c229d7..65819f4f 100644
--- a/hald/linux2/addons/Makefile.am
+++ b/hald/linux/addons/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
         -I$(top_srcdir) -I$(top_srcdir)/hald \
         @GLIB_CFLAGS@ @DBUS_CFLAGS@
 
-if HALD_COMPILE_LINUX2
+if HALD_COMPILE_LINUX
 libexec_PROGRAMS  = 			\
 	hald-addon-acpi 		\
 	hald-addon-acpi-buttons-toshiba \
diff --git a/hald/linux2/addons/addon-acpi-buttons-toshiba.c b/hald/linux/addons/addon-acpi-buttons-toshiba.c
index 7252759e..7252759e 100644
--- a/hald/linux2/addons/addon-acpi-buttons-toshiba.c
+++ b/hald/linux/addons/addon-acpi-buttons-toshiba.c
diff --git a/hald/linux2/addons/addon-acpi.c b/hald/linux/addons/addon-acpi.c
index 4b193212..4b193212 100644
--- a/hald/linux2/addons/addon-acpi.c
+++ b/hald/linux/addons/addon-acpi.c
diff --git a/hald/linux2/addons/addon-hid-ups.c b/hald/linux/addons/addon-hid-ups.c
index 1361ed6d..1361ed6d 100644
--- a/hald/linux2/addons/addon-hid-ups.c
+++ b/hald/linux/addons/addon-hid-ups.c
diff --git a/hald/linux2/addons/addon-keyboard.c b/hald/linux/addons/addon-keyboard.c
index a054ac97..a054ac97 100644
--- a/hald/linux2/addons/addon-keyboard.c
+++ b/hald/linux/addons/addon-keyboard.c
diff --git a/hald/linux2/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c
index f25a555a..f25a555a 100644
--- a/hald/linux2/addons/addon-macbookpro-backlight.c
+++ b/hald/linux/addons/addon-macbookpro-backlight.c
diff --git a/hald/linux2/addons/addon-pmu.c b/hald/linux/addons/addon-pmu.c
index 68b59fe9..68b59fe9 100644
--- a/hald/linux2/addons/addon-pmu.c
+++ b/hald/linux/addons/addon-pmu.c
diff --git a/hald/linux2/addons/addon-storage.c b/hald/linux/addons/addon-storage.c
index 1660abcd..1660abcd 100644
--- a/hald/linux2/addons/addon-storage.c
+++ b/hald/linux/addons/addon-storage.c
diff --git a/hald/linux2/addons/addon-usb-csr.c b/hald/linux/addons/addon-usb-csr.c
index cd1747dc..cd1747dc 100644
--- a/hald/linux2/addons/addon-usb-csr.c
+++ b/hald/linux/addons/addon-usb-csr.c
diff --git a/hald/linux2/apm.c b/hald/linux/apm.c
index e8554382..e8554382 100644
--- a/hald/linux2/apm.c
+++ b/hald/linux/apm.c
diff --git a/hald/linux2/apm.h b/hald/linux/apm.h
index 80d0de6a..80d0de6a 100644
--- a/hald/linux2/apm.h
+++ b/hald/linux/apm.h
diff --git a/hald/linux2/blockdev.c b/hald/linux/blockdev.c
index e40dd932..e40dd932 100644
--- a/hald/linux2/blockdev.c
+++ b/hald/linux/blockdev.c
diff --git a/hald/linux2/blockdev.h b/hald/linux/blockdev.h
index 9095d8c5..9095d8c5 100644
--- a/hald/linux2/blockdev.h
+++ b/hald/linux/blockdev.h
diff --git a/hald/linux2/classdev.c b/hald/linux/classdev.c
index 3e3a6679..3e3a6679 100644
--- a/hald/linux2/classdev.c
+++ b/hald/linux/classdev.c
diff --git a/hald/linux2/classdev.h b/hald/linux/classdev.h
index c88dc9b3..c88dc9b3 100644
--- a/hald/linux2/classdev.h
+++ b/hald/linux/classdev.h
diff --git a/hald/linux2/coldplug.c b/hald/linux/coldplug.c
index e47a90f5..e47a90f5 100644
--- a/hald/linux2/coldplug.c
+++ b/hald/linux/coldplug.c
diff --git a/hald/linux2/coldplug.h b/hald/linux/coldplug.h
index 7da868a7..7da868a7 100644
--- a/hald/linux2/coldplug.h
+++ b/hald/linux/coldplug.h
diff --git a/hald/linux2/hotplug.c b/hald/linux/hotplug.c
index 4eac8b9e..4eac8b9e 100644
--- a/hald/linux2/hotplug.c
+++ b/hald/linux/hotplug.c
diff --git a/hald/linux2/hotplug.h b/hald/linux/hotplug.h
index d93d6205..d93d6205 100644
--- a/hald/linux2/hotplug.h
+++ b/hald/linux/hotplug.h
diff --git a/hald/linux2/hotplug_helper.h b/hald/linux/hotplug_helper.h
index 27670374..27670374 100644
--- a/hald/linux2/hotplug_helper.h
+++ b/hald/linux/hotplug_helper.h
diff --git a/hald/linux2/ids.c b/hald/linux/ids.c
index 7cb41f30..7cb41f30 100644
--- a/hald/linux2/ids.c
+++ b/hald/linux/ids.c
diff --git a/hald/linux2/ids.h b/hald/linux/ids.h
index c1893202..c1893202 100644
--- a/hald/linux2/ids.h
+++ b/hald/linux/ids.h
diff --git a/hald/linux2/osspec.c b/hald/linux/osspec.c
index 9571d250..9571d250 100644
--- a/hald/linux2/osspec.c
+++ b/hald/linux/osspec.c
diff --git a/hald/linux2/osspec_linux.h b/hald/linux/osspec_linux.h
index 88d516c1..88d516c1 100644
--- a/hald/linux2/osspec_linux.h
+++ b/hald/linux/osspec_linux.h
diff --git a/hald/linux2/physdev.c b/hald/linux/physdev.c
index c2ae795b..c2ae795b 100644
--- a/hald/linux2/physdev.c
+++ b/hald/linux/physdev.c
diff --git a/hald/linux2/physdev.h b/hald/linux/physdev.h
index 6c16cc2f..6c16cc2f 100644
--- a/hald/linux2/physdev.h
+++ b/hald/linux/physdev.h
diff --git a/hald/linux2/pmu.c b/hald/linux/pmu.c
index 892fff14..892fff14 100644
--- a/hald/linux2/pmu.c
+++ b/hald/linux/pmu.c
diff --git a/hald/linux2/pmu.h b/hald/linux/pmu.h
index c8304b3e..c8304b3e 100644
--- a/hald/linux2/pmu.h
+++ b/hald/linux/pmu.h
diff --git a/hald/linux2/probing/.gitignore b/hald/linux/probing/.gitignore
index 226a9dbf..226a9dbf 100644
--- a/hald/linux2/probing/.gitignore
+++ b/hald/linux/probing/.gitignore
diff --git a/hald/linux2/probing/Makefile.am b/hald/linux/probing/Makefile.am
index a9f0342e..a66d858b 100644
--- a/hald/linux2/probing/Makefile.am
+++ b/hald/linux/probing/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
 	-I$(top_srcdir) \
 	@GLIB_CFLAGS@ @DBUS_CFLAGS@
 
-if HALD_COMPILE_LINUX2
+if HALD_COMPILE_LINUX
 libexec_PROGRAMS = hald-probe-input hald-probe-hiddev hald-probe-storage hald-probe-volume hald-probe-printer \
 	           hald-probe-pc-floppy hald-probe-smbios hald-probe-serial
 endif
diff --git a/hald/linux2/probing/linux_dvd_rw_utils.c b/hald/linux/probing/linux_dvd_rw_utils.c
index a75a0912..a75a0912 100644
--- a/hald/linux2/probing/linux_dvd_rw_utils.c
+++ b/hald/linux/probing/linux_dvd_rw_utils.c
diff --git a/hald/linux2/probing/linux_dvd_rw_utils.h b/hald/linux/probing/linux_dvd_rw_utils.h
index 5b6105a5..5b6105a5 100644
--- a/hald/linux2/probing/linux_dvd_rw_utils.h
+++ b/hald/linux/probing/linux_dvd_rw_utils.h
diff --git a/hald/linux2/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c
index fbc1861a..fbc1861a 100644
--- a/hald/linux2/probing/probe-hiddev.c
+++ b/hald/linux/probing/probe-hiddev.c
diff --git a/hald/linux2/probing/probe-input.c b/hald/linux/probing/probe-input.c
index 6a18990d..6a18990d 100644
--- a/hald/linux2/probing/probe-input.c
+++ b/hald/linux/probing/probe-input.c
diff --git a/hald/linux2/probing/probe-pc-floppy.c b/hald/linux/probing/probe-pc-floppy.c
index 7a66987e..7a66987e 100644
--- a/hald/linux2/probing/probe-pc-floppy.c
+++ b/hald/linux/probing/probe-pc-floppy.c
diff --git a/hald/linux2/probing/probe-printer.c b/hald/linux/probing/probe-printer.c
index bec6e9bb..bec6e9bb 100644
--- a/hald/linux2/probing/probe-printer.c
+++ b/hald/linux/probing/probe-printer.c
diff --git a/hald/linux2/probing/probe-serial.c b/hald/linux/probing/probe-serial.c
index b70f82ba..b70f82ba 100644
--- a/hald/linux2/probing/probe-serial.c
+++ b/hald/linux/probing/probe-serial.c
diff --git a/hald/linux2/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c
index 2beb8096..2beb8096 100644
--- a/hald/linux2/probing/probe-smbios.c
+++ b/hald/linux/probing/probe-smbios.c
diff --git a/hald/linux2/probing/probe-storage.c b/hald/linux/probing/probe-storage.c
index ed5f010f..7b84a642 100644
--- a/hald/linux2/probing/probe-storage.c
+++ b/hald/linux/probing/probe-storage.c
@@ -399,8 +399,8 @@ main (int argc, char *argv[])
 		if (vid != NULL) {
 			if (volume_id_probe_all (vid, 0, size) == 0) {
 				/* signal to hald that we've found something and a fakevolume
-				 * should be added - see hald/linux2/blockdev.c:add_blockdev_probing_helper_done()
-				 * and hald/linux2/blockdev.c:block_rescan_storage_done().
+				 * should be added - see hald/linux/blockdev.c:add_blockdev_probing_helper_done()
+				 * and hald/linux/blockdev.c:block_rescan_storage_done().
 				 */
 				if (vid->usage_id == VOLUME_ID_FILESYSTEM ||
 				    vid->usage_id == VOLUME_ID_RAID ||
diff --git a/hald/linux2/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
index 8a57e525..8a57e525 100644
--- a/hald/linux2/probing/probe-volume.c
+++ b/hald/linux/probing/probe-volume.c
diff --git a/hald/run-hald.sh b/hald/run-hald.sh
index f36ed5a6..69dd17eb 100755
--- a/hald/run-hald.sh
+++ b/hald/run-hald.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export HALD_RUNNER_PATH=`pwd`/linux2:`pwd`/linux2/probing:`pwd`/linux2/addons:`pwd`/.:`pwd`/../tools:`pwd`/../tools/linux
+export HALD_RUNNER_PATH=`pwd`/linux:`pwd`/linux/probing:`pwd`/linux/addons:`pwd`/.:`pwd`/../tools:`pwd`/../tools/linux
 export PATH=`pwd`/../hald-runner:$PATH
 export HAL_FDI_SOURCE_PREPROBE=../fdi/preprobe
 export HAL_FDI_SOURCE_INFORMATION=../fdi/information
diff --git a/hald/valgrind-hald.sh b/hald/valgrind-hald.sh
index 6a29bc5a..8f47d206 100755
--- a/hald/valgrind-hald.sh
+++ b/hald/valgrind-hald.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export HALD_RUNNER_PATH=`pwd`/linux2:`pwd`/linux2/probing:`pwd`/linux2/addons:`pwd`/.:`pwd`/../tools:`pwd`/../tools/linux
+export HALD_RUNNER_PATH=`pwd`/linux:`pwd`/linux/probing:`pwd`/linux/addons:`pwd`/.:`pwd`/../tools:`pwd`/../tools/linux
 export PATH=`pwd`/../hald-runner:$PATH
 export HAL_FDI_SOURCE_PREPROBE=../fdi/preprobe
 export HAL_FDI_SOURCE_INFORMATION=../fdi/information
diff --git a/tools/Makefile.am b/tools/Makefile.am
index b64c2c04..7d842382 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -3,7 +3,7 @@
 
 SUBDIRS = device-manager
 
-if HALD_COMPILE_LINUX2
+if HALD_COMPILE_LINUX
 SUBDIRS += linux
 endif
 if HALD_COMPILE_FREEBSD