IPFire-SCM July 2012

ipfire-scm@lists.ipfire.org

1 participants
47 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0a57d68881fb3189391c1ffce83b19d2db90df75
by git＠ipfire.org 31 Jul '12

31 Jul '12

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 3.x development tree". The branch, master has been updated via 0a57d68881fb3189391c1ffce83b19d2db90df75 (commit) via 3584874a1d765352313d6ee8508a3e9c3f0b459c (commit) via 9695493a47ff5e1c0fa3df93984c7f8f01e95213 (commit) via d8602e2a6aff73e4512d9b54a2d3a6b43a0fbc4a (commit) from a772829da5c360cf15c331bb275df534c653ab61 (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 0a57d68881fb3189391c1ffce83b19d2db90df75 Merge: 9695493 3584874 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jul 31 21:01:33 2012 +0200 Merge remote-tracking branch 'stevee/plymouth-update' commit 3584874a1d765352313d6ee8508a3e9c3f0b459c Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Jul 31 19:57:53 2012 +0200 plymouth: Update to 0.8.6.1. This release fixes a lot of problems with systemd. Apply a patch to create and link plymouth systemd services files and targets. commit 9695493a47ff5e1c0fa3df93984c7f8f01e95213 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Jul 31 18:30:00 2012 +0200 dracut: Now requires kpartx instead of multipath-tools. commit d8602e2a6aff73e4512d9b54a2d3a6b43a0fbc4a Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Jul 31 18:28:03 2012 +0200 multipath-tools: Update to latest development snapshot (120613). Introduce own package for kpartx, which is required by dracut. ----------------------------------------------------------------------- Summary of changes: dracut/dracut.nm | 4 +- multipath-tools/multipath-tools.nm | 61 +- multipath-tools/multipath.conf | 90 ++ .../patches/0001-RH-queue-without-daemon.patch | 165 --- .../patches/0001-RH-remove_callout.patch | 279 +++++ ...001-for-upstream-add-tpg_pref-prioritizer.patch | 123 --- .../patches/0002-RH-add-wwids-file.patch | 748 +++++++++++++ multipath-tools/patches/0002-RH-path-checker.patch | 198 ---- .../0002-for-upstream-add-tmo-config-options.patch | 511 --------- .../patches/0003-RH-add-followover.patch | 235 ++++ .../patches/0003-RH-root-init-script.patch | 84 -- .../0003-for-upstream-default-configs.patch | 56 - .../patches/0004-RH-fix-cciss-names.patch | 34 + multipath-tools/patches/0004-RH-fix-kpartx.patch | 48 - multipath-tools/patches/0005-RH-cciss_id.patch | 219 ---- .../0005-RH-dont_start_with_no_config.patch | 16 + .../patches/0006-RH-move-bindings.patch | 56 - ...changes.patch => 0006-RH-multipath.rules.patch} | 52 +- ...7-RH-Make-build-system-RH-Fedora-friendly.patch | 101 ++ .../patches/0007-RH-do-not-remove.patch | 39 - ...8-RH-Make-build-system-RH-Fedora-friendly.patch | 62 -- ...08-RH-multipathd-blacklist-all-by-default.patch | 64 ++ .../patches/0009-RH-add-mpathconf.patch | 494 +++++++++ ...09-RH-multipathd-blacklist-all-by-default.patch | 70 -- .../patches/0010-RH-add-find-multipaths.patch | 222 ++++ ...cker.patch => 0011-RH-add-hp_tur-checker.patch} | 145 ++- .../0011-RH-fix-init-script-LSB-headers.patch | 29 - ....patch => 0012-RH-RHEL5-style-partitions.patch} | 74 +- .../patches/0012-RH-udev-sync-support.patch | 362 ------ .../0013-RH-add-weighted_prio-prioritizer.patch | 546 --------- .../0013-RH-dont-remove-map-on-enomem.patch | 18 + .../patches/0014-RH-deprecate-uid-gid-mode.patch | 90 ++ .../0015-RH-add-multipathd-count-paths-cmd.patch | 150 --- .../patches/0015-RH-use-sync-support.patch | 17 + .../patches/0016-RH-change-configs.patch | 541 +++++++++ .../0016-RHBZ-554561-fix-init-error-msg.patch | 23 - .../patches/0017-RHBZ-554592-man-page-note.patch | 17 - .../patches/0018-RHBZ-554596-SUN-6540-config.patch | 57 - .../0019-RHBZ-554598-fix-multipath-locking.patch | 43 - .../0020-RHBZ-554605-fix-manual-failover.patch | 52 - .../0021-RHBZ-548874-add-find-multipaths.patch | 1153 -------------------- .../0023-RHBZ-557810-emc-invista-config.patch | 52 - .../patches/0024-RHBZ-565933-checker-timeout.patch | 428 -------- ...-create-missing-links-for-systemd-targets.patch | 71 ++ plymouth/patches/plymouth-no-gtk.patch | 31 - plymouth/plymouth.nm | 22 +- 46 files changed, 3243 insertions(+), 4709 deletions(-) create mode 100644 multipath-tools/multipath.conf delete mode 100644 multipath-tools/patches/0001-RH-queue-without-daemon.patch create mode 100644 multipath-tools/patches/0001-RH-remove_callout.patch delete mode 100644 multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch create mode 100644 multipath-tools/patches/0002-RH-add-wwids-file.patch delete mode 100644 multipath-tools/patches/0002-RH-path-checker.patch delete mode 100644 multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch create mode 100644 multipath-tools/patches/0003-RH-add-followover.patch delete mode 100644 multipath-tools/patches/0003-RH-root-init-script.patch delete mode 100644 multipath-tools/patches/0003-for-upstream-default-configs.patch create mode 100644 multipath-tools/patches/0004-RH-fix-cciss-names.patch delete mode 100644 multipath-tools/patches/0004-RH-fix-kpartx.patch delete mode 100644 multipath-tools/patches/0005-RH-cciss_id.patch create mode 100644 multipath-tools/patches/0005-RH-dont_start_with_no_config.patch delete mode 100644 multipath-tools/patches/0006-RH-move-bindings.patch rename multipath-tools/patches/{0010-RH-multipath-rules-udev-changes.patch => 0006-RH-multipath.rules.patch} (58%) create mode 100644 multipath-tools/patches/0007-RH-Make-build-system-RH-Fedora-friendly.patch delete mode 100644 multipath-tools/patches/0007-RH-do-not-remove.patch delete mode 100644 multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch create mode 100644 multipath-tools/patches/0008-RH-multipathd-blacklist-all-by-default.patch create mode 100644 multipath-tools/patches/0009-RH-add-mpathconf.patch delete mode 100644 multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch create mode 100644 multipath-tools/patches/0010-RH-add-find-multipaths.patch rename multipath-tools/patches/{0014-RH-add-hp_tur-checker.patch => 0011-RH-add-hp_tur-checker.patch} (58%) delete mode 100644 multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch rename multipath-tools/patches/{0022-RHBZ-557845-RHEL5-style-partitions.patch => 0012-RH-RHEL5-style-partitions.patch} (81%) delete mode 100644 multipath-tools/patches/0012-RH-udev-sync-support.patch delete mode 100644 multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch create mode 100644 multipath-tools/patches/0013-RH-dont-remove-map-on-enomem.patch create mode 100644 multipath-tools/patches/0014-RH-deprecate-uid-gid-mode.patch delete mode 100644 multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch create mode 100644 multipath-tools/patches/0015-RH-use-sync-support.patch create mode 100644 multipath-tools/patches/0016-RH-change-configs.patch delete mode 100644 multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch delete mode 100644 multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch delete mode 100644 multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch delete mode 100644 multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch delete mode 100644 multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch delete mode 100644 multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch delete mode 100644 multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch delete mode 100644 multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch create mode 100644 plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch delete mode 100644 plymouth/patches/plymouth-no-gtk.patch Difference in files: diff --git a/dracut/dracut.nm b/dracut/dracut.nm index 26be6f7..18d9329 100644 --- a/dracut/dracut.nm +++ b/dracut/dracut.nm @@ -5,7 +5,7 @@ name = dracut version = 019 -release = 1 +release = 2 arch = noarch groups = System/Boot @@ -78,11 +78,11 @@ packages gzip iputils kbd + kpartx less libselinux lvm2 mdadm - multipath-tools sysvinit udev util-linux diff --git a/multipath-tools/multipath-tools.nm b/multipath-tools/multipath-tools.nm index 57c0103..63b035a 100644 --- a/multipath-tools/multipath-tools.nm +++ b/multipath-tools/multipath-tools.nm @@ -4,9 +4,12 @@ ############################################################################### name = multipath-tools -version = 0.4.9 +version = %{rel_ver}.%{rel_date} release = 1 +rel_ver = 0.4.9 +rel_date = 120613 + groups = System/Base url = http://christophe.varoqui.free.fr/ license = GPL+ @@ -17,27 +20,77 @@ description instructing the device-mapper multipath kernel module what to do. end -source_dl = -sources = %{name}-091027.tar.gz +thisapp = %{name}-%{rel_date} + +sources = %{thisapp}.tgz build requires gzip libaio-devel libdevmapper-devel + libudev-devel ncurses-devel readline-devel end - DIR_APP = %{DIR_SRC}/%{name} + prepare_cmds + # Fix hardcoded install location for udev rules. + sed -e "s@lib/udev@usr/lib/udev@g" -i multipath/Makefile + end + + # Install everything to the correct locations. + make_install_targets +=\ + bindir=%{sbindir} \ + syslibdir=%{libdir} \ + libdir=%{libdir}/multipath \ + unitdir=%{unitdir} install_cmds + # Remove old SysV init script and folder. rm -rf %{BUILDROOT}/etc/rc.d + + # Install configuration file. + install -m 0664 %{DIR_SOURCE}/multipath.conf %{BUILDROOT}%{sysconfdir}/multipath.conf end end packages package %{name} + configfiles + /etc/multipath.conf + end + + script postin + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + /usr/bin/systemctl --no-reload disable multipathd.service >/dev/null 2>&1 || : + /usr/bin/systemctl stop multipathd.service >/dev/null 2>&1 || : + end + + script postun + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : + /usr/bin/systemctl try-restart multipathd.service >/dev/null 2>&1 || : + end + end + + package kpartx + summary = Partition manager for device-mapper devices. + description + kpartx manages partition creation and removal for device-mapper devices. + end + + files + %{sbindir}/kpartx + %{mandir}/man8/kpartx.8* + end + end package %{name}-devel template DEVEL diff --git a/multipath-tools/multipath.conf b/multipath-tools/multipath.conf new file mode 100644 index 0000000..6bbeadb --- /dev/null +++ b/multipath-tools/multipath.conf @@ -0,0 +1,90 @@ +# This is a basic configuration file with some examples, for device mapper +# multipath. +# For a complete list of the default configuration values, see +# /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf.defaults +# For a list of configuration options with descriptions, see +# /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf.annotated + +## By default, devices with vendor = "IBM" and product = "S/390.*" are +## blacklisted. To enable mulitpathing on these devies, uncomment the +## following lines. +#blacklist_exceptions { +# device { +# vendor "IBM" +# product "S/390.*" +# } +#} + +## Use user friendly names, instead of using WWIDs as names. +defaults { + user_friendly_names yes +} +## +## Here is an example of how to configure some standard options. +## +# +#defaults { +# udev_dir /dev +# polling_interval 10 +# selector "round-robin 0" +# path_grouping_policy multibus +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" +# prio alua +# path_checker readsector0 +# rr_min_io 100 +# max_fds 8192 +# rr_weight priorities +# failback immediate +# no_path_retry fail +# user_friendly_names yes +#} +## +## The wwid line in the following blacklist section is shown as an example +## of how to blacklist devices by wwid. The 2 devnode lines are the +## compiled in default blacklist. If you want to blacklist entire types +## of devices, such as all scsi devices, you should use a devnode line. +## However, if you want to blacklist specific devices, you should use +## a wwid line. Since there is no guarantee that a specific device will +## not change names on reboot (from /dev/sda to /dev/sdb for example) +## devnode lines are not recommended for blacklisting specific devices. +## +#blacklist { +# wwid 26353900f02796769 +# devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" +# devnode "^hd[a-z]" +#} +#multipaths { +# multipath { +# wwid 3600508b4000156d700012000000b0000 +# alias yellow +# path_grouping_policy multibus +# path_checker readsector0 +# path_selector "round-robin 0" +# failback manual +# rr_weight priorities +# no_path_retry 5 +# } +# multipath { +# wwid 1DEC_____321816758474 +# alias red +# } +#} +#devices { +# device { +# vendor "COMPAQ " +# product "HSV110 (C)COMPAQ" +# path_grouping_policy multibus +# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" +# path_checker readsector0 +# path_selector "round-robin 0" +# hardware_handler "0" +# failback 15 +# rr_weight priorities +# no_path_retry queue +# } +# device { +# vendor "COMPAQ " +# product "MSA1000 " +# path_grouping_policy multibus +# } +#} diff --git a/multipath-tools/patches/0001-RH-queue-without-daemon.patch b/multipath-tools/patches/0001-RH-queue-without-daemon.patch deleted file mode 100644 index 3834bfc..0000000 --- a/multipath-tools/patches/0001-RH-queue-without-daemon.patch +++ /dev/null @@ -1,165 +0,0 @@ -From 8191fb07d8212e29ad44370abb60e174e1c34bb5 Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Tue, 13 Oct 2009 08:15:15 +0200 -Subject: [PATCH 01/12] RH: queue without daemon - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 50a728c... 86b1320... M libmultipath/config.h -:100644 100644 ee4de68... 7888e8e... M libmultipath/dict.c -:100644 100644 afd1246... 2e7a0d1... M libmultipath/structs.h -:100644 100644 c222da4... 9afa615... M multipath.conf.annotated -:100644 100644 3e0fd6e... 44d1329... M multipath.conf.synthetic -:100644 100644 41a9bd0... 90de6df... M multipathd/main.c - libmultipath/config.h | 1 + - libmultipath/dict.c | 35 +++++++++++++++++++++++++++++++++++ - libmultipath/structs.h | 6 ++++++ - multipath.conf.annotated | 9 +++++++++ - multipath.conf.synthetic | 1 + - multipathd/main.c | 5 +++++ - 6 files changed, 57 insertions(+), 0 deletions(-) - -Index: multipath-tools/libmultipath/config.h -=================================================================== ---- multipath-tools.orig/libmultipath/config.h -+++ multipath-tools/libmultipath/config.h -@@ -74,6 +74,7 @@ struct config { - int pg_timeout; - int max_fds; - int force_reload; -+ int queue_without_daemon; - int daemon; - int flush_on_last_del; - int attribute_flags; -Index: multipath-tools/libmultipath/dict.c -=================================================================== ---- multipath-tools.orig/libmultipath/dict.c -+++ multipath-tools/libmultipath/dict.c -@@ -362,6 +362,28 @@ def_no_path_retry_handler(vector strvec) - } - - static int -+def_queue_without_daemon(vector strvec) -+{ -+ char * buff; -+ -+ buff = set_value(strvec); -+ if (!buff) -+ return 1; -+ -+ if (!strncmp(buff, "off", 3) || !strncmp(buff, "no", 2) || -+ !strncmp(buff, "0", 1)) -+ conf->queue_without_daemon = QUE_NO_DAEMON_OFF; -+ else if (!strncmp(buff, "on", 2) || !strncmp(buff, "yes", 3) || -+ !strncmp(buff, "1", 1)) -+ conf->queue_without_daemon = QUE_NO_DAEMON_ON; -+ else -+ conf->queue_without_daemon = QUE_NO_DAEMON_UNDEF; -+ -+ free(buff); -+ return 0; -+} -+ -+static int - def_pg_timeout_handler(vector strvec) - { - int pg_timeout; -@@ -1944,6 +1966,18 @@ snprint_def_no_path_retry (char * buff, - } - - static int -+snprint_def_queue_without_daemon (char * buff, int len, void * data) -+{ -+ switch (conf->queue_without_daemon) { -+ case QUE_NO_DAEMON_OFF: -+ return snprintf(buff, len, "no"); -+ case QUE_NO_DAEMON_ON: -+ return snprintf(buff, len, "yes"); -+ } -+ return 0; -+} -+ -+static int - snprint_def_pg_timeout (char * buff, int len, void * data) - { - if (conf->pg_timeout == DEFAULT_PGTIMEOUT) -@@ -2029,6 +2063,7 @@ init_keywords(void) - install_keyword("max_fds", &max_fds_handler, &snprint_max_fds); - install_keyword("rr_weight", &def_weight_handler, &snprint_def_rr_weight); - install_keyword("no_path_retry", &def_no_path_retry_handler, &snprint_def_no_path_retry); -+ install_keyword("queue_without_daemon", &def_queue_without_daemon, &snprint_def_queue_without_daemon); - install_keyword("pg_timeout", &def_pg_timeout_handler, &snprint_def_pg_timeout); - install_keyword("flush_on_last_del", &def_flush_on_last_del_handler, &snprint_def_flush_on_last_del); - install_keyword("user_friendly_names", &names_handler, &snprint_def_user_friendly_names); -Index: multipath-tools/libmultipath/structs.h -=================================================================== ---- multipath-tools.orig/libmultipath/structs.h -+++ multipath-tools/libmultipath/structs.h -@@ -63,6 +63,12 @@ enum pgstates { - PGSTATE_ACTIVE - }; - -+enum queue_without_daemon_states { -+ QUE_NO_DAEMON_UNDEF, -+ QUE_NO_DAEMON_OFF, -+ QUE_NO_DAEMON_ON, -+}; -+ - enum pgtimeouts { - PGTIMEOUT_UNDEF, - PGTIMEOUT_NONE -Index: multipath-tools/multipath.conf.annotated -=================================================================== ---- multipath-tools.orig/multipath.conf.annotated -+++ multipath-tools/multipath.conf.annotated -@@ -153,6 +153,15 @@ - # no_path_retry queue - # - # # -+# # name : queue_without_daemon -+# # scope : multipathd -+# # desc : If set to "no", multipathd will disable queueing for all -+# # devices when it is shut down. -+# # values : yes|no -+# # default : yes -+# queue_without_daemon no -+# -+# # - # # name : user_friendly_names - # # scope : multipath - # # desc : If set to "yes", using the bindings file -Index: multipath-tools/multipath.conf.synthetic -=================================================================== ---- multipath-tools.orig/multipath.conf.synthetic -+++ multipath-tools/multipath.conf.synthetic -@@ -16,6 +16,7 @@ - # rr_weight priorities - # failback immediate - # no_path_retry fail -+# queue_without_daemon no - # user_friendly_names no - # mode 644 - # uid 0 -Index: multipath-tools/multipathd/main.c -=================================================================== ---- multipath-tools.orig/multipathd/main.c -+++ multipath-tools/multipathd/main.c -@@ -1334,6 +1334,8 @@ child (void * param) - pthread_t check_thr, uevent_thr, uxlsnr_thr; - pthread_attr_t log_attr, misc_attr; - struct vectors * vecs; -+ struct multipath * mpp; -+ int i; - - mlockall(MCL_CURRENT | MCL_FUTURE); - -@@ -1422,6 +1424,9 @@ child (void * param) - */ - block_signal(SIGHUP, NULL); - lock(vecs->lock); -+ if (conf->queue_without_daemon == QUE_NO_DAEMON_OFF) -+ vector_foreach_slot(vecs->mpvec, mpp, i) -+ dm_queue_if_no_path(mpp->alias, 0); - remove_maps_and_stop_waiters(vecs); - free_pathvec(vecs->pathvec, FREE_PATHS); - diff --git a/multipath-tools/patches/0001-RH-remove_callout.patch b/multipath-tools/patches/0001-RH-remove_callout.patch new file mode 100644 index 0000000..0c03cc4 --- /dev/null +++ b/multipath-tools/patches/0001-RH-remove_callout.patch @@ -0,0 +1,279 @@ +--- + libmultipath/Makefile | 2 + libmultipath/callout.c | 217 ----------------------------------------------- + libmultipath/callout.h | 7 - + libmultipath/discovery.c | 1 + multipathd/main.c | 1 + 5 files changed, 1 insertion(+), 227 deletions(-) + +Index: multipath-tools-120518/libmultipath/Makefile +=================================================================== +--- multipath-tools-120518.orig/libmultipath/Makefile ++++ multipath-tools-120518/libmultipath/Makefile +@@ -9,7 +9,7 @@ DEVLIB = libmultipath.so + LIBS = $(DEVLIB).$(SONAME) + LIBDEPS = -lpthread -ldl -ldevmapper -ludev + +-OBJS = memory.o parser.o vector.o devmapper.o callout.o \ ++OBJS = memory.o parser.o vector.o devmapper.o \ + hwtable.o blacklist.o util.o dmparser.o config.o \ + structs.o discovery.o propsel.o dict.o \ + pgpolicies.o debug.o regex.o defaults.o uevent.o \ +Index: multipath-tools-120518/libmultipath/callout.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/callout.c ++++ /dev/null +@@ -1,217 +0,0 @@ +-/* +- * Source: copy of the udev package source file +- * +- * Copyrights of the source file apply +- * Copyright (c) 2004 Christophe Varoqui +- */ +-#include <stdio.h> +-#include <sys/stat.h> +-#include <string.h> +-#include <unistd.h> +-#include <sys/types.h> +-#include <stdlib.h> +-#include <fcntl.h> +-#include <sys/wait.h> +-#include <errno.h> +- +-#include "checkers.h" +-#include "vector.h" +-#include "structs.h" +-#include "util.h" +-#include "debug.h" +- +-int execute_program(char *path, char *value, int len) +-{ +- int retval; +- int count; +- int status; +- int fds[2], null_fd; +- pid_t pid; +- char *pos; +- char arg[CALLOUT_MAX_SIZE]; +- int argc = sizeof(arg) / 2; +- char *argv[argc + 1]; +- int i; +- +- i = 0; +- +- if (strchr(path, ' ')) { +- strlcpy(arg, path, sizeof(arg)); +- pos = arg; +- while (pos != NULL && i < argc) { +- if (pos[0] == '\'') { +- /* don't separate if in apostrophes */ +- pos++; +- argv[i] = strsep(&pos, "\'"); +- while (pos[0] == ' ') +- pos++; +- } else { +- argv[i] = strsep(&pos, " "); +- } +- i++; +- } +- } else { +- argv[i++] = path; +- } +- argv[i] = NULL; +- +- retval = pipe(fds); +- +- if (retval != 0) { +- condlog(0, "error creating pipe for callout: %s", strerror(errno)); +- return -1; +- } +- +- pid = fork(); +- +- switch(pid) { +- case 0: +- /* child */ +- close(STDOUT_FILENO); +- +- /* dup write side of pipe to STDOUT */ +- if (dup(fds[1]) < 0) +- return -1; +- +- /* Ignore writes to stderr */ +- null_fd = open("/dev/null", O_WRONLY); +- if (null_fd > 0) { +- close(STDERR_FILENO); +- dup(null_fd); +- close(null_fd); +- } +- +- retval = execv(argv[0], argv); +- condlog(0, "error execing %s : %s", argv[0], strerror(errno)); +- exit(-1); +- case -1: +- condlog(0, "fork failed: %s", strerror(errno)); +- close(fds[0]); +- close(fds[1]); +- return -1; +- default: +- /* parent reads from fds[0] */ +- close(fds[1]); +- retval = 0; +- i = 0; +- while (1) { +- count = read(fds[0], value + i, len - i-1); +- if (count <= 0) +- break; +- +- i += count; +- if (i >= len-1) { +- condlog(0, "not enough space for response from %s", argv[0]); +- retval = -1; +- break; +- } +- } +- +- if (count < 0) { +- condlog(0, "no response from %s", argv[0]); +- retval = -1; +- } +- +- if (i > 0 && value[i-1] == '\n') +- i--; +- value[i] = '\0'; +- +- wait(&status); +- close(fds[0]); +- +- retval = -1; +- if (WIFEXITED(status)) { +- status = WEXITSTATUS(status); +- if (status == 0) +- retval = 0; +- else +- condlog(0, "%s exitted with %d", argv[0], status); +- } +- else if (WIFSIGNALED(status)) +- condlog(0, "%s was terminated by signal %d", argv[0], WTERMSIG(status)); +- else +- condlog(0, "%s terminated abnormally", argv[0]); +- } +- return retval; +-} +- +-extern int +-apply_format (char * string, char * cmd, struct path * pp) +-{ +- char * pos; +- char * dst; +- char * p; +- char * q; +- int len; +- int myfree; +- +- if (!string) +- return 1; +- +- if (!cmd) +- return 1; +- +- dst = cmd; +- p = dst; +- pos = strchr(string, '%'); +- myfree = CALLOUT_MAX_SIZE; +- +- if (!pos) { +- strcpy(dst, string); +- return 0; +- } +- +- len = (int) (pos - string) + 1; +- myfree -= len; +- +- if (myfree < 2) +- return 1; +- +- snprintf(p, len, "%s", string); +- p += len - 1; +- pos++; +- +- switch (*pos) { +- case 'n': +- len = strlen(pp->dev) + 1; +- myfree -= len; +- +- if (myfree < 2) +- return 1; +- +- snprintf(p, len, "%s", pp->dev); +- for (q = p; q < p + len; q++) { +- if (q && *q == '!') +- *q = '/'; +- } +- p += len - 1; +- break; +- case 'd': +- len = strlen(pp->dev_t) + 1; +- myfree -= len; +- +- if (myfree < 2) +- return 1; +- +- snprintf(p, len, "%s", pp->dev_t); +- p += len - 1; +- break; +- default: +- break; +- } +- pos++; +- +- if (!*pos) +- return 0; +- +- len = strlen(pos) + 1; +- myfree -= len; +- +- if (myfree < 2) +- return 1; +- +- snprintf(p, len, "%s", pos); +- condlog(3, "reformated callout = %s", dst); +- return 0; +-} +- +Index: multipath-tools-120518/libmultipath/callout.h +=================================================================== +--- multipath-tools-120518.orig/libmultipath/callout.h ++++ /dev/null +@@ -1,7 +0,0 @@ +-#ifndef _CALLOUT_H +-#define _CALLOUT_H +- +-int execute_program(char *, char *, int); +-int apply_format (char *, char *, struct path *); +- +-#endif /* _CALLOUT_H */ +Index: multipath-tools-120518/libmultipath/discovery.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/discovery.c ++++ multipath-tools-120518/libmultipath/discovery.c +@@ -20,7 +20,6 @@ + #include "structs.h" + #include "config.h" + #include "blacklist.h" +-#include "callout.h" + #include "debug.h" + #include "propsel.h" + #include "sg_include.h" +Index: multipath-tools-120518/multipathd/main.c +=================================================================== +--- multipath-tools-120518.orig/multipathd/main.c ++++ multipath-tools-120518/multipathd/main.c +@@ -35,7 +35,6 @@ + #include <hwtable.h> + #include <defaults.h> + #include <structs.h> +-#include <callout.h> + #include <blacklist.h> + #include <structs_vec.h> + #include <dmparser.h> diff --git a/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch b/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch deleted file mode 100644 index 93b0af2..0000000 --- a/multipath-tools/patches/0001-for-upstream-add-tpg_pref-prioritizer.patch +++ /dev/null @@ -1,123 +0,0 @@ -From faf6bfc96b98562626e0ea12aecb582032ff4cab Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Mon, 19 Oct 2009 07:02:02 +0200 -Subject: [PATCH 1/1] for-upstream: add tpg_pref prioritizer - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 fc9277f... 1f40859... M libmultipath/prio.h -:100644 100644 949a60a... 5021c04... M libmultipath/prioritizers/Makefile -:100644 100644 0048a44... 22513ab... M libmultipath/prioritizers/alua.c -:100644 100644 0531052... cd9c29d... M libmultipath/prioritizers/alua_rtpg.c -:100644 100644 bddbbdd... daf95a6... M libmultipath/prioritizers/alua_spc3.h - libmultipath/prio.h | 1 + - libmultipath/prioritizers/Makefile | 10 ++++++++++ - libmultipath/prioritizers/alua.c | 7 +++++++ - libmultipath/prioritizers/alua_rtpg.c | 4 ++++ - libmultipath/prioritizers/alua_spc3.h | 6 ++++++ - 5 files changed, 28 insertions(+), 0 deletions(-) - -diff --git a/libmultipath/prio.h b/libmultipath/prio.h -index fc9277f..1f40859 100644 ---- a/libmultipath/prio.h -+++ b/libmultipath/prio.h -@@ -16,6 +16,7 @@ - * Known prioritizers for use in hwtable.c - */ - #define PRIO_ALUA "alua" -+#define PRIO_TPG_PREF "tpg_pref" - #define PRIO_CONST "const" - #define PRIO_EMC "emc" - #define PRIO_HDS "hds" -diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile -index 949a60a..5021c04 100644 ---- a/libmultipath/prioritizers/Makefile -+++ b/libmultipath/prioritizers/Makefile -@@ -11,6 +11,7 @@ LIBS = \ - libprioemc.so \ - libpriordac.so \ - libprioalua.so \ -+ libpriotpg_pref.so \ - libprionetapp.so \ - libpriohds.so - -@@ -21,9 +22,18 @@ all: $(LIBS) - libprioalua.so: alua.o alua_rtpg.o - $(CC) $(SHARED_FLAGS) -o $@ $^ - -+libpriotpg_pref.so: pref.o pref_rtpg.o -+ $(CC) $(SHARED_FLAGS) -o $@ $^ -+ - libprio%.so: %.o - $(CC) $(SHARED_FLAGS) -o $@ $^ - -+pref.o: alua.c -+ $(CC) $(CFLAGS) -DTPG_PREF -c -o $@ $< -+ -+pref_rtpg.o: alua_rtpg.c -+ $(CC) $(CFLAGS) -DTPG_PREF -c -o $@ $< -+ - install: $(LIBS) - $(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir) - -diff --git a/libmultipath/prioritizers/alua.c b/libmultipath/prioritizers/alua.c -index 0048a44..22513ab 100644 ---- a/libmultipath/prioritizers/alua.c -+++ b/libmultipath/prioritizers/alua.c -@@ -28,6 +28,12 @@ - int - get_alua_info(int fd) - { -+#ifdef TPG_PREF -+ char * aas_string[] = { -+ [AAS_OPTIMIZED] = "preferred", -+ [AAS_STANDBY] = "non-preferred", -+ }; -+#else - char * aas_string[] = { - [AAS_OPTIMIZED] = "active/optimized", - [AAS_NON_OPTIMIZED] = "active/non-optimized", -@@ -35,6 +41,7 @@ get_alua_info(int fd) - [AAS_UNAVAILABLE] = "unavailable", - [AAS_TRANSITIONING] = "transitioning between states", - }; -+#endif - int rc; - int tpg; - -diff --git a/libmultipath/prioritizers/alua_rtpg.c b/libmultipath/prioritizers/alua_rtpg.c -index 0531052..cd9c29d 100644 ---- a/libmultipath/prioritizers/alua_rtpg.c -+++ b/libmultipath/prioritizers/alua_rtpg.c -@@ -293,7 +293,11 @@ get_asymmetric_access_state(int fd, unsigned int tpg) - "group.\n"); - } else { - PRINT_DEBUG("pref=%i\n", dscr->b0); -+#ifdef TPG_PREF -+ rc = rtpg_tpg_dscr_get_pref(dscr); -+#else - rc = rtpg_tpg_dscr_get_aas(dscr); -+#endif - } - } - } -diff --git a/libmultipath/prioritizers/alua_spc3.h b/libmultipath/prioritizers/alua_spc3.h -index bddbbdd..daf95a6 100644 ---- a/libmultipath/prioritizers/alua_spc3.h -+++ b/libmultipath/prioritizers/alua_spc3.h -@@ -302,6 +302,12 @@ rtpg_tpg_dscr_get_aas(struct rtpg_tpg_dscr *d) - return (d->b0 & 0x0f); - } - -+static inline int -+rtpg_tpg_dscr_get_pref(struct rtpg_tpg_dscr *d) -+{ -+ return ((d->b0 & 0x80)?AAS_OPTIMIZED:AAS_STANDBY); -+} -+ - struct rtpg_data { - unsigned char length[4]; /* size-4 */ - struct rtpg_tpg_dscr data[0]; --- -1.6.5.1 - diff --git a/multipath-tools/patches/0002-RH-add-wwids-file.patch b/multipath-tools/patches/0002-RH-add-wwids-file.patch new file mode 100644 index 0000000..f3014ba --- /dev/null +++ b/multipath-tools/patches/0002-RH-add-wwids-file.patch @@ -0,0 +1,748 @@ +--- + libmultipath/Makefile | 2 + libmultipath/alias.c | 153 --------------------------------------- + libmultipath/alias.h | 1 + libmultipath/configure.c | 3 + libmultipath/defaults.h | 1 + libmultipath/discovery.c | 2 + libmultipath/file.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++ + libmultipath/file.h | 11 ++ + libmultipath/wwids.c | 139 ++++++++++++++++++++++++++++++++++++ + libmultipath/wwids.h | 18 ++++ + multipath/main.c | 37 ++++++++- + 11 files changed, 389 insertions(+), 158 deletions(-) + +Index: multipath-tools-120518/libmultipath/alias.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/alias.c ++++ multipath-tools-120518/libmultipath/alias.c +@@ -3,19 +3,16 @@ + * Copyright (c) 2005 Benjamin Marzinski, Redhat + */ + #include <stdlib.h> +-#include <sys/types.h> +-#include <sys/stat.h> +-#include <fcntl.h> + #include <errno.h> + #include <unistd.h> + #include <string.h> + #include <limits.h> + #include <stdio.h> +-#include <signal.h> + + #include "debug.h" + #include "uxsock.h" + #include "alias.h" ++#include "file.h" + + + /* +@@ -36,150 +33,6 @@ + * See the file COPYING included with this distribution for more details. + */ + +-static int +-ensure_directories_exist(char *str, mode_t dir_mode) +-{ +- char *pathname; +- char *end; +- int err; +- +- pathname = strdup(str); +- if (!pathname){ +- condlog(0, "Cannot copy bindings file pathname : %s", +- strerror(errno)); +- return -1; +- } +- end = pathname; +- /* skip leading slashes */ +- while (end && *end && (*end == '/')) +- end++; +- +- while ((end = strchr(end, '/'))) { +- /* if there is another slash, make the dir. */ +- *end = '\0'; +- err = mkdir(pathname, dir_mode); +- if (err && errno != EEXIST) { +- condlog(0, "Cannot make directory [%s] : %s", +- pathname, strerror(errno)); +- free(pathname); +- return -1; +- } +- if (!err) +- condlog(3, "Created dir [%s]", pathname); +- *end = '/'; +- end++; +- } +- free(pathname); +- return 0; +-} +- +-static void +-sigalrm(int sig) +-{ +- /* do nothing */ +-} +- +-static int +-lock_bindings_file(int fd) +-{ +- struct sigaction act, oldact; +- sigset_t set, oldset; +- struct flock lock; +- int err; +- +- memset(&lock, 0, sizeof(lock)); +- lock.l_type = F_WRLCK; +- lock.l_whence = SEEK_SET; +- +- act.sa_handler = sigalrm; +- sigemptyset(&act.sa_mask); +- act.sa_flags = 0; +- sigemptyset(&set); +- sigaddset(&set, SIGALRM); +- +- sigaction(SIGALRM, &act, &oldact); +- sigprocmask(SIG_UNBLOCK, &set, &oldset); +- +- alarm(BINDINGS_FILE_TIMEOUT); +- err = fcntl(fd, F_SETLKW, &lock); +- alarm(0); +- +- if (err) { +- if (errno != EINTR) +- condlog(0, "Cannot lock bindings file : %s", +- strerror(errno)); +- else +- condlog(0, "Bindings file is locked. Giving up."); +- } +- +- sigprocmask(SIG_SETMASK, &oldset, NULL); +- sigaction(SIGALRM, &oldact, NULL); +- return err; +- +-} +- +- +-static int +-open_bindings_file(char *file, int *can_write) +-{ +- int fd; +- struct stat s; +- +- if (ensure_directories_exist(file, 0700)) +- return -1; +- *can_write = 1; +- fd = open(file, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); +- if (fd < 0) { +- if (errno == EROFS) { +- *can_write = 0; +- condlog(3, "Cannot open bindings file [%s] read/write. " +- " trying readonly", file); +- fd = open(file, O_RDONLY); +- if (fd < 0) { +- condlog(0, "Cannot open bindings file [%s] " +- "readonly : %s", file, strerror(errno)); +- return -1; +- } +- } +- else { +- condlog(0, "Cannot open bindings file [%s] : %s", file, +- strerror(errno)); +- return -1; +- } +- } +- if (*can_write && lock_bindings_file(fd) < 0) +- goto fail; +- +- memset(&s, 0, sizeof(s)); +- if (fstat(fd, &s) < 0){ +- condlog(0, "Cannot stat bindings file : %s", strerror(errno)); +- goto fail; +- } +- if (s.st_size == 0) { +- if (*can_write == 0) +- goto fail; +- /* If bindings file is empty, write the header */ +- size_t len = strlen(BINDINGS_FILE_HEADER); +- if (write_all(fd, BINDINGS_FILE_HEADER, len) != len) { +- condlog(0, +- "Cannot write header to bindings file : %s", +- strerror(errno)); +- /* cleanup partially written header */ +- if (ftruncate(fd, 0)) +- condlog(0, "Cannot truncate the header : %s", +- strerror(errno)); +- goto fail; +- } +- fsync(fd); +- condlog(3, "Initialized new bindings file [%s]", file); +- } +- +- return fd; +- +-fail: +- close(fd); +- return -1; +-} + + static int + format_devname(char *name, int id, int len, char *prefix) +@@ -370,7 +223,7 @@ get_user_friendly_alias(char *wwid, char + return NULL; + } + +- fd = open_bindings_file(file, &can_write); ++ fd = open_file(file, &can_write, BINDINGS_FILE_HEADER); + if (fd < 0) + return NULL; + +@@ -414,7 +267,7 @@ get_user_friendly_wwid(char *alias, char + return NULL; + } + +- fd = open_bindings_file(file, &unused); ++ fd = open_file(file, &unused, BINDINGS_FILE_HEADER); + if (fd < 0) + return NULL; + +Index: multipath-tools-120518/libmultipath/alias.h +=================================================================== +--- multipath-tools-120518.orig/libmultipath/alias.h ++++ multipath-tools-120518/libmultipath/alias.h +@@ -1,4 +1,3 @@ +-#define BINDINGS_FILE_TIMEOUT 30 + #define BINDINGS_FILE_HEADER \ + "# Multipath bindings, Version : 1.0\n" \ + "# NOTE: this file is automatically maintained by the multipath program.\n" \ +Index: multipath-tools-120518/libmultipath/configure.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/configure.c ++++ multipath-tools-120518/libmultipath/configure.c +@@ -37,6 +37,7 @@ + #include "prio.h" + #include "util.h" + #include "uxsock.h" ++#include "wwids.h" + + extern int + setup_map (struct multipath * mpp, char * params, int params_size) +@@ -407,6 +408,8 @@ domap (struct multipath * mpp, char * pa + * DM_DEVICE_CREATE, DM_DEVICE_RENAME, or DM_DEVICE_RELOAD + * succeeded + */ ++ if (mpp->action == ACT_CREATE) ++ remember_wwid(mpp->wwid); + if (!conf->daemon) { + /* multipath client mode */ + dm_switchgroup(mpp->alias, mpp->bestpg); +Index: multipath-tools-120518/libmultipath/defaults.h +=================================================================== +--- multipath-tools-120518.orig/libmultipath/defaults.h ++++ multipath-tools-120518/libmultipath/defaults.h +@@ -24,5 +24,6 @@ + #define DEFAULT_SOCKET "/var/run/multipathd.sock" + #define DEFAULT_CONFIGFILE "/etc/multipath.conf" + #define DEFAULT_BINDINGS_FILE "/etc/multipath/bindings" ++#define DEFAULT_WWIDS_FILE "/etc/multipath/wwids" + + char * set_default (char * str); +Index: multipath-tools-120518/libmultipath/file.c +=================================================================== +--- /dev/null ++++ multipath-tools-120518/libmultipath/file.c +@@ -0,0 +1,180 @@ ++/* ++ * Copyright (c) 2005 Christophe Varoqui ++ * Copyright (c) 2005 Benjamin Marzinski, Redhat ++ */ ++#include <stdlib.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> ++#include <errno.h> ++#include <unistd.h> ++#include <string.h> ++#include <limits.h> ++#include <stdio.h> ++#include <signal.h> ++ ++#include "file.h" ++#include "debug.h" ++#include "uxsock.h" ++ ++ ++/* ++ * significant parts of this file were taken from iscsi-bindings.c of the ++ * linux-iscsi project. ++ * Copyright (C) 2002 Cisco Systems, Inc. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * See the file COPYING included with this distribution for more details. ++ */ ++ ++static int ++ensure_directories_exist(char *str, mode_t dir_mode) ++{ ++ char *pathname; ++ char *end; ++ int err; ++ ++ pathname = strdup(str); ++ if (!pathname){ ++ condlog(0, "Cannot copy file pathname %s : %s", ++ str, strerror(errno)); ++ return -1; ++ } ++ end = pathname; ++ /* skip leading slashes */ ++ while (end && *end && (*end == '/')) ++ end++; ++ ++ while ((end = strchr(end, '/'))) { ++ /* if there is another slash, make the dir. */ ++ *end = '\0'; ++ err = mkdir(pathname, dir_mode); ++ if (err && errno != EEXIST) { ++ condlog(0, "Cannot make directory [%s] : %s", ++ pathname, strerror(errno)); ++ free(pathname); ++ return -1; ++ } ++ if (!err) ++ condlog(3, "Created dir [%s]", pathname); ++ *end = '/'; ++ end++; ++ } ++ free(pathname); ++ return 0; ++} ++ ++static void ++sigalrm(int sig) ++{ ++ /* do nothing */ ++} ++ ++static int ++lock_file(int fd, char *file_name) ++{ ++ struct sigaction act, oldact; ++ sigset_t set, oldset; ++ struct flock lock; ++ int err; ++ ++ memset(&lock, 0, sizeof(lock)); ++ lock.l_type = F_WRLCK; ++ lock.l_whence = SEEK_SET; ++ ++ act.sa_handler = sigalrm; ++ sigemptyset(&act.sa_mask); ++ act.sa_flags = 0; ++ sigemptyset(&set); ++ sigaddset(&set, SIGALRM); ++ ++ sigaction(SIGALRM, &act, &oldact); ++ sigprocmask(SIG_UNBLOCK, &set, &oldset); ++ ++ alarm(FILE_TIMEOUT); ++ err = fcntl(fd, F_SETLKW, &lock); ++ alarm(0); ++ ++ if (err) { ++ if (errno != EINTR) ++ condlog(0, "Cannot lock %s : %s", file_name, ++ strerror(errno)); ++ else ++ condlog(0, "%s is locked. Giving up.", file_name); ++ } ++ ++ sigprocmask(SIG_SETMASK, &oldset, NULL); ++ sigaction(SIGALRM, &oldact, NULL); ++ return err; ++} ++ ++int ++open_file(char *file, int *can_write, char *header) ++{ ++ int fd; ++ struct stat s; ++ ++ if (ensure_directories_exist(file, 0700)) ++ return -1; ++ *can_write = 1; ++ fd = open(file, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); ++ if (fd < 0) { ++ if (errno == EROFS) { ++ *can_write = 0; ++ condlog(3, "Cannot open file [%s] read/write. " ++ " trying readonly", file); ++ fd = open(file, O_RDONLY); ++ if (fd < 0) { ++ condlog(0, "Cannot open file [%s] " ++ "readonly : %s", file, strerror(errno)); ++ return -1; ++ } ++ } ++ else { ++ condlog(0, "Cannot open file [%s] : %s", file, ++ strerror(errno)); ++ return -1; ++ } ++ } ++ if (*can_write && lock_file(fd, file) < 0) ++ goto fail; ++ ++ memset(&s, 0, sizeof(s)); ++ if (fstat(fd, &s) < 0){ ++ condlog(0, "Cannot stat file %s : %s", file, strerror(errno)); ++ goto fail; ++ } ++ if (s.st_size == 0) { ++ if (*can_write == 0) ++ goto fail; ++ /* If file is empty, write the header */ ++ size_t len = strlen(header); ++ if (write_all(fd, header, len) != len) { ++ condlog(0, ++ "Cannot write header to file %s : %s", file, ++ strerror(errno)); ++ /* cleanup partially written header */ ++ if (ftruncate(fd, 0)) ++ condlog(0, "Cannot truncate header : %s", ++ strerror(errno)); ++ goto fail; ++ } ++ fsync(fd); ++ condlog(3, "Initialized new file [%s]", file); ++ } ++ ++ return fd; ++ ++fail: ++ close(fd); ++ return -1; ++} +Index: multipath-tools-120518/libmultipath/file.h +=================================================================== +--- /dev/null ++++ multipath-tools-120518/libmultipath/file.h +@@ -0,0 +1,11 @@ ++/* ++ * Copyright (c) 2010 Benjamin Marzinski, Redhat ++ */ ++ ++#ifndef _FILE_H ++#define _FILE_H ++ ++#define FILE_TIMEOUT 30 ++int open_file(char *file, int *can_write, char *header); ++ ++#endif /* _FILE_H */ +Index: multipath-tools-120518/multipath/main.c +=================================================================== +--- multipath-tools-120518.orig/multipath/main.c ++++ multipath-tools-120518/multipath/main.c +@@ -53,6 +53,7 @@ + #include <errno.h> + #include <sys/time.h> + #include <sys/resource.h> ++#include <wwids.h> + #include "dev_t.h" + + int logsink; +@@ -82,7 +83,7 @@ usage (char * progname) + { + fprintf (stderr, VERSION_STRING); + fprintf (stderr, "Usage:\n"); +- fprintf (stderr, " %s [-d] [-r] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); ++ fprintf (stderr, " %s [-c] [-d] [-r] [-v lvl] [-p pol] [-b fil] [-q] [dev]\n", progname); + fprintf (stderr, " %s -l|-ll|-f [-v lvl] [-b fil] [dev]\n", progname); + fprintf (stderr, " %s -F [-v lvl]\n", progname); + fprintf (stderr, " %s -t\n", progname); +@@ -95,6 +96,7 @@ usage (char * progname) + " -ll show multipath topology (maximum info)\n" \ + " -f flush a multipath device map\n" \ + " -F flush all multipath device maps\n" \ ++ " -c check if a device should be a path in a multipath device\n" \ + " -q allow queue_if_no_path when multipathd is not running\n"\ + " -d dry run, do not create or update devmaps\n" \ + " -t dump internal hardware table\n" \ +@@ -209,6 +211,7 @@ get_dm_mpvec (vector curmp, vector pathv + + if (!conf->dry_run) + reinstate_paths(mpp); ++ remember_wwid(mpp->wwid); + } + return 0; + } +@@ -259,9 +262,13 @@ configure (void) + * if we have a blacklisted device parameter, exit early + */ + if (dev && +- (filter_devnode(conf->blist_devnode, conf->elist_devnode, dev) > 0)) +- goto out; +- ++ (filter_devnode(conf->blist_devnode, ++ conf->elist_devnode, dev) > 0)) { ++ if (conf->dry_run == 2) ++ printf("%s is not a valid multipath device path\n", ++ conf->dev); ++ goto out; ++ } + /* + * scope limiting must be translated into a wwid + * failing the translation is fatal (by policy) +@@ -277,6 +284,15 @@ configure (void) + if (filter_wwid(conf->blist_wwid, conf->elist_wwid, + refwwid) > 0) + goto out; ++ if (conf->dry_run == 2) { ++ if (check_wwids_file(refwwid, 0) == 0){ ++ printf("%s is a valid multipath device path\n", conf->dev); ++ r = 0; ++ } ++ else ++ printf("%s is not a valid multipath device path\n", conf->dev); ++ goto out; ++ } + } + + /* +@@ -412,7 +428,7 @@ main (int argc, char *argv[]) + if (load_config(DEFAULT_CONFIGFILE)) + exit(1); + +- while ((arg = getopt(argc, argv, ":dhl::FfM:v:p:b:Brtq")) != EOF ) { ++ while ((arg = getopt(argc, argv, ":dchl::FfM:v:p:b:Brtq")) != EOF ) { + switch(arg) { + case 1: printf("optarg : %s\n",optarg); + break; +@@ -434,8 +450,12 @@ main (int argc, char *argv[]) + case 'q': + conf->allow_queueing = 1; + break; ++ case 'c': ++ conf->dry_run = 2; ++ break; + case 'd': +- conf->dry_run = 1; ++ if (!conf->dry_run) ++ conf->dry_run = 1; + break; + case 'f': + conf->remove = FLUSH_ONE; +@@ -517,6 +537,11 @@ main (int argc, char *argv[]) + } + dm_init(); + ++ if (conf->dry_run == 2 && ++ (!conf->dev || conf->dev_type == DEV_DEVMAP)) { ++ condlog(0, "the -c option requires a path to check"); ++ goto out; ++ } + if (conf->remove == FLUSH_ONE) { + if (conf->dev_type == DEV_DEVMAP) + r = dm_flush_map(conf->dev); +Index: multipath-tools-120518/libmultipath/Makefile +=================================================================== +--- multipath-tools-120518.orig/libmultipath/Makefile ++++ multipath-tools-120518/libmultipath/Makefile +@@ -15,7 +15,7 @@ OBJS = memory.o parser.o vector.o devmap + pgpolicies.o debug.o regex.o defaults.o uevent.o \ + switchgroup.o uxsock.o print.o alias.o log_pthread.o \ + log.o configure.o structs_vec.o sysfs.o prio.o checkers.o \ +- lock.o waiter.o ++ lock.o waiter.o file.o wwids.o + + LIBDM_API_FLUSH = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_no_flush' /usr/include/libdevmapper.h) + +Index: multipath-tools-120518/libmultipath/wwids.c +=================================================================== +--- /dev/null ++++ multipath-tools-120518/libmultipath/wwids.c +@@ -0,0 +1,139 @@ ++#include <stdlib.h> ++#include <errno.h> ++#include <unistd.h> ++#include <string.h> ++#include <limits.h> ++#include <stdio.h> ++ ++#include "checkers.h" ++#include "vector.h" ++#include "structs.h" ++#include "debug.h" ++#include "uxsock.h" ++#include "file.h" ++#include "wwids.h" ++#include "defaults.h" ++ ++/* ++ * Copyright (c) 2010 Benjamin Marzinski, Redhat ++ */ ++ ++static int ++lookup_wwid(FILE *f, char *wwid) { ++ int c; ++ char buf[LINE_MAX]; ++ int count; ++ ++ while ((c = fgetc(f)) != EOF){ ++ if (c != '/') { ++ if (fgets(buf, LINE_MAX, f) == NULL) ++ return 0; ++ else ++ continue; ++ } ++ count = 0; ++ while ((c = fgetc(f)) != '/') { ++ if (c == EOF) ++ return 0; ++ if (count >= WWID_SIZE - 1) ++ goto next; ++ if (wwid[count] == '\0') ++ goto next; ++ if (c != wwid[count++]) ++ goto next; ++ } ++ if (wwid[count] == '\0') ++ return 1; ++next: ++ if (fgets(buf, LINE_MAX, f) == NULL) ++ return 0; ++ } ++ return 0; ++} ++ ++static int ++write_out_wwid(int fd, char *wwid) { ++ int ret; ++ off_t offset; ++ char buf[WWID_SIZE + 3]; ++ ++ ret = snprintf(buf, WWID_SIZE + 3, "/%s/\n", wwid); ++ if (ret >= (WWID_SIZE + 3) || ret < 0){ ++ condlog(0, "can't format wwid for writing (%d) : %s", ++ ret, strerror(errno)); ++ return -1; ++ } ++ offset = lseek(fd, 0, SEEK_END); ++ if (offset < 0) { ++ condlog(0, "can't seek to the end of wwids file : %s", ++ strerror(errno)); ++ return -1; ++ } ++ if (write_all(fd, buf, strlen(buf)) != strlen(buf)) { ++ condlog(0, "cannot write wwid to wwids file : %s", ++ strerror(errno)); ++ if (ftruncate(fd, offset)) ++ condlog(0, "cannot truncate failed wwid write : %s", ++ strerror(errno)); ++ return -1; ++ } ++ return 1; ++} ++ ++int ++check_wwids_file(char *wwid, int write_wwid) ++{ ++ int fd, can_write, found, ret; ++ FILE *f; ++ fd = open_file(DEFAULT_WWIDS_FILE, &can_write, WWIDS_FILE_HEADER); ++ if (fd < 0) ++ return -1; ++ ++ f = fdopen(fd, "r"); ++ if (!f) { ++ condlog(0,"can't fdopen wwids file : %s", strerror(errno)); ++ close(fd); ++ return -1; ++ } ++ found = lookup_wwid(f, wwid); ++ if (found) { ++ ret = 0; ++ goto out; ++ } ++ if (!write_wwid) { ++ ret = -1; ++ goto out; ++ } ++ if (!can_write) { ++ condlog(0, "wwids file is read-only. Can't write wwid"); ++ ret = -1; ++ goto out; ++ } ++ ++ if (fflush(f) != 0) { ++ condlog(0, "cannot fflush wwids file stream : %s", ++ strerror(errno)); ++ ret = -1; ++ goto out; ++ } ++ ++ ret = write_out_wwid(fd, wwid); ++out: ++ fclose(f); ++ return ret; ++} ++ ++int ++remember_wwid(char *wwid) ++{ ++ int ret = check_wwids_file(wwid, 1); ++ if (ret < 0){ ++ condlog(3, "failed writing wwid %s to wwids file", wwid); ++ return -1; ++ } ++ if (ret == 1) ++ condlog(3, "wrote wwid %s to wwids file", wwid); ++ else ++ condlog(4, "wwid %s already in wwids file", wwid); ++ return 0; ++} +Index: multipath-tools-120518/libmultipath/wwids.h +=================================================================== +--- /dev/null ++++ multipath-tools-120518/libmultipath/wwids.h +@@ -0,0 +1,18 @@ ++/* ++ * Copyright (c) 2010 Benjamin Marzinski, Redhat ++ */ ++ ++#ifndef _WWIDS_H ++#define _WWIDS_H ++ ++#define WWIDS_FILE_HEADER \ ++"# Multipath wwids, Version : 1.0\n" \ ++"# NOTE: This file is automatically maintained by multipath and multipathd.\n" \ ++"# You should not need to edit this file in normal circumstances.\n" \ ++"#\n" \ ++"# Valid WWIDs:\n" ++ ++int remember_wwid(char *wwid); ++int check_wwids_file(char *wwid, int write_wwid); ++ ++#endif /* _WWIDS_H */ +Index: multipath-tools-120518/libmultipath/discovery.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/discovery.c ++++ multipath-tools-120518/libmultipath/discovery.c +@@ -810,6 +810,8 @@ get_uid (struct path * pp) + + memset(pp->wwid, 0, WWID_SIZE); + value = udev_device_get_property_value(pp->udev, pp->uid_attribute); ++ if ((!value || strlen(value) == 0) && conf->dry_run == 2) ++ value = getenv(pp->uid_attribute); + if (value && strlen(value)) { + size_t len = WWID_SIZE; + diff --git a/multipath-tools/patches/0002-RH-path-checker.patch b/multipath-tools/patches/0002-RH-path-checker.patch deleted file mode 100644 index 37864ed..0000000 --- a/multipath-tools/patches/0002-RH-path-checker.patch +++ /dev/null @@ -1,198 +0,0 @@ -From f9ddbc18b7580f75c15bf6f3e10f08d6f016caca Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Tue, 13 Oct 2009 08:18:00 +0200 -Subject: [PATCH 02/12] RH: path checker - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 e06dc52... 47107a2... M libmultipath/checkers/tur.c -:100644 100644 98d1618... 00aa5ea... M libmultipath/discovery.c -:100644 100644 7283f36... 17cd4af... M libmultipath/discovery.h -:100644 100644 90de6df... 5d3625a... M multipathd/main.c - libmultipath/checkers/tur.c | 1 - - libmultipath/discovery.c | 62 +++++++++++++++++++++++++++++++++--------- - libmultipath/discovery.h | 2 + - multipathd/main.c | 21 +------------- - 4 files changed, 52 insertions(+), 34 deletions(-) - -Index: multipath-tools/libmultipath/checkers/tur.c -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/tur.c -+++ multipath-tools/libmultipath/checkers/tur.c -@@ -69,7 +69,6 @@ libcheck_check (struct checker * c) - case DID_NO_CONNECT: - case DID_BAD_TARGET: - case DID_ABORT: -- case DID_TRANSPORT_DISRUPTED: - case DID_TRANSPORT_FAILFAST: - break; - default: -Index: multipath-tools/libmultipath/discovery.c -=================================================================== ---- multipath-tools.orig/libmultipath/discovery.c -+++ multipath-tools/libmultipath/discovery.c -@@ -616,10 +616,9 @@ struct sysfs_device *sysfs_device_from_p - } - - int --path_offline (struct path * pp) -+path_state (struct path * pp, char * buff) - { - struct sysfs_device * parent; -- char buff[SCSI_STATE_SIZE]; - - pp->sysdev = sysfs_device_from_path(pp); - if (!pp->sysdev) { -@@ -641,6 +640,16 @@ path_offline (struct path * pp) - return 1; - - condlog(3, "%s: state = %s", pp->dev, buff); -+ return 0; -+} -+ -+int -+path_offline (struct path * pp) -+{ -+ char buff[SCSI_STATE_SIZE]; -+ -+ if (path_state(pp, buff)) -+ return 1; - - if (!strncmp(buff, "offline", 7)) { - pp->offline = 1; -@@ -650,6 +659,21 @@ path_offline (struct path * pp) - return 0; - } - -+int -+path_blocked (struct path * pp) -+{ -+ char buff[SCSI_STATE_SIZE]; -+ -+ if (pp->bus != SYSFS_BUS_SCSI) -+ return 0; -+ if (path_state(pp, buff)) -+ return 0; -+ if (!strncmp(buff, "blocked", 7)) { -+ return 1; -+ } -+ return 0; -+} -+ - extern int - sysfs_pathinfo(struct path * pp) - { -@@ -736,36 +760,43 @@ cciss_ioctl_pathinfo (struct path * pp, - return 0; - } - --static int --get_state (struct path * pp) -+int -+get_state (struct path * pp, int daemon) - { - struct checker * c = &pp->checker; -+ int state; - - condlog(3, "%s: get_state", pp->dev); - - if (!checker_selected(c)) { -+ if (daemon) -+ pathinfo(pp, conf->hwtable, DI_SYSFS); - select_checker(pp); - if (!checker_selected(c)) { - condlog(3, "%s: No checker selected", pp->dev); -- return 1; -+ return PATH_UNCHECKED; - } - checker_set_fd(c, pp->fd); - if (checker_init(c, pp->mpp?&pp->mpp->mpcontext:NULL)) { - condlog(3, "%s: checker init failed", pp->dev); -- return 1; -+ return PATH_UNCHECKED; - } - } - if (path_offline(pp)) { - condlog(3, "%s: path offline", pp->dev); -- pp->state = PATH_DOWN; -- return 0; -+ return PATH_DOWN; - } -- pp->state = checker_check(c); -- condlog(3, "%s: state = %i", pp->dev, pp->state); -- if (pp->state == PATH_DOWN && strlen(checker_message(c))) -+ if (daemon) { -+ if (path_blocked(pp)) -+ return PATH_PENDING; -+ checker_set_async(c); -+ } -+ state = checker_check(c); -+ condlog(3, "%s: state = %i", pp->dev, state); -+ if (state == PATH_DOWN && strlen(checker_message(c))) - condlog(3, "%s: checker msg is \"%s\"", - pp->dev, checker_message(c)); -- return 0; -+ return state; - } - - static int -@@ -850,8 +881,11 @@ pathinfo (struct path *pp, vector hwtabl - cciss_ioctl_pathinfo(pp, mask)) - goto blank; - -- if (mask & DI_CHECKER && get_state(pp)) -- goto blank; -+ if (mask & DI_CHECKER) { -+ pp->state = get_state(pp, 0); -+ if (pp->state == PATH_UNCHECKED || pp->state == PATH_WILD) -+ goto blank; -+ } - - /* - * Retrieve path priority, even for PATH_DOWN paths if it has never -Index: multipath-tools/libmultipath/discovery.h -=================================================================== ---- multipath-tools.orig/libmultipath/discovery.h -+++ multipath-tools/libmultipath/discovery.h -@@ -30,6 +30,8 @@ int path_discovery (vector pathvec, stru - int do_tur (char *); - int devt2devname (char *, char *); - int path_offline (struct path *); -+int get_state (struct path * pp, int daemon); -+int path_blocked (struct path *); - int pathinfo (struct path *, vector hwtable, int mask); - struct path * store_pathinfo (vector pathvec, vector hwtable, - char * devname, int flag); -Index: multipath-tools/multipathd/main.c -=================================================================== ---- multipath-tools.orig/multipathd/main.c -+++ multipath-tools/multipathd/main.c -@@ -908,26 +908,9 @@ check_path (struct vectors * vecs, struc - */ - pp->tick = conf->checkint; - -- if (!checker_selected(&pp->checker)) { -- pathinfo(pp, conf->hwtable, DI_SYSFS); -- select_checker(pp); -- } -- if (!checker_selected(&pp->checker)) { -- condlog(0, "%s: checker is not set", pp->dev); -- return; -- } -- /* -- * Set checker in async mode. -- * Honored only by checker implementing the said mode. -- */ -- checker_set_async(&pp->checker); -- -- if (path_offline(pp)) -- newstate = PATH_DOWN; -- else -- newstate = checker_check(&pp->checker); -+ newstate = get_state(pp, 1); - -- if (newstate < 0) { -+ if (newstate == PATH_WILD || newstate == PATH_UNCHECKED) { - condlog(2, "%s: unusable path", pp->dev); - pathinfo(pp, conf->hwtable, 0); - return; diff --git a/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch b/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch deleted file mode 100644 index dba3659..0000000 --- a/multipath-tools/patches/0002-for-upstream-add-tmo-config-options.patch +++ /dev/null @@ -1,511 +0,0 @@ ---- - libmultipath/config.h | 4 + - libmultipath/configure.c | 3 + - libmultipath/dict.c | 102 +++++++++++++++++++++++++++++++++++++++++++++ - libmultipath/discovery.c | 37 ++++++++++++++++ - libmultipath/discovery.h | 1 - libmultipath/propsel.c | 42 ++++++++++++++++++ - libmultipath/propsel.h | 2 - libmultipath/structs.h | 2 - libmultipath/sysfs.c | 56 ++++++++++++++++++++++++ - libmultipath/sysfs.h | 3 - - multipath.conf.annotated | 38 ++++++++++++++++ - multipath/multipath.conf.5 | 15 ++++++ - 12 files changed, 303 insertions(+), 2 deletions(-) - -Index: multipath-tools-091020/multipath.conf.annotated -=================================================================== ---- multipath-tools-091020.orig/multipath.conf.annotated -+++ multipath-tools-091020/multipath.conf.annotated -@@ -191,6 +191,25 @@ - # # default : determined by the process - # gid disk - # -+# # -+# # name : fast_io_fail_tmo -+# # scope : multipath & multipathd -+# # desc : The number of seconds the scsi layer will wait after a -+# # problem has been detected on a FC remote port before failing -+# # IO to devices on that remote port. -+# # values : off | n >= 0 (smaller than dev_loss_tmo) -+# # default : determined by the OS -+# fast_io_fail_tmo 5 -+# -+# # -+# # name : dev_loss_tmo -+# # scope : multipath & multipathd -+# # desc : The number of seconds the scsi layer will wait after a -+# # problem has been detected on a FC remote port before -+# # removing it from the system. -+# # values : n > 0 -+# # default : determined by the OS -+# dev_loss_tmo 600 - #} - # - ## -@@ -504,7 +523,6 @@ - # # desc : If set to "yes", multipathd will disable queueing - # # when the last path to a device has been deleted. - # # values : yes|no --# # default : no - # # - # flush_on_last_del yes - # -@@ -514,6 +532,24 @@ - # # desc : product strings to blacklist for this vendor - # # - # product_blacklist LUN_Z -+# -+# # -+# # name : fast_io_fail_tmo -+# # scope : multipath & multipathd -+# # desc : The number of seconds the scsi layer will wait after -+# # a problem has been detected on a FC remote port -+# # before failing IO to devices on that remote port. -+# # values : off | n >= 0 (smaller than dev_loss_tmo) -+# fast_io_fail_tmo 5 -+# -+# # -+# # name : dev_loss_tmo -+# # scope : multipath & multipathd -+# # desc : The number of seconds the scsi layer will wait after -+# # a problem has been detected on a FC remote port -+# # before removing it from the system. -+# # values : n > 0 -+# dev_loss_tmo 600 - # } - # device { - # vendor "COMPAQ " -Index: multipath-tools-091020/multipath/multipath.conf.5 -=================================================================== ---- multipath-tools-091020.orig/multipath/multipath.conf.5 -+++ multipath-tools-091020/multipath/multipath.conf.5 -@@ -240,6 +240,17 @@ this to the system limit from /proc/sys/ - maximum number of open fds is taken from the calling process. It is usually - 1024. To be safe, this should be set to the maximum number of paths plus 32, - if that number is greated than 1024. -+.TP -+.B fast_io_fail_tmo -+Specify the number of seconds the scsi layer will wait after a problem has been -+detected on a FC remote port before failing IO to devices on that remote port. -+This should be smaller than dev_loss_tmo. Setting this to -+.I off -+will disable the timeout. -+.TP -+.B dev_loss_tmo -+Specify the number of seconds the scsi layer will wait after a problem has -+been detected on a FC remote port before removing it from the system. - . - .SH "blacklist section" - The -@@ -384,6 +395,10 @@ section: - .B no_path_retry - .TP - .B rr_min_io -+.TP -+.B fast_io_fail_tmo -+.TP -+.B dev_loss_tmo - .RE - .PD - .LP -Index: multipath-tools-091020/libmultipath/dict.c -=================================================================== ---- multipath-tools-091020.orig/libmultipath/dict.c -+++ multipath-tools-091020/libmultipath/dict.c -@@ -37,6 +37,35 @@ polling_interval_handler(vector strvec) - } - - static int -+def_fast_io_fail_handler(vector strvec) -+{ -+ char * buff; -+ -+ buff = set_value(strvec); -+ if (strlen(buff) == 3 && !strcmp(buff, "off")) -+ conf->fast_io_fail = -1; -+ else if (sscanf(buff, "%d", &conf->fast_io_fail) != 1 || -+ conf->fast_io_fail < -1) -+ conf->fast_io_fail = 0; -+ -+ FREE(buff); -+ return 0; -+} -+ -+static int -+def_dev_loss_handler(vector strvec) -+{ -+ char * buff; -+ -+ buff = set_value(strvec); -+ if (sscanf(buff, "%u", &conf->dev_loss) != 1) -+ conf->dev_loss = 0; -+ -+ FREE(buff); -+ return 0; -+} -+ -+static int - verbosity_handler(vector strvec) - { - char * buff; -@@ -628,6 +657,37 @@ bl_product_handler(vector strvec) - } - - static int -+hw_fast_io_fail_handler(vector strvec) -+{ -+ char * buff; -+ struct hwentry * hwe = VECTOR_LAST_SLOT(conf->hwtable); -+ -+ buff = set_value(strvec); -+ if (strlen(buff) == 3 && !strcmp(buff, "off")) -+ hwe->fast_io_fail = -1; -+ else if (sscanf(buff, "%d", &hwe->fast_io_fail) != 1 || -+ hwe->fast_io_fail < -1) -+ hwe->fast_io_fail = 0; -+ -+ FREE(buff); -+ return 0; -+} -+ -+static int -+hw_dev_loss_handler(vector strvec) -+{ -+ char * buff; -+ struct hwentry * hwe = VECTOR_LAST_SLOT(conf->hwtable); -+ -+ buff = set_value(strvec); -+ if (sscanf(buff, "%u", &hwe->dev_loss) != 1) -+ hwe->dev_loss = 0; -+ -+ FREE(buff); -+ return 0; -+} -+ -+static int - hw_pgpolicy_handler(vector strvec) - { - char * buff; -@@ -1390,6 +1450,26 @@ snprint_mp_flush_on_last_del (char * buf - } - - static int -+snprint_hw_fast_io_fail(char * buff, int len, void * data) -+{ -+ struct hwentry * hwe = (struct hwentry *)data; -+ if (!hwe->fast_io_fail) -+ return 0; -+ if (hwe->fast_io_fail == -1) -+ return snprintf(buff, len, "off"); -+ return snprintf(buff, len, "%d", hwe->fast_io_fail); -+} -+ -+static int -+snprint_hw_dev_loss(char * buff, int len, void * data) -+{ -+ struct hwentry * hwe = (struct hwentry *)data; -+ if (!hwe->dev_loss) -+ return 0; -+ return snprintf(buff, len, "%u", hwe->dev_loss); -+} -+ -+static int - snprint_hw_vendor (char * buff, int len, void * data) - { - struct hwentry * hwe = (struct hwentry *)data; -@@ -1640,6 +1720,24 @@ snprint_def_polling_interval (char * buf - } - - static int -+snprint_def_fast_io_fail(char * buff, int len, void * data) -+{ -+ if (!conf->fast_io_fail) -+ return 0; -+ if (conf->fast_io_fail == -1) -+ return snprintf(buff, len, "off"); -+ return snprintf(buff, len, "%d", conf->fast_io_fail); -+} -+ -+static int -+snprint_def_dev_loss(char * buff, int len, void * data) -+{ -+ if (!conf->dev_loss) -+ return 0; -+ return snprintf(buff, len, "%u", conf->dev_loss); -+} -+ -+static int - snprint_def_verbosity (char * buff, int len, void * data) - { - if (conf->checkint == DEFAULT_VERBOSITY) -@@ -1937,6 +2035,8 @@ init_keywords(void) - install_keyword("mode", &def_mode_handler, &snprint_def_mode); - install_keyword("uid", &def_uid_handler, &snprint_def_uid); - install_keyword("gid", &def_gid_handler, &snprint_def_gid); -+ install_keyword("fast_io_fail_tmo", &def_fast_io_fail_handler, &snprint_def_fast_io_fail); -+ install_keyword("dev_loss_tmo", &def_dev_loss_handler, &snprint_def_dev_loss); - __deprecated install_keyword("default_selector", &def_selector_handler, NULL); - __deprecated install_keyword("default_path_grouping_policy", &def_pgpolicy_handler, NULL); - __deprecated install_keyword("default_getuid_callout", &def_getuid_callout_handler, NULL); -@@ -1991,6 +2091,8 @@ init_keywords(void) - install_keyword("rr_min_io", &hw_minio_handler, &snprint_hw_rr_min_io); - install_keyword("pg_timeout", &hw_pg_timeout_handler, &snprint_hw_pg_timeout); - install_keyword("flush_on_last_del", &hw_flush_on_last_del_handler, &snprint_hw_flush_on_last_del); -+ install_keyword("fast_io_fail_tmo", &hw_fast_io_fail_handler, &snprint_hw_fast_io_fail); -+ install_keyword("dev_loss_tmo", &hw_dev_loss_handler, &snprint_hw_dev_loss); - install_sublevel_end(); - - install_keyword_root("multipaths", &multipaths_handler); -Index: multipath-tools-091020/libmultipath/config.h -=================================================================== ---- multipath-tools-091020.orig/libmultipath/config.h -+++ multipath-tools-091020/libmultipath/config.h -@@ -31,6 +31,8 @@ struct hwentry { - int minio; - int pg_timeout; - int flush_on_last_del; -+ int fast_io_fail; -+ unsigned int dev_loss; - char * bl_product; - }; - -@@ -75,6 +77,8 @@ struct config { - int daemon; - int flush_on_last_del; - int attribute_flags; -+ int fast_io_fail; -+ unsigned int dev_loss; - uid_t uid; - gid_t gid; - mode_t mode; -Index: multipath-tools-091020/libmultipath/propsel.c -=================================================================== ---- multipath-tools-091020.orig/libmultipath/propsel.c -+++ multipath-tools-091020/libmultipath/propsel.c -@@ -428,6 +428,48 @@ select_pg_timeout(struct multipath *mp) - } - - extern int -+select_fast_io_fail(struct multipath *mp) -+{ -+ if (mp->hwe && mp->hwe->fast_io_fail) { -+ mp->fast_io_fail = mp->hwe->fast_io_fail; -+ if (mp->fast_io_fail == -1) -+ condlog(3, "%s: fast_io_fail_tmo = off (controller default)", mp->alias); -+ else -+ condlog(3, "%s: fast_io_fail_tmo = %d (controller default)", mp->alias, mp->fast_io_fail); -+ return 0; -+ } -+ if (conf->fast_io_fail) { -+ mp->fast_io_fail = conf->fast_io_fail; -+ if (mp->fast_io_fail == -1) -+ condlog(3, "%s: fast_io_fail_tmo = off (config file default)", mp->alias); -+ else -+ condlog(3, "%s: fast_io_fail_tmo = %d (config file default)", mp->alias, mp->fast_io_fail); -+ return 0; -+ } -+ mp->fast_io_fail = 0; -+ return 0; -+} -+ -+extern int -+select_dev_loss(struct multipath *mp) -+{ -+ if (mp->hwe && mp->hwe->dev_loss) { -+ mp->dev_loss = mp->hwe->dev_loss; -+ condlog(3, "%s: dev_loss_tmo = %u (controller default)", -+ mp->alias, mp->dev_loss); -+ return 0; -+ } -+ if (conf->dev_loss) { -+ mp->dev_loss = conf->dev_loss; -+ condlog(3, "%s: dev_loss_tmo = %u (config file default)", -+ mp->alias, mp->dev_loss); -+ return 0; -+ } -+ mp->dev_loss = 0; -+ return 0; -+} -+ -+extern int - select_flush_on_last_del(struct multipath *mp) - { - if (mp->flush_on_last_del == FLUSH_IN_PROGRESS) -Index: multipath-tools-091020/libmultipath/structs.h -=================================================================== ---- multipath-tools-091020.orig/libmultipath/structs.h -+++ multipath-tools-091020/libmultipath/structs.h -@@ -166,6 +166,8 @@ struct multipath { - int pg_timeout; - int flush_on_last_del; - int attribute_flags; -+ int fast_io_fail; -+ unsigned int dev_loss; - uid_t uid; - gid_t gid; - mode_t mode; -Index: multipath-tools-091020/libmultipath/configure.c -=================================================================== ---- multipath-tools-091020.orig/libmultipath/configure.c -+++ multipath-tools-091020/libmultipath/configure.c -@@ -70,7 +70,10 @@ setup_map (struct multipath * mpp) - select_mode(mpp); - select_uid(mpp); - select_gid(mpp); -+ select_fast_io_fail(mpp); -+ select_dev_loss(mpp); - -+ sysfs_set_scsi_tmo(mpp); - /* - * assign paths to path groups -- start with no groups and all paths - * in mpp->paths -Index: multipath-tools-091020/libmultipath/discovery.c -=================================================================== ---- multipath-tools-091020.orig/libmultipath/discovery.c -+++ multipath-tools-091020/libmultipath/discovery.c -@@ -204,6 +204,43 @@ sysfs_get_fc_nodename (struct sysfs_devi - return 1; - } - -+int -+sysfs_set_scsi_tmo (struct multipath *mpp) -+{ -+ char attr_path[SYSFS_PATH_SIZE]; -+ struct path *pp; -+ int i; -+ char value[11]; -+ -+ if (!mpp->dev_loss && !mpp->fast_io_fail) -+ return 0; -+ vector_foreach_slot(mpp->paths, pp, i) { -+ if (safe_snprintf(attr_path, SYSFS_PATH_SIZE, -+ "/class/fc_remote_ports/rport-%d:%d-%d", -+ pp->sg_id.host_no, pp->sg_id.channel, -+ pp->sg_id.scsi_id)) { -+ condlog(0, "attr_path '/class/fc_remote_ports/rport-%d:%d-%d' too large", pp->sg_id.host_no, pp->sg_id.channel, pp->sg_id.scsi_id); -+ return 1; -+ } -+ if (mpp->dev_loss){ -+ snprintf(value, 11, "%u", mpp->dev_loss); -+ if (sysfs_attr_set_value(attr_path, "dev_loss_tmo", -+ value)) -+ return 1; -+ } -+ if (mpp->fast_io_fail){ -+ if (mpp->fast_io_fail == -1) -+ sprintf(value, "off"); -+ else -+ snprintf(value, 11, "%u", mpp->fast_io_fail); -+ if (sysfs_attr_set_value(attr_path, "fast_io_fail", -+ value)) -+ return 1; -+ } -+ } -+ return 0; -+} -+ - static int - opennode (char * dev, int mode) - { -Index: multipath-tools-091020/libmultipath/propsel.h -=================================================================== ---- multipath-tools-091020.orig/libmultipath/propsel.h -+++ multipath-tools-091020/libmultipath/propsel.h -@@ -15,3 +15,5 @@ int select_minio(struct multipath *mp); - int select_mode(struct multipath *mp); - int select_uid(struct multipath *mp); - int select_gid(struct multipath *mp); -+int select_fast_io_fail(struct multipath *mp); -+int select_dev_loss(struct multipath *mp); -Index: multipath-tools-091020/libmultipath/discovery.h -=================================================================== ---- multipath-tools-091020.orig/libmultipath/discovery.h -+++ multipath-tools-091020/libmultipath/discovery.h -@@ -33,6 +33,7 @@ int path_offline (struct path *); - int pathinfo (struct path *, vector hwtable, int mask); - struct path * store_pathinfo (vector pathvec, vector hwtable, - char * devname, int flag); -+int sysfs_set_scsi_tmo (struct multipath *mpp); - - /* - * discovery bitmask -Index: multipath-tools-091020/libmultipath/sysfs.c -=================================================================== ---- multipath-tools-091020.orig/libmultipath/sysfs.c -+++ multipath-tools-091020/libmultipath/sysfs.c -@@ -356,6 +356,62 @@ void sysfs_device_put(struct sysfs_devic - return; - } - -+int -+sysfs_attr_set_value(const char *devpath, const char *attr_name, -+ const char *value) -+{ -+ char path_full[PATH_SIZE]; -+ int sysfs_len; -+ struct stat statbuf; -+ int fd, value_len, ret = -1; -+ -+ dbg("open '%s'/'%s'", devpath, attr_name); -+ sysfs_len = snprintf(path_full, PATH_SIZE, "%s%s/%s", sysfs_path, -+ devpath, attr_name); -+ if (sysfs_len >= PATH_SIZE || sysfs_len < 0) { -+ if (sysfs_len < 0) -+ dbg("cannot copy sysfs path %s%s/%s : %s", sysfs_path, -+ devpath, attr_name, strerror(errno)); -+ else -+ dbg("sysfs_path %s%s/%s too large", sysfs_path, -+ devpath, attr_name); -+ goto out; -+ } -+ -+ if (stat(path_full, &statbuf) != 0) { -+ dbg("stat '%s' failed: %s" path_full, strerror(errno)); -+ goto out; -+ } -+ -+ /* skip directories */ -+ if (S_ISDIR(statbuf.st_mode)) -+ goto out; -+ -+ if ((statbuf.st_mode & S_IWUSR) == 0) -+ goto out; -+ -+ fd = open(path_full, O_WRONLY); -+ if (fd < 0) { -+ dbg("attribute '%s' can not be opened: %s", -+ path_full, strerror(errno)); -+ goto out; -+ } -+ value_len = strlen(value) + 1; -+ ret = write(fd, value, value_len); -+ if (ret == value_len) -+ ret = 0; -+ else if (ret < 0) -+ dbg("write to %s failed: %s", path_full, strerror(errno)); -+ else { -+ dbg("tried to write %d to %s. Wrote %d\n", value_len, -+ path_full, ret); -+ ret = -1; -+ } -+out: -+ return ret; -+} -+ -+ - char *sysfs_attr_get_value(const char *devpath, const char *attr_name) - { - char path_full[PATH_SIZE]; -Index: multipath-tools-091020/libmultipath/sysfs.h -=================================================================== ---- multipath-tools-091020.orig/libmultipath/sysfs.h -+++ multipath-tools-091020/libmultipath/sysfs.h -@@ -22,5 +22,6 @@ void sysfs_device_put(struct sysfs_devic - char *sysfs_attr_get_value(const char *devpath, const char *attr_name); - int sysfs_resolve_link(char *path, size_t size); - int sysfs_get_size (struct sysfs_device * dev, unsigned long long * size); -- -+int sysfs_attr_set_value(const char *devpath, const char *attr_name, -+ const char *value); - #endif diff --git a/multipath-tools/patches/0003-RH-add-followover.patch b/multipath-tools/patches/0003-RH-add-followover.patch new file mode 100644 index 0000000..9aeecf4 --- /dev/null +++ b/multipath-tools/patches/0003-RH-add-followover.patch @@ -0,0 +1,235 @@ +--- + libmultipath/dict.c | 12 ++++++++++++ + libmultipath/discovery.c | 6 +++--- + libmultipath/print.c | 2 ++ + libmultipath/structs.h | 4 +++- + multipath/main.c | 2 +- + multipath/multipath.conf.5 | 5 +++++ + multipathd/main.c | 35 ++++++++++++++++++++++++++++++++++- + 7 files changed, 60 insertions(+), 6 deletions(-) + +Index: multipath-tools-120518/libmultipath/dict.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/dict.c ++++ multipath-tools-120518/libmultipath/dict.c +@@ -398,6 +398,8 @@ default_failback_handler(vector strvec) + conf->pgfailback = -FAILBACK_MANUAL; + else if (strlen(buff) == 9 && !strcmp(buff, "immediate")) + conf->pgfailback = -FAILBACK_IMMEDIATE; ++ else if (strlen(buff) == 10 && !strcmp(buff, "followover")) ++ conf->pgfailback = -FAILBACK_FOLLOWOVER; + else + conf->pgfailback = atoi(buff); + +@@ -1053,6 +1055,8 @@ hw_failback_handler(vector strvec) + hwe->pgfailback = -FAILBACK_MANUAL; + else if (strlen(buff) == 9 && !strcmp(buff, "immediate")) + hwe->pgfailback = -FAILBACK_IMMEDIATE; ++ else if (strlen(buff) == 10 && !strcmp(buff, "followover")) ++ hwe->pgfailback = -FAILBACK_FOLLOWOVER; + else + hwe->pgfailback = atoi(buff); + +@@ -1351,6 +1355,8 @@ mp_failback_handler(vector strvec) + mpe->pgfailback = -FAILBACK_MANUAL; + else if (strlen(buff) == 9 && !strcmp(buff, "immediate")) + mpe->pgfailback = -FAILBACK_IMMEDIATE; ++ else if (strlen(buff) == 10 && !strcmp(buff, "followover")) ++ mpe->pgfailback = -FAILBACK_FOLLOWOVER; + else + mpe->pgfailback = atoi(buff); + +@@ -1769,6 +1775,8 @@ snprint_mp_failback (char * buff, int le + return snprintf(buff, len, "manual"); + case -FAILBACK_IMMEDIATE: + return snprintf(buff, len, "immediate"); ++ case -FAILBACK_FOLLOWOVER: ++ return snprintf(buff, len, "followover"); + default: + return snprintf(buff, len, "%i", mpe->pgfailback); + } +@@ -2130,6 +2138,8 @@ snprint_hw_failback (char * buff, int le + return snprintf(buff, len, "manual"); + case -FAILBACK_IMMEDIATE: + return snprintf(buff, len, "immediate"); ++ case -FAILBACK_FOLLOWOVER: ++ return snprintf(buff, len, "followover"); + default: + return snprintf(buff, len, "%i", hwe->pgfailback); + } +@@ -2394,6 +2404,8 @@ snprint_def_failback (char * buff, int l + return snprintf(buff, len, "manual"); + case -FAILBACK_IMMEDIATE: + return snprintf(buff, len, "immediate"); ++ case -FAILBACK_FOLLOWOVER: ++ return snprintf(buff, len, "followover"); + default: + return snprintf(buff, len, "%i", conf->pgfailback); + } +Index: multipath-tools-120518/libmultipath/print.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/print.c ++++ multipath-tools-120518/libmultipath/print.c +@@ -143,6 +143,8 @@ snprint_failback (char * buff, size_t le + { + if (mpp->pgfailback == -FAILBACK_IMMEDIATE) + return snprintf(buff, len, "immediate"); ++ if (mpp->pgfailback == -FAILBACK_FOLLOWOVER) ++ return snprintf(buff, len, "followover"); + + if (!mpp->failback_tick) + return snprintf(buff, len, "-"); +Index: multipath-tools-120518/libmultipath/structs.h +=================================================================== +--- multipath-tools-120518.orig/libmultipath/structs.h ++++ multipath-tools-120518/libmultipath/structs.h +@@ -39,7 +39,8 @@ enum rr_weight_mode { + enum failback_mode { + FAILBACK_UNDEF, + FAILBACK_MANUAL, +- FAILBACK_IMMEDIATE ++ FAILBACK_IMMEDIATE, ++ FAILBACK_FOLLOWOVER + }; + + enum sysfs_buses { +@@ -151,6 +152,7 @@ struct path { + int offline; + int state; + int dmstate; ++ int chkrstate; + int failcount; + int priority; + int pgindex; +Index: multipath-tools-120518/multipathd/main.c +=================================================================== +--- multipath-tools-120518.orig/multipathd/main.c ++++ multipath-tools-120518/multipathd/main.c +@@ -995,6 +995,32 @@ mpvec_garbage_collector (struct vectors + } + } + ++/* This is called after a path has started working again. It the multipath ++ * device for this path uses the followover failback type, and this is the ++ * best pathgroup, and this is the first path in the pathgroup to come back ++ * up, then switch to this pathgroup */ ++static int ++followover_should_failback(struct path * pp) ++{ ++ struct pathgroup * pgp; ++ struct path *pp1; ++ int i; ++ ++ if (pp->mpp->pgfailback != -FAILBACK_FOLLOWOVER || ++ !pp->mpp->pg || !pp->pgindex || ++ pp->pgindex != pp->mpp->bestpg) ++ return 0; ++ ++ pgp = VECTOR_SLOT(pp->mpp->pg, pp->pgindex - 1); ++ vector_foreach_slot(pgp->paths, pp1, i) { ++ if (pp1 == pp) ++ continue; ++ if (pp1->chkrstate != PATH_DOWN && pp1->chkrstate != PATH_SHAKY) ++ return 0; ++ } ++ return 1; ++} ++ + static void + defered_failback_tick (vector mpvec) + { +@@ -1092,6 +1118,8 @@ check_path (struct vectors * vecs, struc + { + int newstate; + int new_path_up = 0; ++ int chkr_new_path_up = 0; ++ int oldchkrstate = pp->chkrstate; + + if (!pp->mpp) + return; +@@ -1130,6 +1158,7 @@ check_path (struct vectors * vecs, struc + pp->dev); + pp->dmstate = PSTATE_UNDEF; + } ++ pp->chkrstate = newstate; + if (newstate != pp->state) { + int oldstate = pp->state; + pp->state = newstate; +@@ -1182,6 +1211,9 @@ check_path (struct vectors * vecs, struc + + new_path_up = 1; + ++ if (oldchkrstate != PATH_UP && oldchkrstate != PATH_GHOST) ++ chkr_new_path_up = 1; ++ + /* + * if at least one path is up in a group, and + * the group is disabled, re-enable it +@@ -1233,7 +1265,8 @@ check_path (struct vectors * vecs, struc + (new_path_up || pp->mpp->failback_tick <= 0)) + pp->mpp->failback_tick = + pp->mpp->pgfailback + 1; +- else if (pp->mpp->pgfailback == -FAILBACK_IMMEDIATE) ++ else if (pp->mpp->pgfailback == -FAILBACK_IMMEDIATE || ++ (chkr_new_path_up && followover_should_failback(pp))) + switch_pathgroup(pp->mpp); + } + } +Index: multipath-tools-120518/multipath/multipath.conf.5 +=================================================================== +--- multipath-tools-120518.orig/multipath/multipath.conf.5 ++++ multipath-tools-120518/multipath/multipath.conf.5 +@@ -254,6 +254,11 @@ active paths. + .B manual + Do not perform automatic failback. + .TP ++.B followover ++Only perform automatic failback when the first path of a pathgroup ++becomes active. This keeps a node from automatically failing back when ++another node requested the failover. ++.TP + .B values > 0 + deferred failback (time to defer in seconds) + .TP +Index: multipath-tools-120518/libmultipath/discovery.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/discovery.c ++++ multipath-tools-120518/libmultipath/discovery.c +@@ -878,13 +878,13 @@ pathinfo (struct path *pp, vector hwtabl + + if (mask & DI_CHECKER) { + if (path_state == PATH_UP) { +- pp->state = get_state(pp, 0); ++ pp->chkrstate = pp->state = get_state(pp, 0); + if (pp->state == PATH_UNCHECKED || + pp->state == PATH_WILD) + goto blank; + } else { + condlog(3, "%s: path inaccessible", pp->dev); +- pp->state = path_state; ++ pp->chkrstate = pp->state = path_state; + } + } + +@@ -912,7 +912,7 @@ blank: + * Recoverable error, for example faulty or offline path + */ + memset(pp->wwid, 0, WWID_SIZE); +- pp->state = PATH_DOWN; ++ pp->chkrstate = pp->state = PATH_DOWN; + + return 0; + } +Index: multipath-tools-120518/multipath/main.c +=================================================================== +--- multipath-tools-120518.orig/multipath/main.c ++++ multipath-tools-120518/multipath/main.c +@@ -144,7 +144,7 @@ update_paths (struct multipath * mpp) + /* + * path is not in sysfs anymore + */ +- pp->state = PATH_DOWN; ++ pp->chkrstate = pp->state = PATH_DOWN; + continue; + } + pp->mpp = mpp; diff --git a/multipath-tools/patches/0003-RH-root-init-script.patch b/multipath-tools/patches/0003-RH-root-init-script.patch deleted file mode 100644 index c687537..0000000 --- a/multipath-tools/patches/0003-RH-root-init-script.patch +++ /dev/null @@ -1,84 +0,0 @@ -From e6a23cc9de85a66d774567515592bdbdba7b2ca4 Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Tue, 13 Oct 2009 08:19:01 +0200 -Subject: [PATCH 03/12] RH: root init script - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 ee776f0... e46b1b8... M multipathd/multipathd.init.redhat - multipathd/multipathd.init.redhat | 38 ++++++++++++++++++++++++++++++++++++- - 1 files changed, 37 insertions(+), 1 deletions(-) - -diff --git a/multipathd/multipathd.init.redhat b/multipathd/multipathd.init.redhat -index ee776f0..e46b1b8 100644 ---- a/multipathd/multipathd.init.redhat -+++ b/multipathd/multipathd.init.redhat -@@ -2,7 +2,7 @@ - # - # multipathd Starts the multipath daemon - # --# chkconfig: - 13 87 -+# chkconfig: - 06 87 - # description: Manages device-mapper multipath devices - - ### BEGIN INIT INFO -@@ -17,6 +17,7 @@ prog=`basename $DAEMON` - initdir=/etc/rc.d/init.d - lockdir=/var/lock/subsys - sysconfig=/etc/sysconfig -+syspath=/sys/block - - - . $initdir/functions -@@ -25,6 +26,36 @@ test -r $sysconfig/$prog && . $sysconfig/$prog - - RETVAL=0 - -+teardown_slaves() -+{ -+pushd $1 > /dev/null -+if [ -d "slaves" ]; then -+for slave in slaves/*; -+do -+ if [ "$slave" = "slaves/*" ]; then -+ read dev < $1/dev -+ tablename=`dmsetup table --target multipath | sed -n "s/$.*$: .* $dev .*/\1/p"` -+ if ! [ -z $tablename ]; then -+ echo "Root is on a multipathed device, multipathd can not be stopped" -+ exit 1 -+ fi -+ else -+ local_slave=`readlink -f $slave`; -+ teardown_slaves $local_slave; -+ fi -+ done -+ -+else -+ read dev < $1/dev -+ tablename=`dmsetup table --target multipath | sed -n "s/$.*$: .* $dev .*/\1/p"` -+ if ! [ -z $tablename ]; then -+ echo "Root is on a multipathed device, multipathd can not be stopped" -+ exit 1 -+ fi -+fi -+popd > /dev/null -+} -+ - # - # See how we were called. - # -@@ -39,6 +70,11 @@ start() { - } - - stop() { -+ root_dev=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/mtab) -+ dm_num=`dmsetup info -c --noheadings -o minor $root_dev` -+ root_dm_device="dm-$dm_num" -+ [ -d $syspath/$root_dm_device ] && teardown_slaves $syspath/$root_dm_device -+ - echo -n $"Stopping $prog daemon: " - killproc $DAEMON - RETVAL=$? --- -1.6.5.1 - diff --git a/multipath-tools/patches/0003-for-upstream-default-configs.patch b/multipath-tools/patches/0003-for-upstream-default-configs.patch deleted file mode 100644 index fdd6347..0000000 --- a/multipath-tools/patches/0003-for-upstream-default-configs.patch +++ /dev/null @@ -1,56 +0,0 @@ -Index: multipath-tools/libmultipath/hwtable.c -=================================================================== ---- multipath-tools.orig/libmultipath/hwtable.c -+++ multipath-tools/libmultipath/hwtable.c -@@ -425,6 +425,21 @@ static struct hwentry default_hw[] = { - .prio_name = PRIO_RDAC, - }, - { -+ .vendor = "IBM", -+ .product = "1745|1746", -+ .getuid = DEFAULT_GETUID, -+ .features = "2 pg_init_retries 50", -+ .hwhandler = "1 rdac", -+ .selector = DEFAULT_SELECTOR, -+ .pgpolicy = GROUP_BY_PRIO, -+ .pgfailback = -FAILBACK_IMMEDIATE, -+ .rr_weight = RR_WEIGHT_NONE, -+ .no_path_retry = 15, -+ .minio = DEFAULT_MINIO, -+ .checker_name = RDAC, -+ .prio_name = PRIO_RDAC, -+ }, -+ { - /* IBM DS4700 */ - .vendor = "IBM", - .product = "1814", -@@ -661,12 +676,13 @@ static struct hwentry default_hw[] = { - .vendor = "DELL", - .product = "MD3000", - .getuid = DEFAULT_GETUID, -- .features = "1 queue_if_no_path", -+ .features = "2 pg_init_retries 50", - .hwhandler = "1 rdac", - .selector = DEFAULT_SELECTOR, - .pgpolicy = GROUP_BY_PRIO, - .pgfailback = -FAILBACK_IMMEDIATE, - .rr_weight = RR_WEIGHT_NONE, -+ .no_path_retry = 15, - .minio = DEFAULT_MINIO, - .checker_name = RDAC, - .prio_name = PRIO_RDAC, -@@ -676,12 +692,13 @@ static struct hwentry default_hw[] = { - .vendor = "DELL", - .product = "MD3000i", - .getuid = DEFAULT_GETUID, -- .features = "1 queue_if_no_path", -+ .features = "2 pg_init_retries 50", - .hwhandler = "1 rdac", - .selector = DEFAULT_SELECTOR, - .pgpolicy = GROUP_BY_PRIO, - .pgfailback = -FAILBACK_IMMEDIATE, - .rr_weight = RR_WEIGHT_NONE, -+ .no_path_retry = 15, - .minio = DEFAULT_MINIO, - .checker_name = RDAC, - .prio_name = PRIO_RDAC, diff --git a/multipath-tools/patches/0004-RH-fix-cciss-names.patch b/multipath-tools/patches/0004-RH-fix-cciss-names.patch new file mode 100644 index 0000000..890a483 --- /dev/null +++ b/multipath-tools/patches/0004-RH-fix-cciss-names.patch @@ -0,0 +1,34 @@ +--- + multipath/main.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +Index: multipath-tools-120518/multipath/main.c +=================================================================== +--- multipath-tools-120518.orig/multipath/main.c ++++ multipath-tools-120518/multipath/main.c +@@ -409,6 +409,16 @@ get_dev_type(char *dev) { + return DEV_DEVMAP; + } + ++static void ++convert_dev(char *dev) ++{ ++ char *ptr = strstr(dev, "cciss/"); ++ if (ptr) { ++ ptr += 5; ++ *ptr = '!'; ++ } ++} ++ + int + main (int argc, char *argv[]) + { +@@ -514,6 +524,8 @@ main (int argc, char *argv[]) + + strncpy(conf->dev, argv[optind], FILE_NAME_SIZE); + conf->dev_type = get_dev_type(conf->dev); ++ if (conf->dev_type == DEV_DEVNODE) ++ convert_dev(conf->dev); + } + conf->daemon = 0; + diff --git a/multipath-tools/patches/0004-RH-fix-kpartx.patch b/multipath-tools/patches/0004-RH-fix-kpartx.patch deleted file mode 100644 index a28294d..0000000 --- a/multipath-tools/patches/0004-RH-fix-kpartx.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8d443fe2c58e22166426438e6f6d5757934f7b31 Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Tue, 13 Oct 2009 08:23:42 +0200 -Subject: [PATCH 04/12] RH: fix kpartx - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 b61a81f... 103ed0a... M kpartx/kpartx.c - kpartx/kpartx.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c -index b61a81f..103ed0a 100644 ---- a/kpartx/kpartx.c -+++ b/kpartx/kpartx.c -@@ -488,6 +488,7 @@ main(int argc, char **argv){ - d = c; - while (c) { - for (j = 0; j < n; j++) { -+ uint64_t start; - int k = slices[j].container - 1; - - if (slices[j].size == 0) -@@ -498,7 +499,7 @@ main(int argc, char **argv){ - continue; - - /* Skip all simple slices */ -- if (k < 0) -+ if (slices[j].container == 0) - continue; - - /* Check container slice */ -@@ -513,10 +514,11 @@ main(int argc, char **argv){ - } - strip_slash(partname); - -+ start = slices[j].start - slices[k].start; - if (safe_sprintf(params, "%d:%d %" PRIu64, - slices[k].major, - slices[k].minor, -- slices[j].start)) { -+ start)) { - fprintf(stderr, "params too small\n"); - exit(1); - } --- -1.6.5.1 - diff --git a/multipath-tools/patches/0005-RH-cciss_id.patch b/multipath-tools/patches/0005-RH-cciss_id.patch deleted file mode 100644 index bf61664..0000000 --- a/multipath-tools/patches/0005-RH-cciss_id.patch +++ /dev/null @@ -1,219 +0,0 @@ -From a3db7def912c2fd3756cfd99c1165db075281caa Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Tue, 13 Oct 2009 09:26:02 +0200 -Subject: [PATCH 05/12] RH: cciss_id - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 54be0a5... 7e4b7b1... M Makefile -:000000 100644 0000000... 6db12a4... A cciss_id/Makefile -:000000 100644 0000000... 091b5fe... A cciss_id/cciss_id.c - Makefile | 3 +- - cciss_id/Makefile | 47 +++++++++++++++++++ - cciss_id/cciss_id.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 177 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 54be0a5..7e4b7b1 100644 ---- a/Makefile -+++ b/Makefile -@@ -25,7 +25,8 @@ BUILDDIRS = \ - libmultipath/checkers \ - multipath \ - multipathd \ -- kpartx -+ kpartx \ -+ cciss_id - - ifeq ($(MULTIPATH_VERSION),) - VERSION = $(shell basename ${PWD} | cut -d'-' -f3) -diff --git a/cciss_id/Makefile b/cciss_id/Makefile -new file mode 100644 -index 0000000..6db12a4 ---- /dev/null -+++ b/cciss_id/Makefile -@@ -0,0 +1,47 @@ -+ -+# ***************************************************************************** -+# * * -+# * (C) Copyright 2007 Hewlett-Packard Development Company, L.P * -+# * * -+# * This program is free software; you can redistribute it and/or modify it * -+# * under the terms of the GNU General Public License as published by the Free* -+# * Software Foundation; either version 2 of the License, or (at your option)* -+# * any later version. * -+# * * -+# * This program is distributed in the hope that it will be useful, but * -+# * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY* -+# * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * -+# * for more details. * -+# * * -+# * You should have received a copy of the GNU General Public License along * -+# * with this program; if not, write to the Free Software Foundation, Inc., * -+# * 675 Mass Ave, Cambridge, MA 02139, USA. * -+# * * -+# * * -+# * * -+# * * -+# ***************************************************************************** -+ -+include ../Makefile.inc -+ -+OBJS = cciss_id.o -+CFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes -+ -+LDFLAGS = -ldevmapper -+ -+EXEC = cciss_id -+ -+all: $(EXEC) -+ -+$(EXEC): $(OBJS) -+ $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) -+ -+install: -+ $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) -+ $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -+ -+uninstall: -+ rm $(DESTDIR)$(bindir)/$(EXEC) -+ -+clean: -+ rm -f core.* *.o $(EXEC) *.gz -diff --git a/cciss_id/cciss_id.c b/cciss_id/cciss_id.c -new file mode 100644 -index 0000000..091b5fe ---- /dev/null -+++ b/cciss_id/cciss_id.c -@@ -0,0 +1,128 @@ -+/* -+ ***************************************************************************** -+ * * -+ * (C) Copyright 2007 Hewlett-Packard Development Company, L.P * -+ * * -+ * This program is free software; you can redistribute it and/or modify it * -+ * under the terms of the GNU General Public License as published by the Free* -+ * Software Foundation; either version 2 of the License, or (at your option)* -+ * any later version. * -+ * * -+ * This program is distributed in the hope that it will be useful, but * -+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY* -+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * -+ * for more details. * -+ * * -+ * You should have received a copy of the GNU General Public License along * -+ * with this program; if not, write to the Free Software Foundation, Inc., * -+ * 675 Mass Ave, Cambridge, MA 02139, USA. * -+ * * -+ * * -+ * * -+ * * -+ ***************************************************************************** -+*/ -+ -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <sys/ioctl.h> -+#include <fcntl.h> -+#include <unistd.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <errno.h> -+#include <string.h> -+ -+#include <linux/cciss_ioctl.h> -+ -+#define LEN_PAGE83_CCISSDEV 0x20 /* Page length of 83h for cciss devices */ -+#define LEN_DEVICEFILE 255 /* Length of device file name */ -+#define PATH_CCISSDEV "/dev/cciss/" /* Path of CCISS devices */ -+int main(int argc, char *argv[]) -+{ -+ const int resp_len = LEN_PAGE83_CCISSDEV; -+ unsigned char resp[resp_len+1]; -+ char dev_name[LEN_DEVICEFILE] = "\0" ; -+ unsigned int lun_id = 0; -+ int fd, status, i; -+ struct stat file_stat; -+ -+ LogvolInfo_struct lvi; // logical "volume" info -+ IOCTL_Command_struct cic; // cciss ioctl command -+ -+ if(argc < 2) { -+ fprintf(stderr, "Usage: %s /dev/cciss/cNdN\n", argv[0]); -+ return -1; -+ } -+ -+ if ( strncmp(PATH_CCISSDEV, argv[1], strlen(PATH_CCISSDEV) ) != 0 ) { -+ if ( strchr(argv[1], '!') ) { -+ sprintf(dev_name, "%s%s", PATH_CCISSDEV, -+ strchr(argv[1], '!')+1); -+ } -+ //fprintf(stderr, "dev_name is: -%s-", dev_name); -+ } else { -+ sprintf(dev_name, "%s", argv[1]); -+ } -+ -+ if (stat(dev_name, &file_stat) < 0) { -+ fprintf (stderr, "Stat failed for file %s. Errno=%d\n", dev_name, errno); -+ return -1; -+ } -+ if (!S_ISBLK(file_stat.st_mode)) { -+ fprintf (stderr, "File %s is not a block device. \n", dev_name); -+ return -1; -+ } -+ -+ -+ if((fd = open(dev_name, O_RDWR)) < 0) { -+ fprintf(stderr, "Open failed for file %s. Errno=%d\n", dev_name, errno); -+ return -1; -+ } -+ -+ if (ioctl(fd, CCISS_GETLUNINFO, &lvi) < 0) { -+ fprintf(stderr, "IOCTL failure CCISS_GETLUNINFO for file %s Errno=%d\n", dev_name, errno); -+ close(fd); -+ return -1; -+ } else { -+ lun_id = lvi.LunID; -+ } -+ -+ memset(&cic, 0, sizeof(IOCTL_Command_struct)); -+ memset(resp, 0, resp_len+1); -+ cic.LUN_info.LogDev.Mode = 0x01; /* logical volume addressing */ -+ cic.LUN_info.LogDev.VolId = lun_id & 0x3FFFFFFF; -+ cic.Request.CDBLen = 6; -+ cic.Request.Type.Type = TYPE_CMD; // It is a command. -+ cic.Request.Type.Attribute = ATTR_SIMPLE; -+ cic.Request.Type.Direction = XFER_READ; // Read -+ cic.Request.Timeout = 0; // Don't time out -+ cic.Request.CDB[0] = 0x12; -+ cic.Request.CDB[1] = 0x01; /* EVPD (enable vital product data) */ -+ cic.Request.CDB[2] = 0x83; -+ cic.Request.CDB[4] = resp_len & 0xFF; -+ cic.buf_size = resp_len; -+ cic.buf = resp; -+ status = ioctl(fd, CCISS_PASSTHRU, &cic); -+ if(status) { -+ fprintf(stderr, "IOCTL failure CCISS_PASSTHRU for file %s Errno=%d\n", dev_name, errno); -+ close(fd); -+ return -1; -+ } -+ else { -+ if ((cic.error_info.CommandStatus | cic.error_info.ScsiStatus )) { -+ fprintf(stderr, "CCISS command status error for Inquiry on %s\n", -+ dev_name); -+ close(fd); -+ return -1; -+ } -+ printf("3"); -+ for(i=8; i<24; i++) -+ /* printf("Buff[%d] =%x\n", i, resp[i]); */ -+ printf("%02x", resp[i]); -+ printf("\n"); -+ } -+ -+ close(fd); -+ return 0; -+} --- -1.6.5.1 - diff --git a/multipath-tools/patches/0005-RH-dont_start_with_no_config.patch b/multipath-tools/patches/0005-RH-dont_start_with_no_config.patch new file mode 100644 index 0000000..7efd925 --- /dev/null +++ b/multipath-tools/patches/0005-RH-dont_start_with_no_config.patch @@ -0,0 +1,16 @@ +--- + multipathd/multipathd.service | 1 + + 1 file changed, 1 insertion(+) + +Index: multipath-tools-110916/multipathd/multipathd.service +=================================================================== +--- multipath-tools-110916.orig/multipathd/multipathd.service ++++ multipath-tools-110916/multipathd/multipathd.service +@@ -2,6 +2,7 @@ + Description=Device-Mapper Multipath Device Controller + Before=iscsi.service iscsid.service + After=syslog.target ++ConditionPathExists=/etc/multipath.conf + + [Service] + Type=forking diff --git a/multipath-tools/patches/0006-RH-move-bindings.patch b/multipath-tools/patches/0006-RH-move-bindings.patch deleted file mode 100644 index c26b5e8..0000000 --- a/multipath-tools/patches/0006-RH-move-bindings.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ff4c0c9ccbf8abe4a67c2a6cceef07bda9d38d7d Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Tue, 13 Oct 2009 09:26:25 +0200 -Subject: [PATCH 06/12] RH: move bindings - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 84e5d6b... 5a38d25... M libmultipath/defaults.h -:100644 100644 9afa615... 7b6453f... M multipath.conf.annotated -:100644 100644 a165e4e... 4340e51... M multipath/multipath.conf.5 - libmultipath/defaults.h | 2 +- - multipath.conf.annotated | 2 +- - multipath/multipath.conf.5 | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h -index 84e5d6b..5a38d25 100644 ---- a/libmultipath/defaults.h -+++ b/libmultipath/defaults.h -@@ -19,6 +19,6 @@ - #define DEFAULT_PIDFILE "/var/run/multipathd.pid" - #define DEFAULT_SOCKET "/var/run/multipathd.sock" - #define DEFAULT_CONFIGFILE "/etc/multipath.conf" --#define DEFAULT_BINDINGS_FILE "/var/lib/multipath/bindings" -+#define DEFAULT_BINDINGS_FILE "/etc/multipath/bindings" - - char * set_default (char * str); -diff --git a/multipath.conf.annotated b/multipath.conf.annotated -index 9afa615..7b6453f 100644 ---- a/multipath.conf.annotated -+++ b/multipath.conf.annotated -@@ -165,7 +165,7 @@ - # # name : user_friendly_names - # # scope : multipath - # # desc : If set to "yes", using the bindings file --# # /var/lib/multipath/bindings to assign a persistent and -+# # /etc/multipath/bindings to assign a persistent and - # # unique alias to the multipath, in the form of mpath<n>. - # # If set to "no" use the WWID as the alias. In either case - # # this be will be overriden by any specific aliases in this -diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 -index a165e4e..4340e51 100644 ---- a/multipath/multipath.conf.5 -+++ b/multipath/multipath.conf.5 -@@ -224,7 +224,7 @@ for never stop queueing. Default is 0. - If set to - .I yes - , using the bindings file --.I /var/lib/multipath/bindings -+.I /etc/multipath/bindings - to assign a persistent and unique alias to the multipath, in the form of mpath<n>. - If set to - .I no --- -1.6.5.1 - diff --git a/multipath-tools/patches/0006-RH-multipath.rules.patch b/multipath-tools/patches/0006-RH-multipath.rules.patch new file mode 100644 index 0000000..bfcfc98 --- /dev/null +++ b/multipath-tools/patches/0006-RH-multipath.rules.patch @@ -0,0 +1,64 @@ +--- + multipath/Makefile | 6 +++--- + multipath/multipath.rules | 30 ++++++++++++++++++++++++------ + 2 files changed, 27 insertions(+), 9 deletions(-) + +Index: multipath-tools-120613/multipath/multipath.rules +=================================================================== +--- multipath-tools-120613.orig/multipath/multipath.rules ++++ multipath-tools-120613/multipath/multipath.rules +@@ -1,7 +1,25 @@ +-# +-# udev rules for multipathing. +-# The persistent symlinks are created with the kpartx rules +-# ++# multipath wants the devmaps presented as meaninglful device names ++# so name them after their devmap name ++SUBSYSTEM!="block", GOTO="end_mpath" + +-# socket for uevents +-SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event" ++ENV{MPATH_SBIN_PATH}="/sbin" ++TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin" ++ ++ACTION=="add", ENV{DEVTYPE}!="partition", \ ++ ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \ ++ TEST=="/etc/multipath.conf", \ ++ PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -c $tempnode", \ ++ ENV{DM_MULTIPATH_DEVICE_PATH}="1" ++ ++ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{DEVTYPE}!="partition", \ ++ RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}" ++ ++RUN+="socket:/org/kernel/dm/multipath_event" ++KERNEL!="dm-*", GOTO="end_mpath" ++ACTION!="change", GOTO="end_mpath" ++ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10" ++ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" ++ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" ++ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" ++RUN+="$env{MPATH_SBIN_PATH}/kpartx -a -p p $tempnode" ++LABEL="end_mpath" +Index: multipath-tools-120613/multipath/Makefile +=================================================================== +--- multipath-tools-120613.orig/multipath/Makefile ++++ multipath-tools-120613/multipath/Makefile +@@ -21,15 +21,15 @@ $(EXEC): $(OBJS) + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ +- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -d $(DESTDIR)/lib/udev/rules.d ++ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/lib/udev/rules.d/62-multipath.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) + + uninstall: +- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules ++ rm $(DESTDIR)/lib/udev/rules.d/62-multipath.rules + rm $(DESTDIR)$(bindir)/$(EXEC) + rm $(DESTDIR)$(mandir)/$(EXEC).8.gz + rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz diff --git a/multipath-tools/patches/0007-RH-Make-build-system-RH-Fedora-friendly.patch b/multipath-tools/patches/0007-RH-Make-build-system-RH-Fedora-friendly.patch new file mode 100644 index 0000000..bc5d17d --- /dev/null +++ b/multipath-tools/patches/0007-RH-Make-build-system-RH-Fedora-friendly.patch @@ -0,0 +1,101 @@ +From f5e11246063b07d6dce6d37d3b74662475baa981 Mon Sep 17 00:00:00 2001 +From: Fabio M. Di Nitto <fdinitto(a)redhat.com> +Date: Thu, 15 Oct 2009 04:39:27 +0200 +Subject: [PATCH 08/12] RH: Make build system RH/Fedora friendly + +Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> +--- +:100644 100644 7ec25d5... 06fb625... M Makefile.inc +:100644 100644 21e4ad4... 06d79c0... M kpartx/Makefile +:100644 100644 32d9ef5... 25e1483... M multipathd/Makefile + Makefile.inc | 2 +- + kpartx/Makefile | 8 ++++---- + libmpathpersist/Makefile | 7 ++----- + libmultipath/Makefile | 2 ++ + multipathd/Makefile | 1 + + 5 files changed, 10 insertions(+), 10 deletions(-) + +Index: multipath-tools-120613/Makefile.inc +=================================================================== +--- multipath-tools-120613.orig/Makefile.inc ++++ multipath-tools-120613/Makefile.inc +@@ -29,7 +29,7 @@ multipathdir = $(TOPDIR)/libmultipath + mandir = $(prefix)/usr/share/man/man8 + man5dir = $(prefix)/usr/share/man/man5 + man3dir = $(prefix)/usr/share/man/man3 +-rcdir = $(prefix)/etc/init.d ++rcdir = $(prefix)/etc/rc.d/init.d + syslibdir = $(prefix)/$(LIB) + libdir = $(prefix)/$(LIB)/multipath + unitdir = $(prefix)/lib/systemd/system +Index: multipath-tools-120613/kpartx/Makefile +=================================================================== +--- multipath-tools-120613.orig/kpartx/Makefile ++++ multipath-tools-120613/kpartx/Makefile +@@ -26,10 +26,10 @@ $(EXEC): $(OBJS) + install: $(EXEC) $(EXEC).8 + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) +- $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) +- $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) +- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ ++# $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) ++# $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) ++# $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d ++# $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) + +Index: multipath-tools-120613/multipathd/Makefile +=================================================================== +--- multipath-tools-120613.orig/multipathd/Makefile ++++ multipath-tools-120613/multipathd/Makefile +@@ -35,6 +35,7 @@ install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) ++ $(INSTALL_PROGRAM) -m 755 multipathd.init.redhat $(DESTDIR)$(rcdir)/$(EXEC) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(unitdir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).service $(DESTDIR)$(unitdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +Index: multipath-tools-120613/libmultipath/Makefile +=================================================================== +--- multipath-tools-120613.orig/libmultipath/Makefile ++++ multipath-tools-120613/libmultipath/Makefile +@@ -46,9 +46,11 @@ install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) + $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS) + $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir) ++ ln -sf $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB) + + uninstall: + rm -f $(DESTDIR)$(syslibdir)/$(LIBS) ++ rm -f $(DESTDIR)$(syslibdir)/$(DEVLIB) + + clean: + rm -f core *.a *.o *.gz *.so *.so.* +Index: multipath-tools-120613/libmpathpersist/Makefile +=================================================================== +--- multipath-tools-120613.orig/libmpathpersist/Makefile ++++ multipath-tools-120613/libmpathpersist/Makefile +@@ -28,17 +28,14 @@ $(LIBS): + install: $(LIBS) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(syslibdir) + $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(syslibdir)/$(LIBS) +- $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(syslibdir) + $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(man3dir) +- $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/include/ +- $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)/usr/share/doc/mpathpersist/ +- ln -sf $(DESTDIR)$(syslibdir)/$(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB) ++ ln -sf $(LIBS) $(DESTDIR)$(syslibdir)/$(DEVLIB) + install -m 644 mpath_persistent_reserve_in.3.gz $(DESTDIR)$(man3dir) + install -m 644 mpath_persistent_reserve_out.3.gz $(DESTDIR)$(man3dir) +- install -m 644 mpath_persist.h $(DESTDIR)/usr/include/ + + uninstall: + rm -f $(DESTDIR)$(syslibdir)/$(LIBS) ++ rm -f $(DESTDIR)$(syslibdir)/$(DEVLIB) + rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_in.3.gz + rm $(DESTDIR)$(mandir)/mpath_persistent_reserve_out.3.gz + diff --git a/multipath-tools/patches/0007-RH-do-not-remove.patch b/multipath-tools/patches/0007-RH-do-not-remove.patch deleted file mode 100644 index 1b27c76..0000000 --- a/multipath-tools/patches/0007-RH-do-not-remove.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b3519ef2eda768672d47c61f0acf8c87d74db427 Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Tue, 13 Oct 2009 09:33:59 +0200 -Subject: [PATCH 07/12] RH: do not remove - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 5d3625a... 244b8d5... M multipathd/main.c - multipathd/main.c | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -diff --git a/multipathd/main.c b/multipathd/main.c -index 5d3625a..244b8d5 100644 ---- a/multipathd/main.c -+++ b/multipathd/main.c -@@ -290,8 +290,19 @@ ev_add_map (struct sysfs_device * dev, struct vectors * vecs) - static int - uev_remove_map (struct sysfs_device * dev, struct vectors * vecs) - { -+ struct multipath * mpp; -+ - condlog(2, "%s: remove map (uevent)", dev->kernel); -- return ev_remove_map(dev->kernel, vecs); -+ -+ mpp = find_mp_by_str(vecs->mpvec, dev->kernel); -+ if (!mpp) { -+ condlog(2, "%s: devmap not registered, can't remove", -+ dev->kernel); -+ return 0; -+ } -+ orphan_paths(vecs->pathvec, mpp); -+ remove_map_and_stop_waiter(mpp, vecs, 1); -+ return 0; - } - - int --- -1.6.5.1 - diff --git a/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch b/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch deleted file mode 100644 index 9e6e3a0..0000000 --- a/multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch +++ /dev/null @@ -1,62 +0,0 @@ -From f5e11246063b07d6dce6d37d3b74662475baa981 Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Thu, 15 Oct 2009 04:39:27 +0200 -Subject: [PATCH 08/12] RH: Make build system RH/Fedora friendly - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 7ec25d5... 06fb625... M Makefile.inc -:100644 100644 21e4ad4... 06d79c0... M kpartx/Makefile -:100644 100644 32d9ef5... 25e1483... M multipathd/Makefile - Makefile.inc | 2 +- - kpartx/Makefile | 8 ++++---- - multipathd/Makefile | 1 + - 3 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/Makefile.inc b/Makefile.inc -index 7ec25d5..06fb625 100644 ---- a/Makefile.inc -+++ b/Makefile.inc -@@ -28,7 +28,7 @@ libudevdir = ${prefix}/lib/udev - multipathdir = $(TOPDIR)/libmultipath - mandir = $(prefix)/usr/share/man/man8 - man5dir = $(prefix)/usr/share/man/man5 --rcdir = $(prefix)/etc/init.d -+rcdir = $(prefix)/etc/rc.d/init.d - syslibdir = $(prefix)/$(LIB) - libdir = $(prefix)/$(LIB)/multipath - -diff --git a/kpartx/Makefile b/kpartx/Makefile -index 21e4ad4..06d79c0 100644 ---- a/kpartx/Makefile -+++ b/kpartx/Makefile -@@ -20,10 +20,10 @@ $(EXEC): $(OBJS) - install: $(EXEC) $(EXEC).8 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) -- $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) -- $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) -- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ -+# $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) -+# $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) -+# $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -+# $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) - -diff --git a/multipathd/Makefile b/multipathd/Makefile -index 32d9ef5..25e1483 100644 ---- a/multipathd/Makefile -+++ b/multipathd/Makefile -@@ -35,6 +35,7 @@ install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) -+ $(INSTALL_PROGRAM) -m 755 multipathd.init.redhat $(DESTDIR)$(rcdir)/$(EXEC) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) - --- -1.6.5.1 - diff --git a/multipath-tools/patches/0008-RH-multipathd-blacklist-all-by-default.patch b/multipath-tools/patches/0008-RH-multipathd-blacklist-all-by-default.patch new file mode 100644 index 0000000..5bbf3ca --- /dev/null +++ b/multipath-tools/patches/0008-RH-multipathd-blacklist-all-by-default.patch @@ -0,0 +1,64 @@ +From 61b2002c6b2752c15b431e400cd614edc8c5b039 Mon Sep 17 00:00:00 2001 +From: Fabio M. Di Nitto <fdinitto(a)redhat.com> +Date: Mon, 19 Oct 2009 07:05:45 +0200 +Subject: [PATCH 09/12] RH: multipathd blacklist all by default + +If there is no configuration installed on the system, blacklist +everything by default. + +BZ#528059 + +Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> +--- +:100644 100644 e7e962e... 5aa1ab0... M libmultipath/config.c +:100644 100644 86b1320... 7e90e75... M libmultipath/config.h + libmultipath/config.c | 16 ++++++++++++++++ + libmultipath/config.h | 1 + + 2 files changed, 17 insertions(+) + +Index: multipath-tools-120518/libmultipath/config.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/config.c ++++ multipath-tools-120518/libmultipath/config.c +@@ -21,6 +21,7 @@ + #include "defaults.h" + #include "prio.h" + #include "devmapper.h" ++#include "version.h" + + static int + hwe_strmatch (struct hwentry *hwe1, struct hwentry *hwe2) +@@ -549,6 +550,21 @@ load_config (char * file) + + } else { + init_keywords(); ++ condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); ++ condlog(0, "A default multipath.conf file is located at"); ++ condlog(0, "/usr/share/doc/device-mapper-multipath-%d.%d.%d/multipath.conf", MULTIPATH_VERSION(VERSION_CODE)); ++ if (conf->blist_devnode == NULL) { ++ conf->blist_devnode = vector_alloc(); ++ if (!conf->blist_devnode) { ++ condlog(0, "cannot allocate blacklist\n"); ++ goto out; ++ } ++ } ++ if (store_ble(conf->blist_devnode, strdup(".*"), ++ ORIGIN_NO_CONFIG)) { ++ condlog(0, "cannot store default no-config blacklist\n"); ++ goto out; ++ } + } + + /* +Index: multipath-tools-120518/libmultipath/config.h +=================================================================== +--- multipath-tools-120518.orig/libmultipath/config.h ++++ multipath-tools-120518/libmultipath/config.h +@@ -6,6 +6,7 @@ + + #define ORIGIN_DEFAULT 0 + #define ORIGIN_CONFIG 1 ++#define ORIGIN_NO_CONFIG 2 + + /* + * In kernel, fast_io_fail == 0 means immediate failure on rport delete. diff --git a/multipath-tools/patches/0009-RH-add-mpathconf.patch b/multipath-tools/patches/0009-RH-add-mpathconf.patch new file mode 100644 index 0000000..2a5bec8 --- /dev/null +++ b/multipath-tools/patches/0009-RH-add-mpathconf.patch @@ -0,0 +1,494 @@ +--- + libmultipath/config.c | 1 + multipath/Makefile | 5 + multipath/main.c | 4 + multipath/mpathconf | 312 ++++++++++++++++++++++++++++++++++++++++++++++++++ + multipath/mpathconf.8 | 103 ++++++++++++++++ + 5 files changed, 423 insertions(+), 2 deletions(-) + +Index: multipath-tools-120613/libmultipath/config.c +=================================================================== +--- multipath-tools-120613.orig/libmultipath/config.c ++++ multipath-tools-120613/libmultipath/config.c +@@ -553,6 +553,7 @@ load_config (char * file) + condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); + condlog(0, "A default multipath.conf file is located at"); + condlog(0, "/usr/share/doc/device-mapper-multipath-%d.%d.%d/multipath.conf", MULTIPATH_VERSION(VERSION_CODE)); ++ condlog(0, "You can run /sbin/mpathconf to create or modify /etc/multipath.conf"); + if (conf->blist_devnode == NULL) { + conf->blist_devnode = vector_alloc(); + if (!conf->blist_devnode) { +Index: multipath-tools-120613/multipath/Makefile +=================================================================== +--- multipath-tools-120613.orig/multipath/Makefile ++++ multipath-tools-120613/multipath/Makefile +@@ -17,22 +17,27 @@ $(EXEC): $(OBJS) + $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) + $(GZIP) $(EXEC).8 > $(EXEC).8.gz + $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz ++ $(GZIP) mpathconf.8 > mpathconf.8.gz + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ ++ $(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) -d $(DESTDIR)/lib/udev/rules.d + $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/lib/udev/rules.d/62-multipath.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) + $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) ++ $(INSTALL_PROGRAM) -m 644 mpathconf.8.gz $(DESTDIR)$(mandir) + + uninstall: + rm $(DESTDIR)/lib/udev/rules.d/62-multipath.rules + rm $(DESTDIR)$(bindir)/$(EXEC) ++ rm $(DESTDIR)$(bindir)/mpathconf + rm $(DESTDIR)$(mandir)/$(EXEC).8.gz + rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz ++ rm $(DESTDIR)$(mandir)/mpathconf.8.gz + + clean: + rm -f core *.o $(EXEC) *.gz +Index: multipath-tools-120613/multipath/main.c +=================================================================== +--- multipath-tools-120613.orig/multipath/main.c ++++ multipath-tools-120613/multipath/main.c +@@ -432,10 +432,10 @@ main (int argc, char *argv[]) + exit(1); + } + +- if (dm_prereq()) ++ if (load_config(DEFAULT_CONFIGFILE)) + exit(1); + +- if (load_config(DEFAULT_CONFIGFILE)) ++ if (dm_prereq()) + exit(1); + + while ((arg = getopt(argc, argv, ":dchl::FfM:v:p:b:Brtq")) != EOF ) { +Index: multipath-tools-120613/multipath/mpathconf +=================================================================== +--- /dev/null ++++ multipath-tools-120613/multipath/mpathconf +@@ -0,0 +1,312 @@ ++#!/bin/sh ++# ++# Copyright (C) 2010 Red Hat, Inc. All rights reserved. ++# ++# This file is part of the device-mapper-multipath package. ++# ++# This copyrighted material is made available to anyone wishing to use, ++# modify, copy, or redistribute it subject to the terms and conditions ++# of the GNU General Public License v.2. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software Foundation, ++# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++# ++# Simple editting of /etc/multipath.conf ++# This program was largely ripped off from lvmconf ++# ++ ++unset ENABLE FIND FRIENDLY MODULE MULTIPATHD HAVE_DISABLE HAVE_FIND HAVE_BLACKLIST HAVE_DEFAULTS HAVE_FRIENDLY HAVE_MULTIPATHD HAVE_MODULE SHOW_STATUS CHANGED_CONFIG ++ ++DEFAULT_CONFIGFILE="/usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf" ++CONFIGFILE="/etc/multipath.conf" ++MULTIPATHDIR="/etc/multipath" ++TMPFILE=/etc/multipath/.multipath.conf.tmp ++ ++function usage ++{ ++ echo "usage: $0 <command>" ++ echo "" ++ echo "Commands:" ++ echo "Enable: --enable " ++ echo "Disable: --disable" ++ echo "Set user_friendly_names (Default n): --user_friendly_names <y|n>" ++ echo "Set find_multipaths (Default n): --find_multipaths <y|n>" ++ echo "Load the dm-multipath modules on enable (Default y): --with_module <y|n>" ++ echo "start/stop/reload multipathd (Default n): --with_multipathd <y|n>" ++ echo "" ++} ++ ++function parse_args ++{ ++ while [ -n "$1" ]; do ++ case $1 in ++ --enable) ++ ENABLE=1 ++ shift ++ ;; ++ --disable) ++ ENABLE=0 ++ shift ++ ;; ++ --user_friendly_names) ++ if [ -n "$2" ]; then ++ FRIENDLY=$2 ++ shift 2 ++ else ++ usage ++ exit 1 ++ fi ++ ;; ++ --find_multipaths) ++ if [ -n "$2" ]; then ++ FIND=$2 ++ shift 2 ++ else ++ usage ++ exit 1 ++ fi ++ ;; ++ --with_module) ++ if [ -n "$2" ]; then ++ MODULE=$2 ++ shift 2 ++ else ++ usage ++ exit 1 ++ fi ++ ;; ++ --with_multipathd) ++ if [ -n "$2" ]; then ++ MULTIPATHD=$2 ++ shift 2 ++ else ++ usage ++ exit 1 ++ fi ++ ;; ++ *) ++ usage ++ exit ++ esac ++ done ++} ++ ++function validate_args ++{ ++ if [ "$ENABLE" = "0" ] && [ -n "$FRIENDLY" -o -n "$FIND" -o -n "$MODULE" ]; then ++ echo "ignoring extra parameters on disable" ++ FRIENDLY="" ++ FIND="" ++ MODULE="" ++ fi ++ if [ -n "$FRIENDLY" ] && [ "$FRIENDLY" != "y" -a "$FRIENDLY" != "n" ]; then ++ echo "--user_friendly_names must be either 'y' or 'n'" ++ exit 1 ++ fi ++ if [ -n "$FIND" ] && [ "$FIND" != "y" -a "$FIND" != "n" ]; then ++ echo "--find_multipaths must be either 'y' or 'n'" ++ exit 1 ++ fi ++ if [ -z "$ENABLE" -a -z "$FIND" -a -z "$FRIENDLY" ]; then ++ SHOW_STATUS=1 ++ fi ++ if [ -n "$MODULE" ] && [ "$MODULE" != "y" -a "$MODULE" != "n" ]; then ++ echo "--with_module must be either 'y' or 'n'" ++ exit 1 ++ fi ++ if [ -n "$MULTIPATHD" ] && [ "$MULTIPATHD" != "y" -a "$MULTIPATHD" != "n" ]; then ++ echo "--with_multipathd must be either 'y' or 'n'" ++ exit 1 ++ fi ++} ++ ++umask 0077 ++ ++parse_args "$@" ++ ++validate_args ++ ++if [ ! -d "$MULTIPATHDIR" ]; then ++ echo "/etc/multipath/ does not exist. failing" ++ exit 1 ++fi ++ ++rm $TMPFILE 2> /dev/null ++if [ -f "$CONFIGFILE" ]; then ++ cp $CONFIGFILE $TMPFILE ++elif [ -f "$DEFAULT_CONFIGFILE" ]; then ++ cp $DEFAULT_CONFIGFILE $TMPFILE ++else ++ touch $TMPFILE ++fi ++ ++if grep -q "^blacklist[[:space:]]*{" $TMPFILE ; then ++ HAVE_BLACKLIST=1 ++fi ++ ++if grep -q "^defaults[[:space:]]*{" $TMPFILE ; then ++ HAVE_DEFAULTS=1 ++fi ++ ++if [ -z "$MODULE" -o "$MODULE" = "y" ]; then ++ if lsmod | grep -q "dm_multipath" ; then ++ HAVE_MODULE=1 ++ else ++ HAVE_MODULE=0 ++ fi ++fi ++ ++if [ "$MULTIPATHD" = "y" ]; then ++ if service multipathd status > /dev/null ; then ++ HAVE_MULTIPATHD=1 ++ else ++ HAVE_MULTIPATHD=0 ++ fi ++fi ++ ++if [ "$HAVE_BLACKLIST" = "1" ]; then ++ if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*devnode \"\.\?\*\"" ; then ++ HAVE_DISABLE=1 ++ elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[#[:space:]]*devnode \"\.\?\*\"" ; then ++ HAVE_DISABLE=0 ++ fi ++fi ++ ++if [ "$HAVE_DEFAULTS" = "1" ]; then ++ if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*find_multipaths[[:space:]]*$yes\|1$" ; then ++ HAVE_FIND=1 ++ elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*find_multipaths[[:space:]]*$no\|0$" ; then ++ HAVE_FIND=0 ++ fi ++ if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]]*$yes\|1$" ; then ++ HAVE_FRIENDLY=1 ++ elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]]*$no\|0$" ; then ++ HAVE_FRIENDLY=0 ++ fi ++fi ++ ++if [ -n "$SHOW_STATUS" ]; then ++ if [ -z "$HAVE_DISABLE" -o "$HAVE_DISABLE" = 0 ]; then ++ echo "multipath is enabled" ++ else ++ echo "multipath is disabled" ++ fi ++ if [ -z "$HAVE_FIND" -o "$HAVE_FIND" = 0 ]; then ++ echo "find_multipaths is disabled" ++ else ++ echo "find_multipaths is enabled" ++ fi ++ if [ -z "$HAVE_FRIENDLY" -o "$HAVE_FRIENDLY" = 0 ]; then ++ echo "user_friendly_names is disabled" ++ else ++ echo "user_friendly_names is enabled" ++ fi ++ if [ -n "$HAVE_MODULE" ]; then ++ if [ "$HAVE_MODULE" = 1 ]; then ++ echo "dm_multipath module is loaded" ++ else ++ echo "dm_multipath module is not loaded" ++ fi ++ fi ++ if [ -n "$HAVE_MULTIPATHD" ]; then ++ service multipathd status ++ fi ++ exit 0 ++fi ++ ++if [ -z "$HAVE_BLACKLIST" ]; then ++ cat >> $TMPFILE <<- _EOF_ ++ ++blacklist { ++} ++_EOF_ ++fi ++ ++if [ -z "$HAVE_DEFAULTS" ]; then ++ cat >> $TMPFILE <<- _EOF_ ++ ++defaults { ++} ++_EOF_ ++fi ++ ++if [ "$ENABLE" = 1 ]; then ++ if [ "$HAVE_DISABLE" = 1 ]; then ++ sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode \"\.\?\*\"/# devnode ".*"/' $TMPFILE ++ fi ++elif [ "$ENABLE" = 0 ]; then ++ if [ -z "$HAVE_DISABLE" ]; then ++ sed -i '/^blacklist[[:space:]]*{/ a\ ++ devnode "*" ++' $TMPFILE ++ elif [ "$HAVE_DISABLE" = 0 ]; then ++ sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[#[:space:]]*devnode \"\.\?\*\"/ devnode ".*"/' $TMPFILE ++ fi ++fi ++ ++if [ "$FIND" = "n" ]; then ++ if [ "$HAVE_FIND" = 1 ]; then ++ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*find_multipaths[[:space:]]*$yes\|1$/ find_multipaths no/' $TMPFILE ++ CHANGED_CONFIG=1 ++ fi ++elif [ "$FIND" = "y" ]; then ++ if [ -z "$HAVE_FIND" ]; then ++ sed -i '/^defaults[[:space:]]*{/ a\ ++ find_multipaths yes ++' $TMPFILE ++ CHANGED_CONFIG=1 ++ elif [ "$HAVE_FIND" = 0 ]; then ++ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*find_multipaths[[:space:]]*$no\|0$/ find_multipaths yes/' $TMPFILE ++ CHANGED_CONFIG=1 ++ fi ++fi ++ ++if [ "$FRIENDLY" = "n" ]; then ++ if [ "$HAVE_FRIENDLY" = 1 ]; then ++ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]]*$yes\|1$/ user_friendly_names no/' $TMPFILE ++ CHANGED_CONFIG=1 ++ fi ++elif [ "$FRIENDLY" = "y" ]; then ++ if [ -z "$HAVE_FRIENDLY" ]; then ++ sed -i '/^defaults[[:space:]]*{/ a\ ++ user_friendly_names yes ++' $TMPFILE ++ CHANGED_CONFIG=1 ++ elif [ "$HAVE_FRIENDLY" = 0 ]; then ++ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]]*$no\|0$/ user_friendly_names yes/' $TMPFILE ++ CHANGED_CONFIG=1 ++ fi ++fi ++ ++if [ -f "$CONFIGFILE" ]; then ++ cp $CONFIGFILE $CONFIGFILE.old ++ if [ $? != 0 ]; then ++ echo "failed to backup old config file, $CONFIGFILE not updated" ++ exit 1 ++ fi ++fi ++ ++cp $TMPFILE $CONFIGFILE ++if [ $? != 0 ]; then ++ echo "failed to copy new config file into place, check $CONFIGFILE is still OK" ++ exit 1 ++fi ++ ++rm -f $TMPFILE ++ ++if [ "$ENABLE" = 1 ]; then ++ if [ "$HAVE_MODULE" = 0 ]; then ++ modprobe dm_multipath ++ fi ++ if [ "$HAVE_MULTIPATHD" = 0 ]; then ++ service multipathd start ++ fi ++elif [ "$ENABLE" = 0 ]; then ++ if [ "$HAVE_MULTIPATHD" = 1 ]; then ++ service multipathd stop ++ fi ++elif [ -n "$CHANGED_CONFIG" -a "$HAVE_MULTIPATHD" = 1 ]; then ++ service multipathd reload ++fi +Index: multipath-tools-120613/multipath/mpathconf.8 +=================================================================== +--- /dev/null ++++ multipath-tools-120613/multipath/mpathconf.8 +@@ -0,0 +1,103 @@ ++.TH MPATHCONF 8 "June 2010" "" "Linux Administrator's Manual" ++.SH NAME ++mpathconf - A tool for configuring device-mapper-multipath ++.SH SYNOPSIS ++.B mpathconf ++.RB [\| commands \|] ++.RB [\| options \|] ++.SH DESCRIPTION ++.B mpathconf ++is a utility that creates or modifies ++.B /etc/multipath.conf. ++It can enable or disable multipathing and configure some common options. ++.B mpathconf ++can also load the ++.B dm_multipath ++module, start and stop the ++.B multipathd ++daemon, and configure the ++.B multipathd ++service to start automatically or not. If ++.B mpathconf ++is called with no commands, it will display the current configuration. ++ ++The default options for mpathconf are ++.B --with_module ++The ++.B --with_multipathd ++option is not set by default. Enabling multipathing will load the ++.B dm_multipath ++module but it will not immediately start it. This is so ++that users can manually edit their config file if necessary, before starting ++.B multipathd. ++ ++If ++.B /etc/multipath.conf ++already exists, mpathconf will edit it. If it does not exist, mpathconf will ++use ++.B /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf ++as the starting file. This file has ++.B user_friendly_names ++set. If this file does not exist, mpathconf will create ++.B /etc/multipath.conf ++from scratch. For most users, this means that ++.B user_friendly_names ++will be set by default, unless they use the ++.B --user_friendly_names n ++command. ++.SH COMMANDS ++.TP ++.B --enable ++Removes any line that blacklists all device nodes from the ++.B /etc/multipath.conf ++blacklist section. ++.TP ++.B --disable ++Adds a line that blacklists all device nodes to the ++.B /etc/multipath.conf ++blacklist section. If no blacklist section exists, it will create one. ++.TP ++.B --user_friendly_name \fP { \fBy\fP | \fBn\fP } ++If set to \fBy\fP, this adds the line ++.B user_friendly_names yes ++to the ++.B /etc/multipath.conf ++defaults section. If set to \fBn\fP, this removes the line, if present. This ++command can be used along with any other command. ++.TP ++.B --find_multipaths\fP { \fBy\fP | \fBn\fP } ++If set to \fBy\fP, this adds the line ++.B find_multipaths yes ++to the ++.B /etc/multipath.conf ++defaults section. If set to \fBn\fP, this removes the line, if present. This ++command can be used aldong with any other command. ++.SH OPTIONS ++.TP ++.B --with_module\fP { \fBy\fP | \fBn\fP } ++If set to \fBy\fP, this runs ++.B modprobe dm_multipath ++to install the multipath modules. This option only works with the ++.B --enable ++command. This option is set to \fBy\fP by default. ++.TP ++.B --with_multipathd { \fBy\fP | \fBn\fP } ++If set to \fBy\fP, this runs ++.B service multipathd start ++to start the multipathd daemon on \fB--enable\fP, ++.B service multipathd stop ++to start the multipathd daemon on \fB--disable\fP, and ++.B service multipathd reload ++to reconfigure multipathd on \fB--user_frindly_names\fP and ++\fB--find_multipaths\fP. ++This option is set to \fBn\fP by default. ++.SH FILES ++.BR /etc/multipath.conf ++.SH "SEE ALSO" ++.BR multipath.conf (5), ++.BR modprobe (8), ++.BR multipath (8), ++.BR multipathd (8), ++.BR service (8), ++.SH AUTHOR ++Benjamin Marzinski <bmarzins(a)redhat.com> diff --git a/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch b/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch deleted file mode 100644 index df4b4c7..0000000 --- a/multipath-tools/patches/0009-RH-multipathd-blacklist-all-by-default.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 61b2002c6b2752c15b431e400cd614edc8c5b039 Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Mon, 19 Oct 2009 07:05:45 +0200 -Subject: [PATCH 09/12] RH: multipathd blacklist all by default - -If there is no configuration installed on the system, blacklist -everything by default. - -BZ#528059 - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 e7e962e... 5aa1ab0... M libmultipath/config.c -:100644 100644 86b1320... 7e90e75... M libmultipath/config.h - libmultipath/config.c | 18 +++++++++++++++++- - libmultipath/config.h | 1 + - 2 files changed, 18 insertions(+), 1 deletions(-) - -diff --git a/libmultipath/config.c b/libmultipath/config.c -index e7e962e..5aa1ab0 100644 ---- a/libmultipath/config.c -+++ b/libmultipath/config.c -@@ -19,6 +19,7 @@ - #include "blacklist.h" - #include "defaults.h" - #include "prio.h" -+#include "version.h" - - static int - hwe_strmatch (struct hwentry *hwe1, struct hwentry *hwe2) -@@ -463,8 +464,23 @@ load_config (char * file) - condlog(0, "error parsing config file"); - goto out; - } -+ } else { -+ condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); -+ condlog(0, "A default multipath.conf file is located at"); -+ condlog(0, -+"/usr/share/doc/device-mapper-multipath-%d.%d.%d/multipath.conf", -+ MULTIPATH_VERSION(VERSION_CODE)); -+ conf->blist_devnode = vector_alloc(); -+ if (!conf->blist_devnode) { -+ condlog(0, "cannot allocate blacklist\n"); -+ goto out; -+ } -+ if (store_ble(conf->blist_devnode, strdup(".*"), -+ ORIGIN_NO_CONFIG)) { -+ condlog(0, "cannot store default no-config blacklist\n"); -+ goto out; -+ } - } -- - /* - * remove duplica in hwtable. config file takes precedence - * over build-in hwtable -diff --git a/libmultipath/config.h b/libmultipath/config.h -index 86b1320..7e90e75 100644 ---- a/libmultipath/config.h -+++ b/libmultipath/config.h -@@ -5,6 +5,7 @@ - - #define ORIGIN_DEFAULT 0 - #define ORIGIN_CONFIG 1 -+#define ORIGIN_NO_CONFIG 2 - - enum devtypes { - DEV_NONE, --- -1.6.5.1 - diff --git a/multipath-tools/patches/0010-RH-add-find-multipaths.patch b/multipath-tools/patches/0010-RH-add-find-multipaths.patch new file mode 100644 index 0000000..57eb0a8 --- /dev/null +++ b/multipath-tools/patches/0010-RH-add-find-multipaths.patch @@ -0,0 +1,222 @@ +--- + libmultipath/config.c | 1 + + libmultipath/config.h | 1 + + libmultipath/configure.c | 11 +++++++++++ + libmultipath/defaults.h | 1 + + libmultipath/dict.c | 34 ++++++++++++++++++++++++++++++++++ + libmultipath/wwids.c | 26 ++++++++++++++++++++++++++ + libmultipath/wwids.h | 1 + + multipath/main.c | 2 +- + multipathd/main.c | 6 ++++++ + 9 files changed, 82 insertions(+), 1 deletion(-) + +Index: multipath-tools-120518/libmultipath/config.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/config.c ++++ multipath-tools-120518/libmultipath/config.c +@@ -514,6 +514,7 @@ load_config (char * file) + conf->reassign_maps = DEFAULT_REASSIGN_MAPS; + conf->checkint = DEFAULT_CHECKINT; + conf->max_checkint = MAX_CHECKINT(conf->checkint); ++ conf->find_multipaths = DEFAULT_FIND_MULTIPATHS; + + /* + * preload default hwtable +Index: multipath-tools-120518/libmultipath/configure.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/configure.c ++++ multipath-tools-120518/libmultipath/configure.c +@@ -497,6 +497,10 @@ coalesce_paths (struct vectors * vecs, v + + memset(empty_buff, 0, WWID_SIZE); + ++ /* ignore refwwid if it's empty */ ++ if (refwwid && !strlen(refwwid)) ++ refwwid = NULL; ++ + if (force_reload) { + vector_foreach_slot (pathvec, pp1, k) { + pp1->mpp = NULL; +@@ -526,6 +530,13 @@ coalesce_paths (struct vectors * vecs, v + if (refwwid && strncmp(pp1->wwid, refwwid, WWID_SIZE)) + continue; + ++ /* If find_multipaths was selected check if the path is valid */ ++ if (conf->find_multipaths && !refwwid && ++ !should_multipath(pp1, pathvec)) { ++ orphan_path(pp1); ++ continue; ++ } ++ + /* + * at this point, we know we really got a new mp + */ +Index: multipath-tools-120518/libmultipath/defaults.h +=================================================================== +--- multipath-tools-120518.orig/libmultipath/defaults.h ++++ multipath-tools-120518/libmultipath/defaults.h +@@ -15,6 +15,7 @@ + #define DEFAULT_USER_FRIENDLY_NAMES 0 + #define DEFAULT_VERBOSITY 2 + #define DEFAULT_REASSIGN_MAPS 1 ++#define DEFAULT_FIND_MULTIPATHS 0 + + #define DEFAULT_CHECKINT 5 + #define MAX_CHECKINT(a) (a << 2) +Index: multipath-tools-120518/libmultipath/dict.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/dict.c ++++ multipath-tools-120518/libmultipath/dict.c +@@ -585,6 +585,27 @@ def_reservation_key_handler(vector strve + } + + static int ++def_find_multipaths_handler(vector strvec) ++{ ++ char * buff; ++ ++ buff = set_value(strvec); ++ ++ if (!buff) ++ return 1; ++ ++ if ((strlen(buff) == 2 && !strcmp(buff, "no")) || ++ (strlen(buff) == 1 && !strcmp(buff, "0"))) ++ conf->find_multipaths = 0; ++ else if ((strlen(buff) == 3 && !strcmp(buff, "yes")) || ++ (strlen(buff) == 1 && !strcmp(buff, "1"))) ++ conf->find_multipaths = 1; ++ ++ FREE(buff); ++ return 0; ++} ++ ++static int + def_names_handler(vector strvec) + { + char * buff; +@@ -2549,6 +2570,18 @@ snprint_def_log_checker_err (char * buff + } + + static int ++snprint_def_find_multipaths (char * buff, int len, void * data) ++{ ++ if (conf->find_multipaths == DEFAULT_FIND_MULTIPATHS) ++ return 0; ++ if (!conf->find_multipaths) ++ return snprintf(buff, len, "no"); ++ ++ return snprintf(buff, len, "yes"); ++} ++ ++ ++static int + snprint_def_user_friendly_names (char * buff, int len, void * data) + { + if (conf->user_friendly_names == USER_FRIENDLY_NAMES_ON) +@@ -2646,6 +2679,7 @@ init_keywords(void) + install_keyword("bindings_file", &bindings_file_handler, &snprint_def_bindings_file); + install_keyword("log_checker_err", &def_log_checker_err_handler, &snprint_def_log_checker_err); + install_keyword("reservation_key", &def_reservation_key_handler, &snprint_def_reservation_key); ++ install_keyword("find_multipaths", &def_find_multipaths_handler, &snprint_def_find_multipaths); + __deprecated install_keyword("default_selector", &def_selector_handler, NULL); + __deprecated install_keyword("default_path_grouping_policy", &def_pgpolicy_handler, NULL); + __deprecated install_keyword("default_uid_attribute", &def_uid_attribute_handler, NULL); +Index: multipath-tools-120518/libmultipath/wwids.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/wwids.c ++++ multipath-tools-120518/libmultipath/wwids.c +@@ -124,6 +124,32 @@ out: + } + + int ++should_multipath(struct path *pp1, vector pathvec) ++{ ++ int i; ++ struct path *pp2; ++ ++ condlog(4, "checking if %s should be multipathed", pp1->dev); ++ vector_foreach_slot(pathvec, pp2, i) { ++ if (pp1->dev == pp2->dev) ++ continue; ++ if (strncmp(pp1->wwid, pp2->wwid, WWID_SIZE) == 0) { ++ condlog(3, "found multiple paths with wwid %s, " ++ "multipathing %s", pp1->wwid, pp1->dev); ++ return 1; ++ } ++ } ++ if (check_wwids_file(pp1->wwid, 0) < 0) { ++ condlog(3, "wwid %s not in wwids file, skipping %s", ++ pp1->wwid, pp1->dev); ++ return 0; ++ } ++ condlog(3, "found wwid %s in wwids file, multipathing %s", pp1->wwid, ++ pp1->dev); ++ return 1; ++} ++ ++int + remember_wwid(char *wwid) + { + int ret = check_wwids_file(wwid, 1); +Index: multipath-tools-120518/libmultipath/wwids.h +=================================================================== +--- multipath-tools-120518.orig/libmultipath/wwids.h ++++ multipath-tools-120518/libmultipath/wwids.h +@@ -12,6 +12,7 @@ + "#\n" \ + "# Valid WWIDs:\n" + ++int should_multipath(struct path *pp, vector pathvec); + int remember_wwid(char *wwid); + int check_wwids_file(char *wwid, int write_wwid); + +Index: multipath-tools-120518/multipath/main.c +=================================================================== +--- multipath-tools-120518.orig/multipath/main.c ++++ multipath-tools-120518/multipath/main.c +@@ -332,7 +332,7 @@ configure (void) + /* + * core logic entry point + */ +- r = coalesce_paths(&vecs, NULL, NULL, conf->force_reload); ++ r = coalesce_paths(&vecs, NULL, refwwid, conf->force_reload); + + out: + if (refwwid) +Index: multipath-tools-120518/multipathd/main.c +=================================================================== +--- multipath-tools-120518.orig/multipathd/main.c ++++ multipath-tools-120518/multipathd/main.c +@@ -49,6 +49,7 @@ + #include <print.h> + #include <configure.h> + #include <prio.h> ++#include <wwids.h> + #include <pgpolicies.h> + #include <uevent.h> + +@@ -473,6 +474,11 @@ rescan: + return 1; + } + ++ if (conf->find_multipaths && ++ !should_multipath(pp, vecs->pathvec)) { ++ orphan_path(pp); ++ return 0; ++ } + condlog(4,"%s: creating new map", pp->dev); + if ((mpp = add_map_with_path(vecs, pp, 1))) { + mpp->action = ACT_CREATE; +Index: multipath-tools-120518/libmultipath/config.h +=================================================================== +--- multipath-tools-120518.orig/libmultipath/config.h ++++ multipath-tools-120518/libmultipath/config.h +@@ -104,6 +104,7 @@ struct config { + unsigned int dev_loss; + int log_checker_err; + int allow_queueing; ++ int find_multipaths; + uid_t uid; + gid_t gid; + mode_t mode; diff --git a/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch b/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch deleted file mode 100644 index 4250ec7..0000000 --- a/multipath-tools/patches/0010-RH-multipath-rules-udev-changes.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5a43356b54c2672441ce67cd9602904a5df04117 Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Mon, 19 Oct 2009 07:07:01 +0200 -Subject: [PATCH 10/12] RH: multipath rules + udev changes - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 ac97749... 064196d... M multipath/multipath.rules - multipath/Makefile | 6 +++--- - multipath/multipath.rules | 18 +++++++++++------- - 2 files changed, 14 insertions(+), 10 deletions(-) - -Index: multipath-tools/multipath/multipath.rules -=================================================================== ---- multipath-tools.orig/multipath/multipath.rules -+++ multipath-tools/multipath/multipath.rules -@@ -1,7 +1,11 @@ --# --# udev rules for multipathing. --# The persistent symlinks are created with the kpartx rules --# -- --# socket for uevents --SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event" -+# multipath wants the devmaps presented as meaninglful device names -+# so name them after their devmap name -+SUBSYSTEM!="block", GOTO="end_mpath" -+RUN+="socket:/org/kernel/dm/multipath_event" -+KERNEL!="dm-*", GOTO="end_mpath" -+ACTION!="change", GOTO="end_mpath" -+ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" -+ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" -+ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" -+RUN+="$env{DM_SBIN_PATH}/kpartx -a -p p $tempnode" -+LABEL="end_mpath" -Index: multipath-tools/multipath/Makefile -=================================================================== ---- multipath-tools.orig/multipath/Makefile -+++ multipath-tools/multipath/Makefile -@@ -21,15 +21,15 @@ $(EXEC): $(OBJS) - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ -+ $(INSTALL_PROGRAM) -d $(DESTDIR)/lib/udev/rules.d -+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/lib/udev/rules.d/40-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) - $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) - - uninstall: -- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules -+ rm $(DESTDIR)/lib/udev/rules.d/multipath.rules - rm $(DESTDIR)$(bindir)/$(EXEC) - rm $(DESTDIR)$(mandir)/$(EXEC).8.gz - rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz diff --git a/multipath-tools/patches/0011-RH-add-hp_tur-checker.patch b/multipath-tools/patches/0011-RH-add-hp_tur-checker.patch new file mode 100644 index 0000000..bc8d73b --- /dev/null +++ b/multipath-tools/patches/0011-RH-add-hp_tur-checker.patch @@ -0,0 +1,274 @@ +--- + libmultipath/checkers.h | 3 + + libmultipath/checkers/Makefile | 4 + + libmultipath/checkers/tur.c | 123 +++++++++++++++++++++++++++++++++++++++-- + multipath.conf.annotated | 5 + + 4 files changed, 128 insertions(+), 7 deletions(-) + +Index: multipath-tools-120613/libmultipath/checkers.h +=================================================================== +--- multipath-tools-120613.orig/libmultipath/checkers.h ++++ multipath-tools-120613/libmultipath/checkers.h +@@ -60,6 +60,7 @@ enum path_check_state { + + #define DIRECTIO "directio" + #define TUR "tur" ++#define HP_TUR "hp_tur" + #define HP_SW "hp_sw" + #define RDAC "rdac" + #define EMC_CLARIION "emc_clariion" +@@ -77,6 +78,7 @@ enum path_check_state { + #define CHECKER_MSG_LEN 256 + #define CHECKER_DEV_LEN 256 + #define LIB_CHECKER_NAMELEN 256 ++#define WWID_SIZE 128 + + struct checker { + struct list_head node; +@@ -88,6 +90,7 @@ struct checker { + int disable; + char name[CHECKER_NAME_LEN]; + char message[CHECKER_MSG_LEN]; /* comm with callers */ ++ char wwid[WWID_SIZE]; /* LUN wwid */ + void * context; /* store for persistent data */ + void ** mpcontext; /* store for persistent data shared + multipath-wide. Use MALLOC if +Index: multipath-tools-120613/libmultipath/checkers/Makefile +=================================================================== +--- multipath-tools-120613.orig/libmultipath/checkers/Makefile ++++ multipath-tools-120613/libmultipath/checkers/Makefile +@@ -8,6 +8,7 @@ LIBS= \ + libcheckcciss_tur.so \ + libcheckreadsector0.so \ + libchecktur.so \ ++ libcheckhp_tur.so \ + libcheckdirectio.so \ + libcheckemc_clariion.so \ + libcheckhp_sw.so \ +@@ -23,6 +24,9 @@ libcheckdirectio.so: libsg.o directio.o + libcheck%.so: libsg.o %.o + $(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^ + ++hp_tur.o: tur.c ++ $(CC) $(CFLAGS) -DCHECK_WWID -c -o $@ $< ++ + install: + $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir) + +Index: multipath-tools-120613/libmultipath/checkers/tur.c +=================================================================== +--- multipath-tools-120613.orig/libmultipath/checkers/tur.c ++++ multipath-tools-120613/libmultipath/checkers/tur.c +@@ -24,12 +24,101 @@ + #define TUR_CMD_LEN 6 + #define HEAVY_CHECK_COUNT 10 + ++#ifdef CHECK_WWID ++#define MSG_TUR_UP "HP tur checker reports path is up" ++#define MSG_TUR_DOWN "HP tur checker reports path is down" ++#define MSG_TUR_GHOST "HP tur checker reports path is in standby state" ++#define MSG_TUR_RUNNING "HP tur checker still running" ++#define MSG_TUR_TIMEOUT "HP tur checker timed out" ++#define MSG_TUR_FAILED "HP tur checker failed to initialize" ++#define EVPD 0x01 ++#define PAGE_83 0x83 ++#define INQUIRY_CMD 0x12 ++#define INQUIRY_CMDLEN 6 ++#define SCSI_INQ_BUFF_LEN 96 ++#else + #define MSG_TUR_UP "tur checker reports path is up" + #define MSG_TUR_DOWN "tur checker reports path is down" + #define MSG_TUR_GHOST "tur checker reports path is in standby state" + #define MSG_TUR_RUNNING "tur checker still running" + #define MSG_TUR_TIMEOUT "tur checker timed out" + #define MSG_TUR_FAILED "tur checker failed to initialize" ++#endif ++ ++#ifdef CHECK_WWID ++static int ++do_inq(int fd, unsigned int timeout, char * wwid) ++{ ++ int ret = -1; ++ unsigned char inq_cmd[INQUIRY_CMDLEN] = ++ {INQUIRY_CMD, EVPD, PAGE_83, 0, SCSI_INQ_BUFF_LEN, 0 }; ++ unsigned char sense_buffer[32]; ++ unsigned char resp_buffer[SCSI_INQ_BUFF_LEN]; ++ char *pbuff; ++ ++ int m,k; ++ int retry_tur = 5; ++ struct sg_io_hdr io_hdr; ++ ++retry: ++ memset(resp_buffer, 0, sizeof(resp_buffer)); ++ memset(&io_hdr, 0, sizeof(struct sg_io_hdr)); ++ ++ io_hdr.interface_id = 'S'; ++ io_hdr.cmd_len = sizeof(inq_cmd); ++ io_hdr.mx_sb_len = sizeof(sense_buffer); ++ io_hdr.dxfer_direction = -3; // Data transfer from the device. ++ io_hdr.dxfer_len = sizeof(resp_buffer); ++ io_hdr.dxferp = (unsigned char *)resp_buffer; ++ io_hdr.cmdp = inq_cmd; ++ io_hdr.sbp = sense_buffer; ++ io_hdr.timeout = timeout; // IOCTL timeout value. ++ ++ if (ioctl(fd, SG_IO, &io_hdr) < 0) { ++ condlog(0, "SG_IO ioctl failed: %s", strerror(errno)); ++ return ret; ++ } ++ if (io_hdr.info & SG_INFO_OK_MASK){ ++ int key = 0, asc, ascq; ++ ++ if (io_hdr.host_status == DID_BUS_BUSY || ++ io_hdr.host_status == DID_ERROR || ++ io_hdr.host_status == DID_TRANSPORT_DISRUPTED) { ++ if (--retry_tur) ++ goto retry; ++ } ++ if (io_hdr.sb_len_wr > 3) { ++ if (io_hdr.sbp[0] == 0x72 || io_hdr.sbp[0] == 0x73) { ++ key = io_hdr.sbp[1] & 0x0f; ++ asc = io_hdr.sbp[2]; ++ ascq = io_hdr.sbp[3]; ++ } else if (io_hdr.sb_len_wr > 13 && ++ ((io_hdr.sbp[0] & 0x7f) == 0x70 || ++ (io_hdr.sbp[0] & 0x7f) == 0x71)) { ++ key = io_hdr.sbp[2] & 0x0f; ++ asc = io_hdr.sbp[12]; ++ ascq = io_hdr.sbp[13]; ++ } ++ } ++ if (key == 0x6) { ++ /* Unit Attention, retry */ ++ if (--retry_tur) ++ goto retry; ++ } ++ return ret; ++ } ++ ++ pbuff = (char *) resp_buffer; ++ ++ wwid[0] = '3'; ++ for (m = 8, k = 1; m < 11; ++m, k+=2) ++ sprintf(&wwid[k], "%02x", (unsigned int)pbuff[m] & 0xff); ++ for (m = 11; m < 24; ++m, k+=2) ++ sprintf(&wwid[k], "%02x", (unsigned int)pbuff[m] & 0xff); ++ ++ return (ret = 0); ++} ++#endif + + struct tur_checker_context { + dev_t devt; +@@ -43,6 +132,7 @@ struct tur_checker_context { + pthread_cond_t active; + pthread_spinlock_t hldr_lock; + int holders; ++ char wwid[WWID_SIZE]; + char message[CHECKER_MSG_LEN]; + }; + +@@ -100,12 +190,15 @@ void libcheck_free (struct checker * c) + #define TUR_MSG(msg, fmt, args...) snprintf(msg, CHECKER_MSG_LEN, fmt, ##args); + + int +-tur_check(int fd, unsigned int timeout, char *msg) ++tur_check (int fd, unsigned int timeout, char *msg, char *wwid) + { + struct sg_io_hdr io_hdr; + unsigned char turCmdBlk[TUR_CMD_LEN] = { 0x00, 0, 0, 0, 0, 0 }; + unsigned char sense_buffer[32]; + int retry_tur = 5; ++#ifdef CHECK_WWID ++ char new_wwid[WWID_SIZE]; ++#endif + + retry: + memset(&io_hdr, 0, sizeof (struct sg_io_hdr)); +@@ -179,6 +272,24 @@ tur_check(int fd, unsigned int timeout, + TUR_MSG(msg, MSG_TUR_DOWN); + return PATH_DOWN; + } ++#ifdef CHECK_WWID ++ if (!do_inq(fd, timeout, new_wwid)) { ++ ++ if(!strcmp(wwid, "\0")) { ++ strcpy(wwid, new_wwid); ++ goto up; ++ } ++ ++ if (strcmp(wwid , new_wwid)) { ++ condlog(0, ++ "hp_tur: Lun collided. new_wwid %s old_wwid %s", ++ new_wwid, wwid); ++ TUR_MSG(msg, MSG_TUR_DOWN); ++ return PATH_DOWN; ++ } ++ } ++up: ++#endif + TUR_MSG(msg, MSG_TUR_UP); + return PATH_UP; + } +@@ -215,7 +326,7 @@ void *tur_thread(void *ctx) + ct->state = PATH_PENDING; + pthread_mutex_unlock(&ct->lock); + +- state = tur_check(ct->fd, ct->timeout, ct->message); ++ state = tur_check(ct->fd, ct->timeout, ct->message, ct->wwid); + + /* TUR checker done */ + pthread_mutex_lock(&ct->lock); +@@ -275,7 +386,7 @@ libcheck_check (struct checker * c) + ct->devt = sb.st_rdev; + + if (c->sync) +- return tur_check(c->fd, c->timeout, c->message); ++ return tur_check(c->fd, c->timeout, c->message, ct->wwid); + + /* + * Async mode +@@ -319,7 +430,8 @@ libcheck_check (struct checker * c) + pthread_mutex_unlock(&ct->lock); + condlog(3, "%d:%d: tur thread not responding, " + "using sync mode", TUR_DEVT(ct)); +- return tur_check(c->fd, c->timeout, c->message); ++ return tur_check(c->fd, c->timeout, c->message, ++ ct->wwid); + } + /* Start new TUR checker */ + ct->state = PATH_UNCHECKED; +@@ -337,7 +449,8 @@ libcheck_check (struct checker * c) + ct->holders--; + condlog(3, "%d:%d: failed to start tur thread, using" + " sync mode", TUR_DEVT(ct)); +- return tur_check(c->fd, c->timeout, c->message); ++ return tur_check(c->fd, c->timeout, c->message, ++ ct->wwid); + } + pthread_attr_destroy(&attr); + tur_timeout(&tsp); +Index: multipath-tools-120613/multipath.conf.annotated +=================================================================== +--- multipath-tools-120613.orig/multipath.conf.annotated ++++ multipath-tools-120613/multipath.conf.annotated +@@ -96,7 +96,8 @@ + # # name : path_checker, checker + # # scope : multipath & multipathd + # # desc : the default method used to determine the paths' state +-# # values : readsector0|tur|emc_clariion|hp_sw|directio|rdac|cciss_tur ++# # values : readsector0|tur|emc_clariion|hp_sw|directio|rdac| ++# cciss_tur|hp_tur + # # default : directio + # # + # path_checker directio +@@ -493,7 +494,7 @@ + # # scope : multipathd & multipathd + # # desc : path checking algorithm to use to check path state + # # values : readsector0|tur|emc_clariion|hp_sw|directio|rdac| +-# # cciss_tur ++# # cciss_tur|hp_tur + # # + # path_checker directio + # diff --git a/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch b/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch deleted file mode 100644 index 4e305ad..0000000 --- a/multipath-tools/patches/0011-RH-fix-init-script-LSB-headers.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 887b0721d29eed45621b5a7fefaf462378cc9dcd Mon Sep 17 00:00:00 2001 -From: Fabio M. Di Nitto <fdinitto(a)redhat.com> -Date: Mon, 19 Oct 2009 08:33:07 +0200 -Subject: [PATCH 11/12] RH: fix init script LSB headers - -Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> ---- -:100644 100644 e46b1b8... cfc9cf5... M multipathd/multipathd.init.redhat - multipathd/multipathd.init.redhat | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/multipathd/multipathd.init.redhat b/multipathd/multipathd.init.redhat -index e46b1b8..cfc9cf5 100644 ---- a/multipathd/multipathd.init.redhat -+++ b/multipathd/multipathd.init.redhat -@@ -7,6 +7,10 @@ - - ### BEGIN INIT INFO - # Provides: multipathd -+# Required-Start: -+# Required-Stop: -+# Default-Start: -+# Default-Stop: - # Short-Description: Control multipathd - # Description: This service monitors and manages - # device-mapper multipath devices --- -1.6.5.1 - diff --git a/multipath-tools/patches/0012-RH-RHEL5-style-partitions.patch b/multipath-tools/patches/0012-RH-RHEL5-style-partitions.patch new file mode 100644 index 0000000..47fa725 --- /dev/null +++ b/multipath-tools/patches/0012-RH-RHEL5-style-partitions.patch @@ -0,0 +1,327 @@ +--- + kpartx/bsd.c | 35 --------------- + kpartx/dos.c | 7 +-- + kpartx/kpartx.c | 123 +++++++------------------------------------------------- + kpartx/kpartx.h | 1 + kpartx/sun.c | 35 --------------- + 5 files changed, 24 insertions(+), 177 deletions(-) + +Index: multipath-tools-120123/kpartx/bsd.c +=================================================================== +--- multipath-tools-120123.orig/kpartx/bsd.c ++++ multipath-tools-120123/kpartx/bsd.c +@@ -50,10 +50,10 @@ int + read_bsd_pt(int fd, struct slice all, struct slice *sp, int ns) { + struct bsd_disklabel *l; + struct bsd_partition *p; +- unsigned int offset = all.start, end; ++ unsigned int offset = all.start; + int max_partitions; + char *bp; +- int n = 0, i, j; ++ int n = 0; + + bp = getblock(fd, offset+1); /* 1 sector suffices */ + if (bp == NULL) +@@ -79,36 +79,5 @@ read_bsd_pt(int fd, struct slice all, st + break; + } + } +- /* +- * Convention has it that the bsd disklabel will always have +- * the 'c' partition spanning the entire disk. +- * So we have to check for contained slices. +- */ +- for(i = 0; i < n; i++) { +- if (sp[i].size == 0) +- continue; +- +- end = sp[i].start + sp[i].size; +- for(j = 0; j < n; j ++) { +- if ( i == j ) +- continue; +- if (sp[j].size == 0) +- continue; +- +- if (sp[i].start < sp[j].start) { +- if (end > sp[j].start && +- end < sp[j].start + sp[j].size) { +- /* Invalid slice */ +- fprintf(stderr, +- "bsd_disklabel: slice %d overlaps with %d\n", i , j); +- sp[i].size = 0; +- } +- } else { +- if (end <= sp[j].start + sp[j].size) { +- sp[i].container = j + 1; +- } +- } +- } +- } + return n; + } +Index: multipath-tools-120123/kpartx/dos.c +=================================================================== +--- multipath-tools-120123.orig/kpartx/dos.c ++++ multipath-tools-120123/kpartx/dos.c +@@ -16,7 +16,7 @@ is_extended(int type) { + } + + static int +-read_extended_partition(int fd, struct partition *ep, int en, ++read_extended_partition(int fd, struct partition *ep, + struct slice *sp, int ns) + { + struct partition p; +@@ -53,7 +53,6 @@ read_extended_partition(int fd, struct p + if (n < ns) { + sp[n].start = here + le32_to_cpu(p.start_sect); + sp[n].size = le32_to_cpu(p.nr_sects); +- sp[n].container = en + 1; + n++; + } else { + fprintf(stderr, +@@ -98,7 +97,9 @@ read_dos_pt(int fd, struct slice all, st + break; + } + if (is_extended(p.sys_type)) { +- n += read_extended_partition(fd, &p, i, sp+n, ns-n); ++ n += read_extended_partition(fd, &p, sp+n, ns-n); ++ /* hide the extended partition itself */ ++ sp[i].size = 2; + } + } + return n; +Index: multipath-tools-120123/kpartx/kpartx.c +=================================================================== +--- multipath-tools-120123.orig/kpartx/kpartx.c ++++ multipath-tools-120123/kpartx/kpartx.c +@@ -190,7 +190,7 @@ get_hotplug_device(void) + + int + main(int argc, char **argv){ +- int i, j, m, n, op, off, arg, c, d, ro=0; ++ int i, j, m, n, op, off, arg, ro=0; + int fd = -1; + struct slice all; + struct pt *ptp; +@@ -380,49 +380,30 @@ main(int argc, char **argv){ + else + continue; + ++ /* ++ * test for overlap, as in the case of an extended partition ++ * zero their size to avoid mapping ++ */ ++ for (j = 0; j < n; j++) { ++ for (m = j + 1; m < n; m++) { ++ if (slices[m].start > slices[j].start && ++ slices[m].start < slices[j].start + ++ slices[j].size) ++ slices[j].size = 0; ++ } ++ } ++ + switch(what) { + case LIST: +- for (j = 0, c = 0, m = 0; j < n; j++) { ++ for (j = 0; j < n; j++) { + if (slices[j].size == 0) + continue; +- if (slices[j].container > 0) { +- c++; +- continue; +- } +- +- slices[j].minor = m++; + + printf("%s%s%d : 0 %" PRIu64 " %s %" PRIu64"\n", + mapname, delim, j+1, + slices[j].size, device, + slices[j].start); + } +- /* Loop to resolve contained slices */ +- d = c; +- while (c) { +- for (j = 0; j < n; j++) { +- uint64_t start; +- int k = slices[j].container - 1; +- +- if (slices[j].size == 0) +- continue; +- if (slices[j].minor > 0) +- continue; +- if (slices[j].container == 0) +- continue; +- slices[j].minor = m++; +- +- start = slices[j].start - slices[k].start; +- printf("%s%s%d : 0 %" PRIu64 " /dev/dm-%d %" PRIu64 "\n", +- mapname, delim, j+1, +- slices[j].size, +- slices[k].minor, start); +- c--; +- } +- /* Terminate loop if nothing more to resolve */ +- if (d == c) +- break; +- } + + break; + +@@ -461,16 +442,10 @@ main(int argc, char **argv){ + case ADD: + case UPDATE: + /* ADD and UPDATE share the same code that adds new partitions. */ +- for (j = 0, c = 0; j < n; j++) { ++ for (j = 0; j < n; j++) { + if (slices[j].size == 0) + continue; + +- /* Skip all contained slices */ +- if (slices[j].container > 0) { +- c++; +- continue; +- } +- + if (safe_sprintf(partname, "%s%s%d", + mapname, delim, j+1)) { + fprintf(stderr, "partname too small\n"); +@@ -511,72 +486,6 @@ main(int argc, char **argv){ + slices[j].minor, slices[j].size, + DM_TARGET, params); + } +- /* Loop to resolve contained slices */ +- d = c; +- while (c) { +- for (j = 0; j < n; j++) { +- uint64_t start; +- int k = slices[j].container - 1; +- +- if (slices[j].size == 0) +- continue; +- +- /* Skip all existing slices */ +- if (slices[j].minor > 0) +- continue; +- +- /* Skip all simple slices */ +- if (slices[j].container == 0) +- continue; +- +- /* Check container slice */ +- if (slices[k].size == 0) +- fprintf(stderr, "Invalid slice %d\n", +- k); +- +- if (safe_sprintf(partname, "%s%s%d", +- mapname, delim, j+1)) { +- fprintf(stderr, "partname too small\n"); +- exit(1); +- } +- strip_slash(partname); +- +- start = slices[j].start - slices[k].start; +- if (safe_sprintf(params, "%d:%d %" PRIu64, +- slices[k].major, +- slices[k].minor, +- start)) { +- fprintf(stderr, "params too small\n"); +- exit(1); +- } +- +- op = (dm_map_present(partname) ? +- DM_DEVICE_RELOAD : DM_DEVICE_CREATE); +- +- dm_addmap(op, partname, DM_TARGET, params, +- slices[j].size, ro, uuid, j+1, +- buf.st_mode & 0777, +- buf.st_uid, buf.st_gid, +- &cookie); +- +- if (op == DM_DEVICE_RELOAD) +- dm_simplecmd(DM_DEVICE_RESUME, +- partname, 1, +- &cookie); +- +- dm_devn(partname, &slices[j].major, +- &slices[j].minor); +- +- if (verbose) +- printf("add map %s : 0 %" PRIu64 " %s %s\n", +- partname, slices[j].size, +- DM_TARGET, params); +- c--; +- } +- /* Terminate loop */ +- if (d == c) +- break; +- } + + if (what == ADD) { + /* Skip code that removes devmappings for deleted partitions */ +Index: multipath-tools-120123/kpartx/kpartx.h +=================================================================== +--- multipath-tools-120123.orig/kpartx/kpartx.h ++++ multipath-tools-120123/kpartx/kpartx.h +@@ -24,7 +24,6 @@ + struct slice { + uint64_t start; + uint64_t size; +- int container; + int major; + int minor; + }; +Index: multipath-tools-120123/kpartx/sun.c +=================================================================== +--- multipath-tools-120123.orig/kpartx/sun.c ++++ multipath-tools-120123/kpartx/sun.c +@@ -62,8 +62,8 @@ int + read_sun_pt(int fd, struct slice all, struct slice *sp, int ns) { + struct sun_disk_label *l; + struct sun_raw_part *s; +- unsigned int offset = all.start, end; +- int i, j, n; ++ unsigned int offset = all.start; ++ int i, n; + char *bp; + + bp = getblock(fd, offset); +@@ -95,37 +95,6 @@ read_sun_pt(int fd, struct slice all, st + break; + } + } +- /* +- * Convention has it that the SUN disklabel will always have +- * the 'c' partition spanning the entire disk. +- * So we have to check for contained slices. +- */ +- for(i = 0; i < SUN_DISK_MAXPARTITIONS; i++) { +- if (sp[i].size == 0) +- continue; +- +- end = sp[i].start + sp[i].size; +- for(j = 0; j < SUN_DISK_MAXPARTITIONS; j ++) { +- if ( i == j ) +- continue; +- if (sp[j].size == 0) +- continue; +- +- if (sp[i].start < sp[j].start) { +- if (end > sp[j].start && +- end < sp[j].start + sp[j].size) { +- /* Invalid slice */ +- fprintf(stderr, +- "sun_disklabel: slice %d overlaps with %d\n", i , j); +- sp[i].size = 0; +- } +- } else { +- if (end <= sp[j].start + sp[j].size) { +- sp[i].container = j + 1; +- } +- } +- } +- } + return n; + } + diff --git a/multipath-tools/patches/0012-RH-udev-sync-support.patch b/multipath-tools/patches/0012-RH-udev-sync-support.patch deleted file mode 100644 index b30828c..0000000 --- a/multipath-tools/patches/0012-RH-udev-sync-support.patch +++ /dev/null @@ -1,362 +0,0 @@ ---- - kpartx/devmapper.c | 10 ++++++++-- - kpartx/devmapper.h | 4 ++-- - kpartx/kpartx.c | 22 ++++++++++++++++------ - libmultipath/config.h | 2 ++ - libmultipath/configure.c | 2 +- - libmultipath/devmapper.c | 29 +++++++++++++++++++---------- - libmultipath/devmapper.h | 8 +++++--- - multipath/main.c | 1 + - multipathd/main.c | 1 + - 9 files changed, 55 insertions(+), 24 deletions(-) - -Index: multipath-tools/kpartx/devmapper.c -=================================================================== ---- multipath-tools.orig/kpartx/devmapper.c -+++ multipath-tools/kpartx/devmapper.c -@@ -52,8 +52,10 @@ dm_prereq (char * str, int x, int y, int - } - - extern int --dm_simplecmd (int task, const char *name, int no_flush) { -+dm_simplecmd (int task, const char *name, int no_flush, uint32_t *cookie) { - int r = 0; -+ int udev_wait_flag = (task == DM_DEVICE_RESUME || -+ task == DM_DEVICE_REMOVE); - struct dm_task *dmt; - - if (!(dmt = dm_task_create(task))) -@@ -68,6 +70,8 @@ dm_simplecmd (int task, const char *name - if (no_flush) - dm_task_no_flush(dmt); - -+ if (udev_wait_flag && !dm_task_set_cookie(dmt, cookie, 0)) -+ goto out; - r = dm_task_run(dmt); - - out: -@@ -78,7 +82,7 @@ dm_simplecmd (int task, const char *name - extern int - dm_addmap (int task, const char *name, const char *target, - const char *params, uint64_t size, const char *uuid, int part, -- mode_t mode, uid_t uid, gid_t gid) { -+ mode_t mode, uid_t uid, gid_t gid, uint32_t *cookie) { - int r = 0; - struct dm_task *dmt; - char *prefixed_uuid = NULL; -@@ -113,6 +117,8 @@ dm_addmap (int task, const char *name, c - - dm_task_no_open_count(dmt); - -+ if (task == DM_DEVICE_CREATE && !dm_task_set_cookie(dmt, cookie, 0)) -+ goto addout; - r = dm_task_run (dmt); - - addout: -Index: multipath-tools/kpartx/kpartx.c -=================================================================== ---- multipath-tools.orig/kpartx/kpartx.c -+++ multipath-tools/kpartx/kpartx.c -@@ -82,7 +82,7 @@ initpts(void) - addpts("sun", read_sun_pt); - } - --static char short_opts[] = "ladgvp:t:"; -+static char short_opts[] = "ladgvp:t:s"; - - /* Used in gpt.c */ - int force_gpt=0; -@@ -96,6 +96,7 @@ usage(void) { - printf("\t-p set device name-partition number delimiter\n"); - printf("\t-g force GUID partition table (GPT)\n"); - printf("\t-v verbose\n"); -+ printf("\t-s sync mode. Don't return until the partitions are created\n"); - return 1; - } - -@@ -198,7 +199,9 @@ main(int argc, char **argv){ - int loopro = 0; - int hotplug = 0; - int loopcreated = 0; -+ int sync = 0; - struct stat buf; -+ uint32_t cookie = 0; - - initpts(); - init_crc32(); -@@ -251,11 +254,17 @@ main(int argc, char **argv){ - case 'd': - what = DELETE; - break; -+ case 's': -+ sync = 1; -+ break; - default: - usage(); - exit(1); - } - -+ if (!sync) -+ dm_udev_set_sync_support(0); -+ - if (dm_prereq(DM_TARGET, 0, 0, 0) && (what == ADD || what == DELETE)) { - fprintf(stderr, "device mapper prerequisites not met\n"); - exit(1); -@@ -413,8 +422,8 @@ main(int argc, char **argv){ - if (!slices[j].size || !dm_map_present(partname)) - continue; - -- if (!dm_simplecmd(DM_DEVICE_REMOVE, -- partname, 0)) { -+ if (!dm_simplecmd(DM_DEVICE_REMOVE, partname, -+ 0, &cookie)) { - r++; - continue; - } -@@ -463,14 +472,14 @@ main(int argc, char **argv){ - if (!dm_addmap(op, partname, DM_TARGET, params, - slices[j].size, uuid, j+1, - buf.st_mode & 0777, buf.st_uid, -- buf.st_gid)) { -+ buf.st_gid, &cookie)) { - fprintf(stderr, "create/reload failed on %s\n", - partname); - r++; - } - if (op == DM_DEVICE_RELOAD && -- !dm_simplecmd(DM_DEVICE_RESUME, -- partname, 1)) { -+ !dm_simplecmd(DM_DEVICE_RESUME, partname, -+ 1, &cookie)) { - fprintf(stderr, "resume failed on %s\n", - partname); - r++; -@@ -557,6 +566,7 @@ main(int argc, char **argv){ - if (n > 0) - break; - } -+ dm_udev_wait(cookie); - dm_lib_release(); - dm_lib_exit(); - -Index: multipath-tools/kpartx/devmapper.h -=================================================================== ---- multipath-tools.orig/kpartx/devmapper.h -+++ multipath-tools/kpartx/devmapper.h -@@ -3,9 +3,9 @@ - #define MKDEV(ma,mi) ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12)) - - int dm_prereq (char *, int, int, int); --int dm_simplecmd (int, const char *, int); -+int dm_simplecmd (int, const char *, int, uint32_t *); - int dm_addmap (int, const char *, const char *, const char *, uint64_t, -- const char *, int, mode_t, uid_t, gid_t); -+ const char *, int, mode_t, uid_t, gid_t, uint32_t *); - int dm_map_present (char *); - char * dm_mapname(int major, int minor); - dev_t dm_get_first_dep(char *devname); -Index: multipath-tools/libmultipath/config.h -=================================================================== ---- multipath-tools.orig/libmultipath/config.h -+++ multipath-tools/libmultipath/config.h -@@ -2,6 +2,7 @@ - #define _CONFIG_H - - #include <sys/types.h> -+#include <stdint.h> - - #define ORIGIN_DEFAULT 0 - #define ORIGIN_CONFIG 1 -@@ -84,6 +85,7 @@ struct config { - uid_t uid; - gid_t gid; - mode_t mode; -+ uint32_t cookie; - - char * dev; - char * sysfs_dir; -Index: multipath-tools/libmultipath/devmapper.c -=================================================================== ---- multipath-tools.orig/libmultipath/devmapper.c -+++ multipath-tools/libmultipath/devmapper.c -@@ -149,8 +149,10 @@ dm_prereq (void) - } - - static int --dm_simplecmd (int task, const char *name, int no_flush) { -+dm_simplecmd (int task, const char *name, int no_flush, int need_sync) { - int r = 0; -+ int udev_wait_flag = (need_sync && (task == DM_DEVICE_RESUME || -+ task == DM_DEVICE_REMOVE)); - struct dm_task *dmt; - - if (!(dmt = dm_task_create (task))) -@@ -166,6 +168,8 @@ dm_simplecmd (int task, const char *name - dm_task_no_flush(dmt); /* for DM_DEVICE_SUSPEND/RESUME */ - #endif - -+ if (udev_wait_flag && !dm_task_set_cookie(dmt, &conf->cookie, 0)) -+ goto out; - r = dm_task_run (dmt); - - out: -@@ -174,13 +178,13 @@ dm_simplecmd (int task, const char *name - } - - extern int --dm_simplecmd_flush (int task, const char *name) { -- return dm_simplecmd(task, name, 0); -+dm_simplecmd_flush (int task, const char *name, int needsync) { -+ return dm_simplecmd(task, name, 0, needsync); - } - - extern int - dm_simplecmd_noflush (int task, const char *name) { -- return dm_simplecmd(task, name, 1); -+ return dm_simplecmd(task, name, 1, 1); - } - - extern int -@@ -226,6 +230,9 @@ dm_addmap (int task, const char *target, - - dm_task_no_open_count(dmt); - -+ if (task == DM_DEVICE_CREATE && -+ !dm_task_set_cookie(dmt, &conf->cookie, 0)) -+ goto freeout; - r = dm_task_run (dmt); - - freeout: -@@ -249,7 +256,7 @@ _dm_addmap_create (struct multipath *mpp - if (!r && dm_map_present(mpp->alias)) { - condlog(3, "%s: failed to load map (a path might be in use)", - mpp->alias); -- dm_flush_map(mpp->alias); -+ dm_flush_map_nosync(mpp->alias); - } - return r; - } -@@ -529,7 +536,7 @@ out: - } - - extern int --dm_flush_map (const char * mapname) -+_dm_flush_map (const char * mapname, int need_sync) - { - int r; - -@@ -539,7 +546,7 @@ dm_flush_map (const char * mapname) - if (dm_type(mapname, TGT_MPATH) <= 0) - return 0; /* nothing to do */ - -- if (dm_remove_partmaps(mapname)) -+ if (dm_remove_partmaps(mapname, need_sync)) - return 1; - - if (dm_get_opencount(mapname)) { -@@ -547,7 +554,7 @@ dm_flush_map (const char * mapname) - return 1; - } - -- r = dm_simplecmd_flush(DM_DEVICE_REMOVE, mapname); -+ r = dm_simplecmd_flush(DM_DEVICE_REMOVE, mapname, need_sync); - - if (r) { - condlog(4, "multipath map %s removed", mapname); -@@ -883,7 +890,7 @@ bad: - } - - int --dm_remove_partmaps (const char * mapname) -+dm_remove_partmaps (const char * mapname, int need_sync) - { - struct dm_task *dmt; - struct dm_names *names; -@@ -946,7 +953,7 @@ dm_remove_partmaps (const char * mapname - */ - condlog(4, "partition map %s removed", - names->name); -- dm_simplecmd_flush(DM_DEVICE_REMOVE, names->name); -+ dm_simplecmd_flush(DM_DEVICE_REMOVE, names->name, need_sync); - } - - next = names->next; -@@ -1102,6 +1109,8 @@ dm_rename (char * old, char * new) - - dm_task_no_open_count(dmt); - -+ if (!dm_task_set_cookie(dmt, &conf->cookie, 0)) -+ goto out; - if (!dm_task_run(dmt)) - goto out; - -Index: multipath-tools/libmultipath/devmapper.h -=================================================================== ---- multipath-tools.orig/libmultipath/devmapper.h -+++ multipath-tools/libmultipath/devmapper.h -@@ -8,7 +8,7 @@ - - void dm_init(void); - int dm_prereq (void); --int dm_simplecmd_flush (int, const char *); -+int dm_simplecmd_flush (int, const char *, int); - int dm_simplecmd_noflush (int, const char *); - int dm_addmap_create (struct multipath *mpp); - int dm_addmap_create_ro (struct multipath *mpp); -@@ -18,7 +18,9 @@ int dm_map_present (const char *); - int dm_get_map(char *, unsigned long long *, char *); - int dm_get_status(char *, char *); - int dm_type(const char *, char *); --int dm_flush_map (const char *); -+int _dm_flush_map (const char *, int); -+#define dm_flush_map(mapname) _dm_flush_map(mapname, 1) -+#define dm_flush_map_nosync(mapname) _dm_flush_map(mapname, 0) - int dm_flush_maps (void); - int dm_fail_path(char * mapname, char * path); - int dm_reinstate_path(char * mapname, char * path); -@@ -31,7 +33,7 @@ int dm_get_maps (vector mp); - int dm_geteventnr (char *name); - int dm_get_minor (char *name); - char * dm_mapname(int major, int minor); --int dm_remove_partmaps (const char * mapname); -+int dm_remove_partmaps (const char * mapname, int need_sync); - int dm_get_uuid(char *name, char *uuid); - int dm_get_info (char * mapname, struct dm_info ** dmi); - int dm_rename (char * old, char * new); -Index: multipath-tools/multipath/main.c -=================================================================== ---- multipath-tools.orig/multipath/main.c -+++ multipath-tools/multipath/main.c -@@ -454,6 +454,7 @@ main (int argc, char *argv[]) - condlog(3, "restart multipath configuration process"); - - out: -+ dm_udev_wait(conf->cookie); - - sysfs_cleanup(); - dm_lib_release(); -Index: multipath-tools/multipathd/main.c -=================================================================== ---- multipath-tools.orig/multipathd/main.c -+++ multipath-tools/multipathd/main.c -@@ -1396,6 +1396,7 @@ child (void * param) - exit(1); - } - conf->daemon = 1; -+ dm_udev_set_sync_support(0); - /* - * fetch and configure both paths and multipaths - */ -Index: multipath-tools/libmultipath/configure.c -=================================================================== ---- multipath-tools.orig/libmultipath/configure.c -+++ multipath-tools/libmultipath/configure.c -@@ -373,7 +373,7 @@ domap (struct multipath * mpp) - if (!r) - r = dm_addmap_reload_ro(mpp); - if (r) -- r = dm_simplecmd_flush(DM_DEVICE_RESUME, mpp->alias); -+ r = dm_simplecmd_flush(DM_DEVICE_RESUME, mpp->alias, 1); - break; - - case ACT_RENAME: diff --git a/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch b/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch deleted file mode 100644 index 63b493b..0000000 --- a/multipath-tools/patches/0013-RH-add-weighted_prio-prioritizer.patch +++ /dev/null @@ -1,546 +0,0 @@ ---- - libmultipath/config.c | 10 ++ - libmultipath/config.h | 4 + - libmultipath/dict.c | 92 ++++++++++++++++++++--- - libmultipath/discovery.c | 56 +++++++------- - libmultipath/prio.h | 1 - libmultipath/prioritizers/Makefile | 3 - libmultipath/prioritizers/weighted.c | 139 +++++++++++++++++++++++++++++++++++ - libmultipath/prioritizers/weighted.h | 8 ++ - libmultipath/propsel.c | 11 ++ - libmultipath/structs.h | 1 - 10 files changed, 286 insertions(+), 39 deletions(-) - -Index: multipath-tools/libmultipath/config.c -=================================================================== ---- multipath-tools.orig/libmultipath/config.c -+++ multipath-tools/libmultipath/config.c -@@ -156,6 +156,9 @@ free_hwe (struct hwentry * hwe) - if (hwe->prio_name) - FREE(hwe->prio_name); - -+ if (hwe->prio_args) -+ FREE(hwe->prio_args); -+ - if (hwe->bl_product) - FREE(hwe->bl_product); - -@@ -195,6 +198,12 @@ free_mpe (struct mpentry * mpe) - if (mpe->alias) - FREE(mpe->alias); - -+ if (mpe->prio_name) -+ FREE(mpe->prio_name); -+ -+ if (mpe->prio_args) -+ FREE(mpe->prio_args); -+ - FREE(mpe); - } - -@@ -279,6 +288,7 @@ merge_hwe (struct hwentry * hwe1, struct - merge_str(selector); - merge_str(checker_name); - merge_str(prio_name); -+ merge_str(prio_args); - merge_str(bl_product); - merge_num(pgpolicy); - merge_num(pgfailback); -Index: multipath-tools/libmultipath/config.h -=================================================================== ---- multipath-tools.orig/libmultipath/config.h -+++ multipath-tools/libmultipath/config.h -@@ -25,6 +25,7 @@ struct hwentry { - char * selector; - char * checker_name; - char * prio_name; -+ char * prio_args; - - int pgpolicy; - int pgfailback; -@@ -43,6 +44,8 @@ struct mpentry { - char * alias; - char * getuid; - char * selector; -+ char * prio_name; -+ char * prio_args; - - int pgpolicy; - int pgfailback; -@@ -97,6 +100,7 @@ struct config { - char * hwhandler; - char * bindings_file; - char * prio_name; -+ char * prio_args; - char * checker_name; - - vector keywords; -Index: multipath-tools/libmultipath/dict.c -=================================================================== ---- multipath-tools.orig/libmultipath/dict.c -+++ multipath-tools/libmultipath/dict.c -@@ -139,11 +139,23 @@ def_getuid_callout_handler(vector strvec - static int - def_prio_handler(vector strvec) - { -- conf->prio_name = set_value(strvec); -+ char *name, *args; - -- if (!conf->prio_name) -+ name = set_value(strvec); -+ if (!name) - return 1; - -+ args = strpbrk(name, " \t"); -+ if (args) { -+ *args = 0; -+ while(*++args && isblank(*args)); /* Do nothing */ -+ } -+ -+ conf->prio_name = STRDUP(name); -+ if (args && *args) -+ conf->prio_args = STRDUP(args); -+ -+ FREE(name); - return 0; - } - -@@ -806,16 +818,27 @@ hw_handler_handler(vector strvec) - static int - hw_prio_handler(vector strvec) - { -+ char *name, *args; - struct hwentry * hwe = VECTOR_LAST_SLOT(conf->hwtable); - - if (!hwe) - return 1; - -- hwe->prio_name = set_value(strvec); -- -- if (!hwe->prio_name) -+ name = set_value(strvec); -+ if (!name) - return 1; - -+ args = strpbrk(name, " \t"); -+ if (args) { -+ *args = 0; -+ while(*++args && isblank(*args)); /* Do nothing */ -+ } -+ -+ hwe->prio_name = STRDUP(name); -+ if (args && *args) -+ hwe->prio_args = STRDUP(args); -+ -+ FREE(name); - return 0; - } - -@@ -1293,6 +1316,33 @@ mp_flush_on_last_del_handler(vector strv - return 0; - } - -+static int -+mp_prio_handler(vector strvec) -+{ -+ char *name, *args; -+ struct mpentry *mpe = VECTOR_LAST_SLOT(conf->mptable); -+ -+ if (!mpe) -+ return 1; -+ -+ name = set_value(strvec); -+ if (!name) -+ return 1; -+ -+ args = strpbrk(name, " \t"); -+ if (args) { -+ *args = 0; -+ while(*++args && isblank(*args)); /* Do nothing */ -+ } -+ -+ mpe->prio_name = STRDUP(name); -+ if (args && *args) -+ mpe->prio_args = STRDUP(args); -+ -+ FREE(name); -+ return 0; -+} -+ - /* - * config file keywords printing - */ -@@ -1472,6 +1522,20 @@ snprint_mp_flush_on_last_del (char * buf - } - - static int -+snprint_mp_prio (char * buff, int len, void * data) -+{ -+ struct mpentry * mpe = (struct mpentry *)data; -+ -+ if (!mpe->prio_name) -+ return 0; -+ if (!strcmp(mpe->prio_name, conf->prio_name) && !mpe->prio_args) -+ return 0; -+ if (!mpe->prio_args) -+ return snprintf(buff, len, "%s", mpe->prio_name); -+ return snprintf(buff, len, "%s %s", mpe->prio_name, mpe->prio_args); -+} -+ -+static int - snprint_hw_fast_io_fail(char * buff, int len, void * data) - { - struct hwentry * hwe = (struct hwentry *)data; -@@ -1545,10 +1609,11 @@ snprint_hw_prio (char * buff, int len, v - - if (!hwe->prio_name) - return 0; -- if (!strcmp(hwe->prio_name, conf->prio_name)) -+ if (!strcmp(hwe->prio_name, conf->prio_name) && !hwe->prio_args) - return 0; -- -- return snprintf(buff, len, "%s", hwe->prio_name); -+ if (!hwe->prio_args) -+ return snprintf(buff, len, "%s", hwe->prio_name); -+ return snprintf(buff, len, "%s %s", hwe->prio_name, hwe->prio_args); - } - - static int -@@ -1837,10 +1902,14 @@ snprint_def_prio (char * buff, int len, - return 0; - - if (strlen(conf->prio_name) == strlen(DEFAULT_PRIO) && -- !strcmp(conf->prio_name, DEFAULT_PRIO)) -+ !strcmp(conf->prio_name, DEFAULT_PRIO) && !conf->prio_args) - return 0; -- -- return snprintf(buff, len, "%s", conf->prio_name); -+ -+ if (!conf->prio_args) -+ return snprintf(buff, len, "%s", conf->prio_name); -+ else -+ return snprintf(buff, len, "%s %s", conf->prio_name, -+ conf->prio_args); - } - - static int -@@ -2146,5 +2215,6 @@ init_keywords(void) - install_keyword("mode", &mp_mode_handler, &snprint_mp_mode); - install_keyword("uid", &mp_uid_handler, &snprint_mp_uid); - install_keyword("gid", &mp_gid_handler, &snprint_mp_gid); -+ install_keyword("prio", &mp_prio_handler, &snprint_mp_prio); - install_sublevel_end(); - } -Index: multipath-tools/libmultipath/discovery.c -=================================================================== ---- multipath-tools.orig/libmultipath/discovery.c -+++ multipath-tools/libmultipath/discovery.c -@@ -800,30 +800,6 @@ get_state (struct path * pp, int daemon) - } - - static int --get_prio (struct path * pp) --{ -- if (!pp) -- return 0; -- -- if (!pp->prio) { -- select_prio(pp); -- if (!pp->prio) { -- condlog(3, "%s: no prio selected", pp->dev); -- return 1; -- } -- } -- pp->priority = prio_getprio(pp->prio, pp); -- if (pp->priority < 0) { -- condlog(3, "%s: %s prio error", pp->dev, prio_name(pp->prio)); -- pp->priority = PRIO_UNDEF; -- return 1; -- } -- condlog(3, "%s: %s prio = %u", -- pp->dev, prio_name(pp->prio), pp->priority); -- return 0; --} -- --static int - get_uid (struct path * pp) - { - char buff[CALLOUT_MAX_SIZE]; -@@ -850,6 +826,32 @@ get_uid (struct path * pp) - return 0; - } - -+static int -+get_prio (struct path * pp) -+{ -+ if (!pp) -+ return 0; -+ -+ if (!pp->prio) { -+ if (!strlen(pp->wwid)) -+ get_uid(pp); -+ select_prio(pp); -+ if (!pp->prio) { -+ condlog(3, "%s: no prio selected", pp->dev); -+ return 1; -+ } -+ } -+ pp->priority = prio_getprio(pp->prio, pp); -+ if (pp->priority < 0) { -+ condlog(3, "%s: %s prio error", pp->dev, prio_name(pp->prio)); -+ pp->priority = PRIO_UNDEF; -+ return 1; -+ } -+ condlog(3, "%s: %s prio = %u", -+ pp->dev, prio_name(pp->prio), pp->priority); -+ return 0; -+} -+ - extern int - pathinfo (struct path *pp, vector hwtable, int mask) - { -@@ -887,6 +889,9 @@ pathinfo (struct path *pp, vector hwtabl - goto blank; - } - -+ if (mask & DI_WWID && !strlen(pp->wwid)) -+ get_uid(pp); -+ - /* - * Retrieve path priority, even for PATH_DOWN paths if it has never - * been successfully obtained before. -@@ -895,9 +900,6 @@ pathinfo (struct path *pp, vector hwtabl - (pp->state != PATH_DOWN || pp->priority == PRIO_UNDEF)) - get_prio(pp); - -- if (mask & DI_WWID && !strlen(pp->wwid)) -- get_uid(pp); -- - return 0; - - blank: -Index: multipath-tools/libmultipath/prio.h -=================================================================== ---- multipath-tools.orig/libmultipath/prio.h -+++ multipath-tools/libmultipath/prio.h -@@ -24,6 +24,7 @@ - #define PRIO_NETAPP "netapp" - #define PRIO_RANDOM "random" - #define PRIO_RDAC "rdac" -+#define PRIO_WEIGHTED "weighted" - - /* - * Value used to mark the fact prio was not defined -Index: multipath-tools/libmultipath/prioritizers/Makefile -=================================================================== ---- multipath-tools.orig/libmultipath/prioritizers/Makefile -+++ multipath-tools/libmultipath/prioritizers/Makefile -@@ -13,7 +13,8 @@ LIBS = \ - libprioalua.so \ - libpriotpg_pref.so \ - libprionetapp.so \ -- libpriohds.so -+ libpriohds.so \ -+ libprioweighted.so \ - - CFLAGS += -I.. - -Index: multipath-tools/libmultipath/prioritizers/weighted.c -=================================================================== ---- /dev/null -+++ multipath-tools/libmultipath/prioritizers/weighted.c -@@ -0,0 +1,139 @@ -+/****************************************************************************** -+******************************************************************************* -+** -+** Copyright (C) 2009 Red Hat, Inc. All rights reserved. -+** -+** This copyrighted material is made available to anyone wishing to use, -+** modify, copy, or redistribute it subject to the terms and conditions -+** of the GNU General Public License v.2. -+** -+******************************************************************************* -+******************************************************************************/ -+ -+/* This prioritizer is based on a path's device name or its H:T:B:L. Both of -+ * these can change when the node is rebooted, and can differ from node to -+ * node. (i.e. there is no guarantee that sda will point to the same device -+ * after a reboot) If you use this prioritizer, it may be necessary to -+ * manually edit /etc/multipath.conf after any reboot -+ * -+ * Format: -+ * prio "weighted hbtl <regex> <prio> [<regex> <prio>] -+ * prio "weighted devname <regex> <prio> [<regex> <prio>] -+ * -+ * Examples: -+ * prio "weighted hbtl 4:* 2 3:.:.:. 1" -+ * prio "weighted devname sda 2 sde 1" -+ * -+ */ -+ -+#include <string.h> -+#include <prio.h> -+#include <debug.h> -+#include <regex.h> -+ -+#include "weighted.h" -+ -+#define DEFAULT_WEIGHTED_PRIO 0 -+ -+#define pp_weighted_log(prio, fmt, args...) \ -+ condlog(prio, "%s: weighted prio: " fmt, dev, ##args) -+ -+static char * -+next_str(char **str) -+{ -+ char *next; -+ -+ do { -+ next = strsep(str, " \t"); -+ } while (next && strcmp(next, "") == 0); -+ return next; -+} -+ -+ -+static int -+match (char *dev, char *target, char *regex_str, char *prio_str, -+ unsigned int *prio) -+{ -+ -+ regex_t regex; -+ int err, ret = 0; -+ char *errbuf; -+ size_t errbuf_size; -+ unsigned int prio_match; -+ -+ if (sscanf(prio_str, "%u", &prio_match) != 1) { -+ condlog(0, "%s: weighted prio: invalid prio '%s'", dev, -+ prio_str); -+ return 0; -+ } -+ err = regcomp(&regex, regex_str, REG_EXTENDED|REG_NOSUB); -+ if (err) { -+ errbuf_size = regerror(err, &regex, NULL, 0); -+ errbuf = malloc(errbuf_size); -+ regerror(err, &regex, errbuf, errbuf_size); -+ condlog(0, "%s: weighted prio: cannot compile regex '%s' : %s", -+ dev, regex_str, errbuf); -+ free(errbuf); -+ return 0; -+ } -+ if (regexec(&regex, target, 0, NULL, 0) == 0) { -+ *prio = prio_match; -+ ret = 1; -+ } -+ -+ regfree(&regex); -+ return ret; -+} -+ -+int -+prio_weighted(struct path * pp) -+{ -+ char target[FILE_NAME_SIZE]; -+ char *buff, *args, *ptr, *prio_str; -+ unsigned int prio = DEFAULT_WEIGHTED_PRIO; -+ char *regex_str = NULL; -+ int regex_size = 0; -+ -+ if (!pp->prio_args) -+ return DEFAULT_WEIGHTED_PRIO; -+ buff = args = strdup(pp->prio_args); -+ ptr = next_str(&args); -+ -+ if (strcasecmp(ptr, "hbtl") == 0) -+ sprintf(target, "%d:%d:%d:%d", pp->sg_id.host_no, -+ pp->sg_id.channel, pp->sg_id.scsi_id, pp->sg_id.lun); -+ else if (strcasecmp(ptr, "devname") == 0) -+ strcpy(target, pp->dev); -+ else { -+ condlog(0, "%s: weighted prio: invalid argument. Want 'hbtl' or 'devname'. Got '%s'", pp->dev, ptr); -+ goto out; -+ } -+ -+ while ((ptr = next_str(&args)) != NULL) { -+ -+ prio_str = next_str(&args); -+ if (!prio_str) { -+ condlog(0, "%s weighted prio: missing prio for regex '%s'", pp->dev, ptr); -+ goto out; -+ } -+ if (!regex_str || regex_size < strlen(ptr) + 3){ -+ regex_size = strlen(ptr) + 3; -+ regex_str = realloc(regex_str, regex_size); -+ } -+ sprintf(regex_str, "%s%s%s", (ptr[0] == '^')? "" : "^", -+ ptr, (ptr[strlen(ptr)-1] == '$')? "" : "$"); -+ if (match(pp->dev, target, regex_str, prio_str, &prio)) -+ break; -+ } -+out: -+ free(buff); -+ if (regex_str) -+ free(regex_str); -+ return prio; -+} -+ -+int -+getprio(struct path * pp) -+{ -+ return prio_weighted(pp); -+} -Index: multipath-tools/libmultipath/propsel.c -=================================================================== ---- multipath-tools.orig/libmultipath/propsel.c -+++ multipath-tools/libmultipath/propsel.c -@@ -312,14 +312,25 @@ select_getuid (struct path * pp) - extern int - select_prio (struct path * pp) - { -+ struct mpentry * mpe; -+ -+ if ((mpe = find_mpe(pp->wwid)) && mpe->prio_name) { -+ pp->prio = prio_lookup(mpe->prio_name); -+ pp->prio_args = mpe->prio_args; -+ condlog(3, "%s: prio = %s (LUN setting)", -+ pp->dev, mpe->prio_name); -+ return 0; -+ } - if (pp->hwe && pp->hwe->prio_name) { - pp->prio = prio_lookup(pp->hwe->prio_name); -+ pp->prio_args = pp->hwe->prio_args; - condlog(3, "%s: prio = %s (controller setting)", - pp->dev, pp->hwe->prio_name); - return 0; - } - if (conf->prio_name) { - pp->prio = prio_lookup(conf->prio_name); -+ pp->prio_args = conf->prio_args; - condlog(3, "%s: prio = %s (config file default)", - pp->dev, conf->prio_name); - return 0; -Index: multipath-tools/libmultipath/structs.h -=================================================================== ---- multipath-tools.orig/libmultipath/structs.h -+++ multipath-tools/libmultipath/structs.h -@@ -142,6 +142,7 @@ struct path { - int priority; - int pgindex; - char * getuid; -+ char * prio_args; - struct prio * prio; - struct checker checker; - struct multipath * mpp; -Index: multipath-tools/libmultipath/prioritizers/weighted.h -=================================================================== ---- /dev/null -+++ multipath-tools/libmultipath/prioritizers/weighted.h -@@ -0,0 +1,8 @@ -+#ifndef _WEIGHTED_H -+#define _WEIGHTED_H -+ -+#define PRIO_WEIGHTED "weighted" -+ -+int prio_weighted(struct path *pp); -+ -+#endif diff --git a/multipath-tools/patches/0013-RH-dont-remove-map-on-enomem.patch b/multipath-tools/patches/0013-RH-dont-remove-map-on-enomem.patch new file mode 100644 index 0000000..b7ee42c --- /dev/null +++ b/multipath-tools/patches/0013-RH-dont-remove-map-on-enomem.patch @@ -0,0 +1,18 @@ +--- + multipathd/main.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: multipath-tools-120518/multipathd/main.c +=================================================================== +--- multipath-tools-120518.orig/multipathd/main.c ++++ multipath-tools-120518/multipathd/main.c +@@ -993,7 +993,8 @@ mpvec_garbage_collector (struct vectors + return; + + vector_foreach_slot (vecs->mpvec, mpp, i) { +- if (mpp && mpp->alias && !dm_map_present(mpp->alias)) { ++ if (mpp && mpp->alias && !dm_map_present(mpp->alias) && ++ errno != ENOMEM) { + condlog(2, "%s: remove dead map", mpp->alias); + remove_map_and_stop_waiter(mpp, vecs, 1); + i--; diff --git a/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch b/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch deleted file mode 100644 index 33dd43a..0000000 --- a/multipath-tools/patches/0014-RH-add-hp_tur-checker.patch +++ /dev/null @@ -1,231 +0,0 @@ ---- - libmultipath/checkers.h | 3 + - libmultipath/checkers/Makefile | 4 + - libmultipath/checkers/tur.c | 111 +++++++++++++++++++++++++++++++++++++++++ - multipath.conf.annotated | 5 + - 4 files changed, 121 insertions(+), 2 deletions(-) - -Index: multipath-tools/libmultipath/checkers.h -=================================================================== ---- multipath-tools.orig/libmultipath/checkers.h -+++ multipath-tools/libmultipath/checkers.h -@@ -60,6 +60,7 @@ enum path_check_state { - - #define DIRECTIO "directio" - #define TUR "tur" -+#define HP_TUR "hp_tur" - #define HP_SW "hp_sw" - #define RDAC "rdac" - #define EMC_CLARIION "emc_clariion" -@@ -91,6 +92,7 @@ enum path_check_state { - #define CHECKER_MSG_LEN 256 - #define CHECKER_DEV_LEN 256 - #define LIB_CHECKER_NAMELEN 256 -+#define WWID_SIZE 128 - - struct checker { - struct list_head node; -@@ -99,6 +101,7 @@ struct checker { - int disable; - char name[CHECKER_NAME_LEN]; - char message[CHECKER_MSG_LEN]; /* comm with callers */ -+ char wwid[WWID_SIZE]; /* LUN wwid */ - void * context; /* store for persistent data */ - void ** mpcontext; /* store for persistent data shared - multipath-wide. Use MALLOC if -Index: multipath-tools/libmultipath/checkers/Makefile -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/Makefile -+++ multipath-tools/libmultipath/checkers/Makefile -@@ -8,6 +8,7 @@ LIBS= \ - libcheckcciss_tur.so \ - libcheckreadsector0.so \ - libchecktur.so \ -+ libcheckhp_tur.so \ - libcheckdirectio.so \ - libcheckemc_clariion.so \ - libcheckhp_sw.so \ -@@ -23,6 +24,9 @@ libcheckdirectio.so: libsg.o directio.o - libcheck%.so: libsg.o %.o - $(CC) $(SHARED_FLAGS) -o $@ $^ - -+hp_tur.o: tur.c -+ $(CC) $(CFLAGS) -DCHECK_WWID -c -o $@ $< -+ - install: - $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir) - -Index: multipath-tools/libmultipath/checkers/tur.c -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/tur.c -+++ multipath-tools/libmultipath/checkers/tur.c -@@ -15,14 +15,101 @@ - - #include "checkers.h" - -+#include "../libmultipath/debug.h" - #include "../libmultipath/sg_include.h" - - #define TUR_CMD_LEN 6 - #define HEAVY_CHECK_COUNT 10 - -+#ifdef CHECK_WWID -+#define MSG_TUR_UP "HP tur checker reports path is up" -+#define MSG_TUR_DOWN "HP tur checker reports path is down" -+#define MSG_TUR_GHOST "HP tur checker reports path is in standby state" -+#define EVPD 0x01 -+#define PAGE_83 0x83 -+#define INQUIRY_CMD 0x12 -+#define INQUIRY_CMDLEN 6 -+#define SCSI_INQ_BUFF_LEN 96 -+#else - #define MSG_TUR_UP "tur checker reports path is up" - #define MSG_TUR_DOWN "tur checker reports path is down" - #define MSG_TUR_GHOST "tur checker reports path is in standby state" -+#endif -+ -+#ifdef CHECK_WWID -+static int -+do_inq(struct checker * c, char * wwid) -+{ -+ int ret = -1; -+ unsigned char inq_cmd[INQUIRY_CMDLEN] = -+ {INQUIRY_CMD, EVPD, PAGE_83, 0, SCSI_INQ_BUFF_LEN, 0 }; -+ unsigned char sense_buffer[32]; -+ unsigned char resp_buffer[SCSI_INQ_BUFF_LEN]; -+ char *pbuff; -+ -+ int m,k; -+ int retry_tur = 5; -+ struct sg_io_hdr io_hdr; -+ -+retry: -+ memset(resp_buffer, 0, sizeof(resp_buffer)); -+ memset(&io_hdr, 0, sizeof(struct sg_io_hdr)); -+ -+ io_hdr.interface_id = 'S'; -+ io_hdr.cmd_len = sizeof(inq_cmd); -+ io_hdr.mx_sb_len = sizeof(sense_buffer); -+ io_hdr.dxfer_direction = -3; // Data transfer from the device. -+ io_hdr.dxfer_len = sizeof(resp_buffer); -+ io_hdr.dxferp = (unsigned char *)resp_buffer; -+ io_hdr.cmdp = inq_cmd; -+ io_hdr.sbp = sense_buffer; -+ io_hdr.timeout = 60; // IOCTL timeout value. -+ -+ if (ioctl(c->fd, SG_IO, &io_hdr) < 0) { -+ condlog(0, "SG_IO ioctl failed: %s", strerror(errno)); -+ return ret; -+ } -+ if (io_hdr.info & SG_INFO_OK_MASK){ -+ int key = 0, asc, ascq; -+ -+ if (io_hdr.host_status == DID_BUS_BUSY || -+ io_hdr.host_status == DID_ERROR || -+ io_hdr.host_status == DID_TRANSPORT_DISRUPTED) { -+ if (--retry_tur) -+ goto retry; -+ } -+ if (io_hdr.sb_len_wr > 3) { -+ if (io_hdr.sbp[0] == 0x72 || io_hdr.sbp[0] == 0x73) { -+ key = io_hdr.sbp[1] & 0x0f; -+ asc = io_hdr.sbp[2]; -+ ascq = io_hdr.sbp[3]; -+ } else if (io_hdr.sb_len_wr > 13 && -+ ((io_hdr.sbp[0] & 0x7f) == 0x70 || -+ (io_hdr.sbp[0] & 0x7f) == 0x71)) { -+ key = io_hdr.sbp[2] & 0x0f; -+ asc = io_hdr.sbp[12]; -+ ascq = io_hdr.sbp[13]; -+ } -+ } -+ if (key == 0x6) { -+ /* Unit Attention, retry */ -+ if (--retry_tur) -+ goto retry; -+ } -+ return ret; -+ } -+ -+ pbuff = (char *) resp_buffer; -+ -+ wwid[0] = '3'; -+ for (m = 8, k = 1; m < 11; ++m, k+=2) -+ sprintf(&wwid[k], "%02x", (unsigned int)pbuff[m] & 0xff); -+ for (m = 11; m < 24; ++m, k+=2) -+ sprintf(&wwid[k], "%02x", (unsigned int)pbuff[m] & 0xff); -+ -+ return (ret = 0); -+} -+#endif - - struct tur_checker_context { - void * dummy; -@@ -30,6 +117,9 @@ struct tur_checker_context { - - int libcheck_init (struct checker * c) - { -+#ifdef CHECK_WWID -+ memset(c->wwid, 0, WWID_SIZE); -+#endif - return 0; - } - -@@ -45,6 +135,9 @@ libcheck_check (struct checker * c) - unsigned char turCmdBlk[TUR_CMD_LEN] = { 0x00, 0, 0, 0, 0, 0 }; - unsigned char sense_buffer[32]; - int retry_tur = 5; -+#ifdef CHECK_WWID -+ char wwid[WWID_SIZE]; -+#endif - - retry: - memset(&io_hdr, 0, sizeof (struct sg_io_hdr)); -@@ -110,6 +203,24 @@ libcheck_check (struct checker * c) - MSG(c, MSG_TUR_DOWN); - return PATH_DOWN; - } -+#ifdef CHECK_WWID -+ if (!do_inq(c, wwid)) { -+ -+ if(!strcmp(c->wwid, "\0")) { -+ strcpy(c->wwid, wwid); -+ goto up; -+ } -+ -+ if (strcmp(c->wwid , wwid)) { -+ condlog(0, -+ "hp_tur: Lun collided. new_wwid %s old_wwid %s", -+ wwid, c->wwid); -+ MSG(c, MSG_TUR_DOWN); -+ return PATH_DOWN; -+ } -+ } -+up: -+#endif - MSG(c, MSG_TUR_UP); - return PATH_UP; - } -Index: multipath-tools/multipath.conf.annotated -=================================================================== ---- multipath-tools.orig/multipath.conf.annotated -+++ multipath-tools/multipath.conf.annotated -@@ -86,7 +86,8 @@ - # # name : path_checker, checker - # # scope : multipath & multipathd - # # desc : the default method used to determine the paths' state --# # values : readsector0|tur|emc_clariion|hp_sw|directio|rdac|cciss_tur -+# # values : readsector0|tur|emc_clariion|hp_sw|directio|rdac| -+# cciss_tur|hp_tur - # # default : directio - # # - # path_checker directio -@@ -456,7 +457,7 @@ - # # scope : multipathd - # # desc : path checking alorithm to use to check path state - # # values : readsector0|tur|emc_clariion|hp_sw|directio|rdac| --# # cciss_tur -+# # cciss_tur|hp_tur - # # - # path_checker directio - # diff --git a/multipath-tools/patches/0014-RH-deprecate-uid-gid-mode.patch b/multipath-tools/patches/0014-RH-deprecate-uid-gid-mode.patch new file mode 100644 index 0000000..9270d9d --- /dev/null +++ b/multipath-tools/patches/0014-RH-deprecate-uid-gid-mode.patch @@ -0,0 +1,90 @@ +--- + multipath.conf.annotated | 53 ----------------------------------------------- + multipath.conf.synthetic | 3 -- + 2 files changed, 56 deletions(-) + +Index: multipath-tools-120123/multipath.conf.annotated +=================================================================== +--- multipath-tools-120123.orig/multipath.conf.annotated ++++ multipath-tools-120123/multipath.conf.annotated +@@ -186,32 +186,6 @@ + # user_friendly_names no + # + # # +-# # name : mode +-# # scope : multipath & multipathd +-# # desc : The mode to use for the multipath device nodes, in octal. +-# # values : 0000 - 0777 +-# # default : determined by the process +-# mode 0644 +-# +-# # +-# # name : uid +-# # scope : multipath & multipathd +-# # desc : The user id to use for the multipath device nodes. You +-# # may use either the numeric or symbolic uid +-# # values : <user_id> +-# # default : determined by the process +-# uid 0 +-# +-# # +-# # name : gid +-# # scope : multipath & multipathd +-# # desc : The group id to user for the multipath device nodes. You +-# # may use either the numeric or symbolic gid +-# # values : <group_id> +-# # default : determined by the process +-# gid disk +-# +-# # + # # name : checker_timeout + # # scope : multipath & multipathd + # # desc : The timeout to use for path checkers that issue scsi +@@ -388,33 +362,6 @@ + # # + # flush_on_last_del yes + # +-# # +-# # name : mode +-# # scope : multipath & multipathd +-# # desc : The mode to use for the multipath device nodes, in +-# # octal. +-# # values : 0000 - 0777 +-# # default : determined by the process +-# mode 0644 +-# +-# # +-# # name : uid +-# # scope : multipath & multipathd +-# # desc : The user id to use for the multipath device nodes. +-# # You may use either the numeric or symbolic uid +-# # values : <user_id> +-# # default : determined by the process +-# uid 0 +-# +-# # +-# # name : gid +-# # scope : multipath & multipathd +-# # desc : The group id to user for the multipath device nodes. +-# # You may use either the numeric or symbolic gid +-# # values : <group_id> +-# # default : determined by the process +-# gid 0 +-# + # } + # multipath { + # wwid 1DEC_____321816758474 +Index: multipath-tools-120123/multipath.conf.synthetic +=================================================================== +--- multipath-tools-120123.orig/multipath.conf.synthetic ++++ multipath-tools-120123/multipath.conf.synthetic +@@ -18,9 +18,6 @@ + # no_path_retry fail + # queue_without_daemon no + # user_friendly_names no +-# mode 644 +-# uid 0 +-# gid disk + #} + #blacklist { + # wwid 26353900f02796769 diff --git a/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch b/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch deleted file mode 100644 index 87826ef..0000000 --- a/multipath-tools/patches/0015-RH-add-multipathd-count-paths-cmd.patch +++ /dev/null @@ -1,150 +0,0 @@ -Index: multipath-tools/libmultipath/uevent.c -=================================================================== ---- multipath-tools.orig/libmultipath/uevent.c -+++ multipath-tools/libmultipath/uevent.c -@@ -52,6 +52,12 @@ pthread_mutex_t uevc_lock, *uevc_lockp = - pthread_cond_t uev_cond, *uev_condp = &uev_cond; - uev_trigger *my_uev_trigger; - void * my_trigger_data; -+int servicing_uev; -+ -+int is_uevent_busy(void) -+{ -+ return (uevqhp != NULL || servicing_uev); -+} - - static struct uevent * alloc_uevent (void) - { -@@ -96,7 +102,9 @@ uevq_thread(void * et) - - while (1) { - pthread_mutex_lock(uevc_lockp); -+ servicing_uev = 0; - pthread_cond_wait(uev_condp, uevc_lockp); -+ servicing_uev = 1; - pthread_mutex_unlock(uevc_lockp); - - service_uevq(); -Index: multipath-tools/libmultipath/uevent.h -=================================================================== ---- multipath-tools.orig/libmultipath/uevent.h -+++ multipath-tools/libmultipath/uevent.h -@@ -17,3 +17,4 @@ struct uevent { - - int uevent_listen(int (*store_uev)(struct uevent *, void * trigger_data), - void * trigger_data); -+int is_uevent_busy(void); -Index: multipath-tools/multipathd/cli.c -=================================================================== ---- multipath-tools.orig/multipathd/cli.c -+++ multipath-tools/multipathd/cli.c -@@ -174,6 +174,7 @@ load_keys (void) - r += add_key(keys, "devices", DEVICES, 0); - r += add_key(keys, "format", FMT, 1); - r += add_key(keys, "wildcards", WILDCARDS, 0); -+ r += add_key(keys, "count", COUNT, 0); - r += add_key(keys, "quit", QUIT, 0); - r += add_key(keys, "exit", QUIT, 0); - -@@ -443,6 +444,7 @@ cli_init (void) { - add_handler(RESTOREQ+MAPS, NULL); - add_handler(REINSTATE+PATH, NULL); - add_handler(FAIL+PATH, NULL); -+ add_handler(COUNT+PATHS, NULL); - add_handler(QUIT, NULL); - - return 0; -Index: multipath-tools/multipathd/cli_handlers.h -=================================================================== ---- multipath-tools.orig/multipathd/cli_handlers.h -+++ multipath-tools/multipathd/cli_handlers.h -@@ -25,5 +25,6 @@ int cli_restore_all_queueing(void * v, c - int cli_suspend(void * v, char ** reply, int * len, void * data); - int cli_resume(void * v, char ** reply, int * len, void * data); - int cli_reinstate(void * v, char ** reply, int * len, void * data); -+int cli_count_paths(void * v, char ** reply, int * len, void * data); - int cli_fail(void * v, char ** reply, int * len, void * data); - int cli_quit(void * v, char ** reply, int * len, void * data); -Index: multipath-tools/multipathd/main.c -=================================================================== ---- multipath-tools.orig/multipathd/main.c -+++ multipath-tools/multipathd/main.c -@@ -768,6 +768,7 @@ uxlsnrloop (void * ap) - set_handler_callback(RESTOREQ+MAP, cli_restore_queueing); - set_handler_callback(DISABLEQ+MAPS, cli_disable_all_queueing); - set_handler_callback(RESTOREQ+MAPS, cli_restore_all_queueing); -+ set_handler_callback(COUNT+PATHS, cli_count_paths); - set_handler_callback(QUIT, cli_quit); - - umask(077); -Index: multipath-tools/multipathd/cli.h -=================================================================== ---- multipath-tools.orig/multipathd/cli.h -+++ multipath-tools/multipathd/cli.h -@@ -23,6 +23,7 @@ enum { - __BLACKLIST, - __DEVICES, - __FMT, -+ __COUNT, - __WILDCARDS, - __QUIT, - }; -@@ -51,6 +52,7 @@ enum { - #define BLACKLIST (1 << __BLACKLIST) - #define DEVICES (1 << __DEVICES) - #define FMT (1 << __FMT) -+#define COUNT (1 << __COUNT) - #define WILDCARDS (1 << __WILDCARDS) - #define QUIT (1 << __QUIT) - -Index: multipath-tools/multipathd/cli_handlers.c -=================================================================== ---- multipath-tools.orig/multipathd/cli_handlers.c -+++ multipath-tools/multipathd/cli_handlers.c -@@ -18,6 +18,29 @@ - - #include "main.h" - #include "cli.h" -+#include "uevent.h" -+ -+int -+count_paths(char **r, int *l, struct vectors *vecs) -+{ -+ int i, len; -+ struct path *pp; -+ char * reply; -+ unsigned int maxlen = INITIAL_REPLY_LEN; -+ int monitored_count = 0; -+ -+ reply = MALLOC(maxlen); -+ if (!reply) -+ return 1; -+ vector_foreach_slot(vecs->pathvec, pp, i) -+ if (pp->fd != -1) -+ monitored_count++; -+ len = sprintf(reply, "Paths: %d\nBusy: %s\n", monitored_count, -+ is_uevent_busy()? "True" : "False"); -+ *r = reply; -+ *l = len + 1; -+ return 0; -+} - - int - show_paths (char ** r, int * len, struct vectors * vecs, char * style) -@@ -176,6 +199,16 @@ cli_list_config (void * v, char ** reply - } - - int -+cli_count_paths (void * v, char ** reply, int * len, void * data) -+{ -+ struct vectors * vecs = (struct vectors *)data; -+ -+ condlog(3, "count paths (operator)"); -+ -+ return count_paths(reply, len, vecs); -+} -+ -+int - cli_list_paths (void * v, char ** reply, int * len, void * data) - { - struct vectors * vecs = (struct vectors *)data; diff --git a/multipath-tools/patches/0015-RH-use-sync-support.patch b/multipath-tools/patches/0015-RH-use-sync-support.patch new file mode 100644 index 0000000..c5dee9d --- /dev/null +++ b/multipath-tools/patches/0015-RH-use-sync-support.patch @@ -0,0 +1,17 @@ +--- + libmultipath/devmapper.c | 2 ++ + 1 file changed, 2 insertions(+) + +Index: multipath-tools-120518/libmultipath/devmapper.c +=================================================================== +--- multipath-tools-120518.orig/libmultipath/devmapper.c ++++ multipath-tools-120518/libmultipath/devmapper.c +@@ -1272,6 +1272,8 @@ dm_rename (char * old, char * new) + goto out; + if (!dm_task_run(dmt)) + goto out; ++ if (conf->daemon) ++ dm_task_update_nodes(); + + r = 1; + out: diff --git a/multipath-tools/patches/0016-RH-change-configs.patch b/multipath-tools/patches/0016-RH-change-configs.patch new file mode 100644 index 0000000..7942ea8 --- /dev/null +++ b/multipath-tools/patches/0016-RH-change-configs.patch @@ -0,0 +1,541 @@ +--- + libmultipath/config.c | 1 + libmultipath/hwtable.c | 65 ------------------------------------------------- + 2 files changed, 1 insertion(+), 65 deletions(-) + +Index: multipath-tools-120613/libmultipath/config.c +=================================================================== +--- multipath-tools-120613.orig/libmultipath/config.c ++++ multipath-tools-120613/libmultipath/config.c +@@ -515,6 +515,7 @@ load_config (char * file) + conf->checkint = DEFAULT_CHECKINT; + conf->max_checkint = MAX_CHECKINT(conf->checkint); + conf->find_multipaths = DEFAULT_FIND_MULTIPATHS; ++ conf->fast_io_fail = 5; + + /* + * preload default hwtable +Index: multipath-tools-120613/libmultipath/hwtable.c +=================================================================== +--- multipath-tools-120613.orig/libmultipath/hwtable.c ++++ multipath-tools-120613/libmultipath/hwtable.c +@@ -28,7 +28,6 @@ static struct hwentry default_hw[] = { + .product = "Compellent Vol", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -50,7 +49,6 @@ static struct hwentry default_hw[] = { + .product = "Xserve RAID ", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -72,7 +70,6 @@ static struct hwentry default_hw[] = { + .product = "VV", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -88,7 +85,6 @@ static struct hwentry default_hw[] = { + .product = "HSG80", + .features = "1 queue_if_no_path", + .hwhandler = "1 hp_sw", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -104,7 +100,6 @@ static struct hwentry default_hw[] = { + .product = "A6189A", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -121,7 +116,6 @@ static struct hwentry default_hw[] = { + .product = "(MSA|HSV)1.0.*", + .features = "1 queue_if_no_path", + .hwhandler = "1 hp_sw", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -137,7 +131,6 @@ static struct hwentry default_hw[] = { + .product = "MSA VOLUME", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -153,7 +146,6 @@ static struct hwentry default_hw[] = { + .product = "HSV1[01]1|HSV2[01]0|HSV300|HSV4[05]0", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -169,7 +161,6 @@ static struct hwentry default_hw[] = { + .product = "MSA2[02]12fc|MSA2012i", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -185,7 +176,6 @@ static struct hwentry default_hw[] = { + .product = "MSA2012sa|MSA23(12|24)(fc|i|sa)|MSA2000s VOLUME", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -202,7 +192,6 @@ static struct hwentry default_hw[] = { + .product = "HSVX700", + .features = DEFAULT_FEATURES, + .hwhandler = "1 alua", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -219,7 +208,6 @@ static struct hwentry default_hw[] = { + .product = "LOGICAL VOLUME.*", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -236,7 +224,6 @@ static struct hwentry default_hw[] = { + .product = "P2000 G3 FC|P2000G3 FC/iSCSI|P2000 G3 SAS|P2000 G3 iSCSI", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -258,7 +245,6 @@ static struct hwentry default_hw[] = { + .product = "SAN DataDirector", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -280,7 +266,6 @@ static struct hwentry default_hw[] = { + .product = "SYMMETRIX", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -297,7 +282,6 @@ static struct hwentry default_hw[] = { + .bl_product = "LUNZ", + .features = "1 queue_if_no_path", + .hwhandler = "1 emc", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -314,7 +298,6 @@ static struct hwentry default_hw[] = { + .bl_product = "LUNZ", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -336,7 +319,6 @@ static struct hwentry default_hw[] = { + .product = "CentricStor", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_SERIAL, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -352,7 +334,6 @@ static struct hwentry default_hw[] = { + .product = "ETERNUS_DX(L|400|8000)", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -373,7 +354,6 @@ static struct hwentry default_hw[] = { + .product = "OPEN-.*", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -389,7 +369,6 @@ static struct hwentry default_hw[] = { + .product = "DF.*", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -411,7 +390,6 @@ static struct hwentry default_hw[] = { + .product = "ProFibre 4000R", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -429,7 +407,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "1 queue_if_no_path", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -447,7 +424,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "1 queue_if_no_path", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -465,7 +441,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "1 queue_if_no_path", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -483,7 +458,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -500,7 +474,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -518,7 +491,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -536,7 +508,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -554,7 +525,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -572,7 +542,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -589,7 +558,6 @@ static struct hwentry default_hw[] = { + .product = "^3542", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_SERIAL, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -606,7 +574,6 @@ static struct hwentry default_hw[] = { + .product = "^2105800", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_SERIAL, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -623,7 +590,6 @@ static struct hwentry default_hw[] = { + .product = "^2105F20", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_SERIAL, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -640,7 +606,6 @@ static struct hwentry default_hw[] = { + .product = "^1750500", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -657,7 +622,6 @@ static struct hwentry default_hw[] = { + .product = "^2107900", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -674,7 +638,6 @@ static struct hwentry default_hw[] = { + .product = "^2145", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -693,7 +656,6 @@ static struct hwentry default_hw[] = { + .uid_attribute = "ID_UID", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -712,7 +674,6 @@ static struct hwentry default_hw[] = { + .uid_attribute = "ID_UID", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -729,7 +690,6 @@ static struct hwentry default_hw[] = { + .product = "^IPR.*", + .features = "1 queue_if_no_path", + .hwhandler = "1 alua", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -746,7 +706,6 @@ static struct hwentry default_hw[] = { + .product = "1820N00", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -763,7 +722,6 @@ static struct hwentry default_hw[] = { + .product = "2810XIV", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = 15, + .rr_weight = RR_WEIGHT_NONE, +@@ -786,7 +744,6 @@ static struct hwentry default_hw[] = { + .product = "VDASD", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -803,7 +760,6 @@ static struct hwentry default_hw[] = { + .product = "3303 NVDISK", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = FAILOVER, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -820,7 +776,6 @@ static struct hwentry default_hw[] = { + .product = "NVDISK", + .features = DEFAULT_FEATURES, + .hwhandler = "1 alua", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -838,7 +793,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -856,7 +810,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -874,7 +827,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -892,7 +844,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -914,7 +865,6 @@ static struct hwentry default_hw[] = { + .product = "LUN.*", + .features = "3 queue_if_no_path pg_init_retries 50", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .flush_on_last_del = FLUSH_ENABLED, +@@ -936,7 +886,6 @@ static struct hwentry default_hw[] = { + .product = "COMSTAR", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_SERIAL, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -957,7 +906,6 @@ static struct hwentry default_hw[] = { + .product = "Nseries.*", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -978,7 +926,6 @@ static struct hwentry default_hw[] = { + .product = "Axiom.*", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -1001,7 +948,6 @@ static struct hwentry default_hw[] = { + .product = "TP9[13]00", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -1018,7 +964,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -1035,7 +980,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -1052,7 +996,6 @@ static struct hwentry default_hw[] = { + .product = "DISK ARRAY", + .features = DEFAULT_FEATURES, + .hwhandler = "1 alua", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -1075,7 +1018,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -1097,7 +1039,6 @@ static struct hwentry default_hw[] = { + .product = "(StorEdge 3510|T4)", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -1113,7 +1054,6 @@ static struct hwentry default_hw[] = { + .product = "FC2502", + .features = DEFAULT_FEATURES, + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -1135,7 +1075,6 @@ static struct hwentry default_hw[] = { + .product = "RAIGE VOLUME", + .features = "1 queue_if_no_path", + .hwhandler = DEFAULT_HWHANDLER, +- .selector = DEFAULT_SELECTOR, + .pgpolicy = MULTIBUS, + .pgfailback = FAILBACK_UNDEF, + .rr_weight = RR_WEIGHT_NONE, +@@ -1151,7 +1090,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -1169,7 +1107,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -1187,7 +1124,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = "2 pg_init_retries 50", + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, +@@ -1204,7 +1140,6 @@ static struct hwentry default_hw[] = { + .bl_product = "Universal Xport", + .features = DEFAULT_FEATURES, + .hwhandler = "1 rdac", +- .selector = DEFAULT_SELECTOR, + .pgpolicy = GROUP_BY_PRIO, + .pgfailback = -FAILBACK_IMMEDIATE, + .rr_weight = RR_WEIGHT_NONE, diff --git a/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch b/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch deleted file mode 100644 index ae0ae70..0000000 --- a/multipath-tools/patches/0016-RHBZ-554561-fix-init-error-msg.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- - multipathd/multipathd.init.redhat | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -Index: multipath-tools/multipathd/multipathd.init.redhat -=================================================================== ---- multipath-tools.orig/multipathd/multipathd.init.redhat -+++ multipath-tools/multipathd/multipathd.init.redhat -@@ -75,9 +75,11 @@ start() { - - stop() { - root_dev=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $1; }}' /etc/mtab) -- dm_num=`dmsetup info -c --noheadings -o minor $root_dev` -- root_dm_device="dm-$dm_num" -- [ -d $syspath/$root_dm_device ] && teardown_slaves $syspath/$root_dm_device -+ dm_num=`dmsetup info -c --noheadings -o minor $root_dev 2> /dev/null` -+ if [ $? -eq 0 ]; then -+ root_dm_device="dm-$dm_num" -+ [ -d $syspath/$root_dm_device ] && teardown_slaves $syspath/$root_dm_device -+ fi - - echo -n $"Stopping $prog daemon: " - killproc $DAEMON diff --git a/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch b/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch deleted file mode 100644 index 9ebaf92..0000000 --- a/multipath-tools/patches/0017-RHBZ-554592-man-page-note.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - multipath/multipath.8 | 2 ++ - 1 file changed, 2 insertions(+) - -Index: multipath-tools/multipath/multipath.8 -=================================================================== ---- multipath-tools.orig/multipath/multipath.8 -+++ multipath-tools/multipath/multipath.8 -@@ -75,6 +75,8 @@ is in. - is in the /dev/sdb (as shown by udev in the $DEVNAME variable) or major:minor format. - .I device - may alternatively be a multipath mapname -+.SH NOTES -+a map may be unused if, eg, the file system on it is not mounted or there are no open file descriptors against the device file, as in a raw device. - .SH "SEE ALSO" - .BR udev (8), - .BR dmsetup (8) diff --git a/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch b/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch deleted file mode 100644 index e3296d3..0000000 --- a/multipath-tools/patches/0018-RHBZ-554596-SUN-6540-config.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- - libmultipath/hwtable.c | 16 ++++++++++++++++ - multipath.conf.defaults | 16 ++++++++++++++++ - 2 files changed, 32 insertions(+) - -Index: multipath-tools/libmultipath/hwtable.c -=================================================================== ---- multipath-tools.orig/libmultipath/hwtable.c -+++ multipath-tools/libmultipath/hwtable.c -@@ -959,6 +959,22 @@ static struct hwentry default_hw[] = { - .checker_name = RDAC, - .prio_name = PRIO_RDAC, - }, -+ { -+ .vendor = "STK", -+ .product = "FLEXLINE 380", -+ .bl_product = "Universal Xport", -+ .getuid = DEFAULT_GETUID, -+ .features = DEFAULT_FEATURES, -+ .hwhandler = "1 rdac", -+ .selector = DEFAULT_SELECTOR, -+ .pgpolicy = GROUP_BY_PRIO, -+ .pgfailback = -FAILBACK_IMMEDIATE, -+ .rr_weight = RR_WEIGHT_NONE, -+ .no_path_retry = NO_PATH_RETRY_QUEUE, -+ .minio = DEFAULT_MINIO, -+ .checker_name = RDAC, -+ .prio_name = PRIO_RDAC, -+ }, - /* - * EOL - */ -Index: multipath-tools/multipath.conf.defaults -=================================================================== ---- multipath-tools.orig/multipath.conf.defaults -+++ multipath-tools/multipath.conf.defaults -@@ -571,4 +571,20 @@ - # path_checker rdac - # prio rdac - # } -+# device { -+# vendor "STK" -+# product "FLEXLINE 380" -+# product_blacklist "Universal Xport" -+# getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" -+# features "0" -+# hardware_handler "1 rdac" -+# path_selector "round-robin 0" -+# path_grouping_policy group_by_prio -+# failback immediate -+# rr_weight uniform -+# no_path_retry queue -+# rr_min_io 1000 -+# path_checker rdac -+# prio rdac -+# } - #} diff --git a/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch b/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch deleted file mode 100644 index cf101e2..0000000 --- a/multipath-tools/patches/0019-RHBZ-554598-fix-multipath-locking.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- - libmultipath/configure.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -Index: multipath-tools/libmultipath/configure.c -=================================================================== ---- multipath-tools.orig/libmultipath/configure.c -+++ multipath-tools/libmultipath/configure.c -@@ -284,6 +284,7 @@ lock_multipath (struct multipath * mpp, - struct pathgroup * pgp; - struct path * pp; - int i, j; -+ int x, y; - - if (!mpp || !mpp->pg) - return 0; -@@ -294,12 +295,25 @@ lock_multipath (struct multipath * mpp, - vector_foreach_slot(pgp->paths, pp, j) { - if (lock && flock(pp->fd, LOCK_EX | LOCK_NB) && - errno == EWOULDBLOCK) -- return 1; -+ goto fail; - else if (!lock) - flock(pp->fd, LOCK_UN); - } - } - return 0; -+fail: -+ vector_foreach_slot (mpp->pg, pgp, x) { -+ if (x > i) -+ return 1; -+ if (!pgp->paths) -+ continue; -+ vector_foreach_slot(pgp->paths, pp, y) { -+ if (x == i && y > j) -+ return 1; -+ flock(pp->fd, LOCK_UN); -+ } -+ } -+ return 1; - } - - /* diff --git a/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch b/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch deleted file mode 100644 index 51b66bd..0000000 --- a/multipath-tools/patches/0020-RHBZ-554605-fix-manual-failover.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- - libmultipath/pgpolicies.c | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -Index: multipath-tools/libmultipath/pgpolicies.c -=================================================================== ---- multipath-tools.orig/libmultipath/pgpolicies.c -+++ multipath-tools/libmultipath/pgpolicies.c -@@ -205,7 +205,8 @@ out: - extern int - one_path_per_group (struct multipath * mp) - { -- int i; -+ int i, j; -+ unsigned int prio; - struct path * pp; - struct pathgroup * pgp; - -@@ -217,16 +218,30 @@ one_path_per_group (struct multipath * m - - for (i = 0; i < VECTOR_SIZE(mp->paths); i++) { - pp = VECTOR_SLOT(mp->paths, i); -+ prio = pp->priority; -+ -+ vector_foreach_slot(mp->pg, pgp, j) { -+ pp = VECTOR_SLOT(pgp->paths, 0); -+ -+ if (prio > pp->priority) -+ break; -+ } -+ - pgp = alloc_pathgroup(); - - if (!pgp) - goto out; - -- if (store_pathgroup(mp->pg, pgp)) -+ if (store_path(pgp->paths, VECTOR_SLOT(mp->paths, i))) - goto out; - -- if (store_path(pgp->paths, pp)) -- goto out; -+ if (j < VECTOR_SIZE(mp->pg)) { -+ if (!vector_insert_slot(mp->pg, j, pgp)) -+ goto out; -+ } else { -+ if (store_pathgroup(mp->pg, pgp)) -+ goto out; -+ } - } - free_pathvec(mp->paths, KEEP_PATHS); - mp->paths = NULL; diff --git a/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch b/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch deleted file mode 100644 index 12ec02c..0000000 --- a/multipath-tools/patches/0021-RHBZ-548874-add-find-multipaths.patch +++ /dev/null @@ -1,1153 +0,0 @@ ---- - libmultipath/Makefile | 2 - libmultipath/alias.c | 152 ------------------------------ - libmultipath/alias.h | 1 - libmultipath/config.c | 5 - - libmultipath/config.h | 1 - libmultipath/configure.c | 23 ++++ - libmultipath/defaults.h | 2 - libmultipath/dict.c | 34 ++++++ - libmultipath/file.c | 178 +++++++++++++++++++++++++++++++++++ - libmultipath/file.h | 11 ++ - libmultipath/finder.c | 150 ++++++++++++++++++++++++++++++ - libmultipath/finder.h | 18 +++ - multipath/Makefile | 2 - multipath/main.c | 2 - multipath/mpathconf | 234 +++++++++++++++++++++++++++++++++++++++++++++++ - multipathd/main.c | 27 +++-- - 16 files changed, 679 insertions(+), 163 deletions(-) - -Index: multipath-tools/libmultipath/alias.c -=================================================================== ---- multipath-tools.orig/libmultipath/alias.c -+++ multipath-tools/libmultipath/alias.c -@@ -3,19 +3,16 @@ - * Copyright (c) 2005 Benjamin Marzinski, Redhat - */ - #include <stdlib.h> --#include <sys/types.h> --#include <sys/stat.h> --#include <fcntl.h> - #include <errno.h> - #include <unistd.h> - #include <string.h> - #include <limits.h> - #include <stdio.h> --#include <signal.h> - - #include "debug.h" - #include "uxsock.h" - #include "alias.h" -+#include "file.h" - - - /* -@@ -37,149 +34,6 @@ - */ - - static int --ensure_directories_exist(char *str, mode_t dir_mode) --{ -- char *pathname; -- char *end; -- int err; -- -- pathname = strdup(str); -- if (!pathname){ -- condlog(0, "Cannot copy bindings file pathname : %s", -- strerror(errno)); -- return -1; -- } -- end = pathname; -- /* skip leading slashes */ -- while (end && *end && (*end == '/')) -- end++; -- -- while ((end = strchr(end, '/'))) { -- /* if there is another slash, make the dir. */ -- *end = '\0'; -- err = mkdir(pathname, dir_mode); -- if (err && errno != EEXIST) { -- condlog(0, "Cannot make directory [%s] : %s", -- pathname, strerror(errno)); -- free(pathname); -- return -1; -- } -- if (!err) -- condlog(3, "Created dir [%s]", pathname); -- *end = '/'; -- end++; -- } -- free(pathname); -- return 0; --} -- --static void --sigalrm(int sig) --{ -- /* do nothing */ --} -- --static int --lock_bindings_file(int fd) --{ -- struct sigaction act, oldact; -- sigset_t set, oldset; -- struct flock lock; -- int err; -- -- memset(&lock, 0, sizeof(lock)); -- lock.l_type = F_WRLCK; -- lock.l_whence = SEEK_SET; -- -- act.sa_handler = sigalrm; -- sigemptyset(&act.sa_mask); -- act.sa_flags = 0; -- sigemptyset(&set); -- sigaddset(&set, SIGALRM); -- -- sigaction(SIGALRM, &act, &oldact); -- sigprocmask(SIG_UNBLOCK, &set, &oldset); -- -- alarm(BINDINGS_FILE_TIMEOUT); -- err = fcntl(fd, F_SETLKW, &lock); -- alarm(0); -- -- if (err) { -- if (errno != EINTR) -- condlog(0, "Cannot lock bindings file : %s", -- strerror(errno)); -- else -- condlog(0, "Bindings file is locked. Giving up."); -- } -- -- sigprocmask(SIG_SETMASK, &oldset, NULL); -- sigaction(SIGALRM, &oldact, NULL); -- return err; -- --} -- -- --static int --open_bindings_file(char *file, int *can_write) --{ -- int fd; -- struct stat s; -- -- if (ensure_directories_exist(file, 0700)) -- return -1; -- *can_write = 1; -- fd = open(file, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); -- if (fd < 0) { -- if (errno == EROFS) { -- *can_write = 0; -- condlog(3, "Cannot open bindings file [%s] read/write. " -- " trying readonly", file); -- fd = open(file, O_RDONLY); -- if (fd < 0) { -- condlog(0, "Cannot open bindings file [%s] " -- "readonly : %s", file, strerror(errno)); -- return -1; -- } -- } -- else { -- condlog(0, "Cannot open bindings file [%s] : %s", file, -- strerror(errno)); -- return -1; -- } -- } -- if (*can_write && lock_bindings_file(fd) < 0) -- goto fail; -- -- memset(&s, 0, sizeof(s)); -- if (fstat(fd, &s) < 0){ -- condlog(0, "Cannot stat bindings file : %s", strerror(errno)); -- goto fail; -- } -- if (s.st_size == 0) { -- if (*can_write == 0) -- goto fail; -- /* If bindings file is empty, write the header */ -- size_t len = strlen(BINDINGS_FILE_HEADER); -- if (write_all(fd, BINDINGS_FILE_HEADER, len) != len) { -- condlog(0, -- "Cannot write header to bindings file : %s", -- strerror(errno)); -- /* cleanup partially written header */ -- ftruncate(fd, 0); -- goto fail; -- } -- fsync(fd); -- condlog(3, "Initialized new bindings file [%s]", file); -- } -- -- return fd; -- --fail: -- close(fd); -- return -1; --} -- --static int - format_devname(char *name, int id, int len) - { - int pos; -@@ -364,7 +218,7 @@ get_user_friendly_alias(char *wwid, char - return NULL; - } - -- fd = open_bindings_file(file, &can_write); -+ fd = open_file(file, &can_write, BINDINGS_FILE_HEADER); - if (fd < 0) - return NULL; - -@@ -414,7 +268,7 @@ get_user_friendly_wwid(char *alias, char - return NULL; - } - -- fd = open_bindings_file(file, &unused); -+ fd = open_file(file, &unused, BINDINGS_FILE_HEADER); - if (fd < 0) - return NULL; - -Index: multipath-tools/libmultipath/alias.h -=================================================================== ---- multipath-tools.orig/libmultipath/alias.h -+++ multipath-tools/libmultipath/alias.h -@@ -1,4 +1,3 @@ --#define BINDINGS_FILE_TIMEOUT 30 - #define BINDINGS_FILE_HEADER \ - "# Multipath bindings, Version : 1.0\n" \ - "# NOTE: this file is automatically maintained by the multipath program.\n" \ -Index: multipath-tools/libmultipath/config.c -=================================================================== ---- multipath-tools.orig/libmultipath/config.c -+++ multipath-tools/libmultipath/config.c -@@ -452,6 +452,7 @@ load_config (char * file) - conf->multipath_dir = set_default(DEFAULT_MULTIPATHDIR); - conf->flush_on_last_del = 0; - conf->attribute_flags = 0; -+ conf->find_multipaths = DEFAULT_FIND_MULTIPATHS; - - /* - * preload default hwtable -@@ -476,10 +477,12 @@ load_config (char * file) - } - } else { - condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); -- condlog(0, "A default multipath.conf file is located at"); -+ condlog(0, "A sample multipath.conf file is located at"); - condlog(0, - "/usr/share/doc/device-mapper-multipath-%d.%d.%d/multipath.conf", - MULTIPATH_VERSION(VERSION_CODE)); -+ condlog(0, -+"You can run /sbin/mpathconf to create or modify /etc/multipath.conf"); - conf->blist_devnode = vector_alloc(); - if (!conf->blist_devnode) { - condlog(0, "cannot allocate blacklist\n"); -Index: multipath-tools/libmultipath/config.h -=================================================================== ---- multipath-tools.orig/libmultipath/config.h -+++ multipath-tools/libmultipath/config.h -@@ -85,6 +85,7 @@ struct config { - int attribute_flags; - int fast_io_fail; - unsigned int dev_loss; -+ int find_multipaths; - uid_t uid; - gid_t gid; - mode_t mode; -Index: multipath-tools/libmultipath/configure.c -=================================================================== ---- multipath-tools.orig/libmultipath/configure.c -+++ multipath-tools/libmultipath/configure.c -@@ -35,6 +35,7 @@ - #include "alias.h" - #include "prio.h" - #include "util.h" -+#include "finder.h" - - extern int - setup_map (struct multipath * mpp) -@@ -462,6 +463,10 @@ coalesce_paths (struct vectors * vecs, v - - memset(empty_buff, 0, WWID_SIZE); - -+ /* ignore refwwid if it's empty */ -+ if (refwwid && !strlen(refwwid)) -+ refwwid = NULL; -+ - if (force_reload) { - vector_foreach_slot (pathvec, pp1, k) { - pp1->mpp = NULL; -@@ -472,21 +477,35 @@ coalesce_paths (struct vectors * vecs, v - - /* 1. if path has no unique id or wwid blacklisted */ - if (memcmp(empty_buff, pp1->wwid, WWID_SIZE) == 0 || -- filter_path(conf, pp1) > 0) -+ filter_path(conf, pp1) > 0) { -+ orphan_path(pp1); - continue; -+ } - - /* 2. if path already coalesced */ - if (pp1->mpp) - continue; - - /* 3. if path has disappeared */ -- if (!pp1->size) -+ if (!pp1->size) { -+ orphan_path(pp1); - continue; -+ } - - /* 4. path is out of scope */ - if (refwwid && strncmp(pp1->wwid, refwwid, WWID_SIZE)) - continue; - -+ /* If find_multipaths was selected check if the path is valid */ -+ if (conf->find_multipaths){ -+ if (refwwid || should_multipath(pp1, pathvec)) -+ remember_wwid(pp1->wwid); -+ else { -+ orphan_path(pp1); -+ continue; -+ } -+ } -+ - /* - * at this point, we know we really got a new mp - */ -Index: multipath-tools/libmultipath/defaults.h -=================================================================== ---- multipath-tools.orig/libmultipath/defaults.h -+++ multipath-tools/libmultipath/defaults.h -@@ -12,6 +12,7 @@ - #define DEFAULT_PGTIMEOUT -PGTIMEOUT_NONE - #define DEFAULT_USER_FRIENDLY_NAMES 0 - #define DEFAULT_VERBOSITY 2 -+#define DEFAULT_FIND_MULTIPATHS 0 - - #define DEFAULT_CHECKINT 5 - #define MAX_CHECKINT(a) (a << 2) -@@ -20,5 +21,6 @@ - #define DEFAULT_SOCKET "/var/run/multipathd.sock" - #define DEFAULT_CONFIGFILE "/etc/multipath.conf" - #define DEFAULT_BINDINGS_FILE "/etc/multipath/bindings" -+#define DEFAULT_WWIDS_FILE "/etc/multipath/wwids" - - char * set_default (char * str); -Index: multipath-tools/libmultipath/dict.c -=================================================================== ---- multipath-tools.orig/libmultipath/dict.c -+++ multipath-tools/libmultipath/dict.c -@@ -444,6 +444,27 @@ def_flush_on_last_del_handler(vector str - } - - static int -+def_find_multipaths_handler(vector strvec) -+{ -+ char * buff; -+ -+ buff = set_value(strvec); -+ -+ if (!buff) -+ return 1; -+ -+ if ((strlen(buff) == 2 && !strcmp(buff, "no")) || -+ (strlen(buff) == 1 && !strcmp(buff, "0"))) -+ conf->find_multipaths = 0; -+ else if ((strlen(buff) == 3 && !strcmp(buff, "yes")) || -+ (strlen(buff) == 1 && !strcmp(buff, "1"))) -+ conf->find_multipaths = 1; -+ -+ FREE(buff); -+ return 0; -+} -+ -+static int - names_handler(vector strvec) - { - char * buff; -@@ -2076,6 +2097,18 @@ snprint_def_flush_on_last_del (char * bu - } - - static int -+snprint_def_find_multipaths (char * buff, int len, void * data) -+{ -+ if (conf->find_multipaths == DEFAULT_FIND_MULTIPATHS) -+ return 0; -+ if (!conf->find_multipaths) -+ return snprintf(buff, len, "no"); -+ -+ return snprintf(buff, len, "yes"); -+} -+ -+ -+static int - snprint_def_user_friendly_names (char * buff, int len, void * data) - { - if (conf->user_friendly_names == DEFAULT_USER_FRIENDLY_NAMES) -@@ -2141,6 +2174,7 @@ init_keywords(void) - install_keyword("gid", &def_gid_handler, &snprint_def_gid); - install_keyword("fast_io_fail_tmo", &def_fast_io_fail_handler, &snprint_def_fast_io_fail); - install_keyword("dev_loss_tmo", &def_dev_loss_handler, &snprint_def_dev_loss); -+ install_keyword("find_multipaths", &def_find_multipaths_handler, &snprint_def_find_multipaths); - __deprecated install_keyword("default_selector", &def_selector_handler, NULL); - __deprecated install_keyword("default_path_grouping_policy", &def_pgpolicy_handler, NULL); - __deprecated install_keyword("default_getuid_callout", &def_getuid_callout_handler, NULL); -Index: multipath-tools/libmultipath/file.c -=================================================================== ---- /dev/null -+++ multipath-tools/libmultipath/file.c -@@ -0,0 +1,178 @@ -+/* -+ * Copyright (c) 2005 Christophe Varoqui -+ * Copyright (c) 2005 Benjamin Marzinski, Redhat -+ */ -+#include <stdlib.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+#include <fcntl.h> -+#include <errno.h> -+#include <unistd.h> -+#include <string.h> -+#include <limits.h> -+#include <stdio.h> -+#include <signal.h> -+ -+#include "file.h" -+#include "debug.h" -+#include "uxsock.h" -+ -+ -+/* -+ * significant parts of this file were taken from iscsi-bindings.c of the -+ * linux-iscsi project. -+ * Copyright (C) 2002 Cisco Systems, Inc. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published -+ * by the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * See the file COPYING included with this distribution for more details. -+ */ -+ -+static int -+ensure_directories_exist(char *str, mode_t dir_mode) -+{ -+ char *pathname; -+ char *end; -+ int err; -+ -+ pathname = strdup(str); -+ if (!pathname){ -+ condlog(0, "Cannot copy file pathname %s : %s", -+ str, strerror(errno)); -+ return -1; -+ } -+ end = pathname; -+ /* skip leading slashes */ -+ while (end && *end && (*end == '/')) -+ end++; -+ -+ while ((end = strchr(end, '/'))) { -+ /* if there is another slash, make the dir. */ -+ *end = '\0'; -+ err = mkdir(pathname, dir_mode); -+ if (err && errno != EEXIST) { -+ condlog(0, "Cannot make directory [%s] : %s", -+ pathname, strerror(errno)); -+ free(pathname); -+ return -1; -+ } -+ if (!err) -+ condlog(3, "Created dir [%s]", pathname); -+ *end = '/'; -+ end++; -+ } -+ free(pathname); -+ return 0; -+} -+ -+static void -+sigalrm(int sig) -+{ -+ /* do nothing */ -+} -+ -+static int -+lock_file(int fd, char *file_name) -+{ -+ struct sigaction act, oldact; -+ sigset_t set, oldset; -+ struct flock lock; -+ int err; -+ -+ memset(&lock, 0, sizeof(lock)); -+ lock.l_type = F_WRLCK; -+ lock.l_whence = SEEK_SET; -+ -+ act.sa_handler = sigalrm; -+ sigemptyset(&act.sa_mask); -+ act.sa_flags = 0; -+ sigemptyset(&set); -+ sigaddset(&set, SIGALRM); -+ -+ sigaction(SIGALRM, &act, &oldact); -+ sigprocmask(SIG_UNBLOCK, &set, &oldset); -+ -+ alarm(FILE_TIMEOUT); -+ err = fcntl(fd, F_SETLKW, &lock); -+ alarm(0); -+ -+ if (err) { -+ if (errno != EINTR) -+ condlog(0, "Cannot lock %s : %s", file_name, -+ strerror(errno)); -+ else -+ condlog(0, "%s is locked. Giving up.", file_name); -+ } -+ -+ sigprocmask(SIG_SETMASK, &oldset, NULL); -+ sigaction(SIGALRM, &oldact, NULL); -+ return err; -+} -+ -+int -+open_file(char *file, int *can_write, char *header) -+{ -+ int fd; -+ struct stat s; -+ -+ if (ensure_directories_exist(file, 0700)) -+ return -1; -+ *can_write = 1; -+ fd = open(file, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); -+ if (fd < 0) { -+ if (errno == EROFS) { -+ *can_write = 0; -+ condlog(3, "Cannot open file [%s] read/write. " -+ " trying readonly", file); -+ fd = open(file, O_RDONLY); -+ if (fd < 0) { -+ condlog(0, "Cannot open file [%s] " -+ "readonly : %s", file, strerror(errno)); -+ return -1; -+ } -+ } -+ else { -+ condlog(0, "Cannot open file [%s] : %s", file, -+ strerror(errno)); -+ return -1; -+ } -+ } -+ if (*can_write && lock_file(fd, file) < 0) -+ goto fail; -+ -+ memset(&s, 0, sizeof(s)); -+ if (fstat(fd, &s) < 0){ -+ condlog(0, "Cannot stat file %s : %s", file, strerror(errno)); -+ goto fail; -+ } -+ if (s.st_size == 0) { -+ if (*can_write == 0) -+ goto fail; -+ /* If file is empty, write the header */ -+ size_t len = strlen(header); -+ if (write_all(fd, header, len) != len) { -+ condlog(0, -+ "Cannot write header to file %s : %s", file, -+ strerror(errno)); -+ /* cleanup partially written header */ -+ ftruncate(fd, 0); -+ goto fail; -+ } -+ fsync(fd); -+ condlog(3, "Initialized new file [%s]", file); -+ } -+ -+ return fd; -+ -+fail: -+ close(fd); -+ return -1; -+} -Index: multipath-tools/libmultipath/file.h -=================================================================== ---- /dev/null -+++ multipath-tools/libmultipath/file.h -@@ -0,0 +1,11 @@ -+/* -+ * Copyright (c) 2010 Benjamin Marzinski, Redhat -+ */ -+ -+#ifndef _FILE_H -+#define _FILE_H -+ -+#define FILE_TIMEOUT 30 -+int open_file(char *file, int *can_write, char *header); -+ -+#endif /* _FILE_H */ -Index: multipath-tools/libmultipath/finder.c -=================================================================== ---- /dev/null -+++ multipath-tools/libmultipath/finder.c -@@ -0,0 +1,150 @@ -+#include <stdlib.h> -+#include <errno.h> -+#include <unistd.h> -+#include <string.h> -+#include <limits.h> -+#include <stdio.h> -+ -+#include "checkers.h" -+#include "vector.h" -+#include "structs.h" -+#include "debug.h" -+#include "uxsock.h" -+#include "file.h" -+#include "finder.h" -+#include "defaults.h" -+ -+/* -+ * Copyright (c) 2010 Benjamin Marzinski, Redhat -+ */ -+ -+static int -+lookup_wwid(FILE *f, char *wwid) { -+ char buf[LINE_MAX]; -+ -+ while (fgets(buf, LINE_MAX, f)) { -+ char *c; -+ -+ c = strpbrk(buf, "#\n\r"); -+ if (c) -+ *c = '\0'; -+ if (*buf == '\0') -+ continue; -+ if (strncmp(wwid, buf, WWID_SIZE) == 0) -+ return 1; -+ } -+ return 0; -+} -+ -+static int -+write_out_wwid(int fd, char *wwid) { -+ int ret; -+ off_t offset; -+ char buf[WWID_SIZE + 1]; -+ -+ ret = snprintf(buf, WWID_SIZE + 1, "%s\n", wwid); -+ if (ret > WWID_SIZE || ret < 0){ -+ condlog(0, "can't format wwid for writing (%d) : %s", -+ ret, strerror(errno)); -+ return -1; -+ } -+ offset = lseek(fd, 0, SEEK_END); -+ if (offset < 0) { -+ condlog(0, "can't seek to the end of wwids file : %s", -+ strerror(errno)); -+ return -1; -+ } -+ if (write_all(fd, buf, strlen(buf)) != strlen(buf)) { -+ condlog(0, "cannot write wwid to wwids file : %s", -+ strerror(errno)); -+ ftruncate(fd, offset); -+ return -1; -+ } -+ return 1; -+} -+ -+static int -+check_wwids_file(char *wwid, int write_wwid) -+{ -+ int scan_fd, fd, can_write, found, ret; -+ FILE *f; -+ fd = open_file(DEFAULT_WWIDS_FILE, &can_write, WWIDS_FILE_HEADER); -+ if (fd < 0) -+ return -1; -+ -+ scan_fd = dup(fd); -+ if (scan_fd < 0) { -+ condlog(0, "can't dup wwids file descriptor : %s", -+ strerror(errno)); -+ close(fd); -+ return -1; -+ } -+ f = fdopen(scan_fd, "r"); -+ if (!f) { -+ condlog(0,"can't fdopen wwids file : %s", strerror(errno)); -+ close(fd); -+ close(scan_fd); -+ return -1; -+ } -+ found = lookup_wwid(f, wwid); -+ if (found) { -+ ret = 0; -+ goto out; -+ } -+ if (!write_wwid) { -+ ret = -1; -+ goto out; -+ } -+ if (!can_write) { -+ condlog(0, "wwids file is read-only. Can't write wwid"); -+ ret = -1; -+ goto out; -+ } -+ ret = write_out_wwid(fd, wwid); -+out: -+ fclose(f); -+ close(scan_fd); -+ close(fd); -+ return ret; -+} -+ -+int -+should_multipath(struct path *pp1, vector pathvec) -+{ -+ int i; -+ struct path *pp2; -+ -+ condlog(4, "checking if %s should be multipathed", pp1->dev); -+ vector_foreach_slot(pathvec, pp2, i) { -+ if (pp1->dev == pp2->dev) -+ continue; -+ if (strncmp(pp1->wwid, pp2->wwid, WWID_SIZE) == 0) { -+ condlog(3, "found multiple paths with wwid %s, " -+ "multipathing %s", pp1->wwid, pp1->dev); -+ return 1; -+ } -+ } -+ if (check_wwids_file(pp1->wwid, 0) < 0) { -+ condlog(3, "wwid %s not in wwids file, skipping %s", -+ pp1->wwid, pp1->dev); -+ return 0; -+ } -+ condlog(3, "found wwid %s in wwids file, multipathing %s", pp1->wwid, -+ pp1->dev); -+ return 1; -+} -+ -+int -+remember_wwid(char *wwid) -+{ -+ int ret = check_wwids_file(wwid, 1); -+ if (ret < 0){ -+ condlog(3, "failed writing wwid %s to wwids file", wwid); -+ return -1; -+ } -+ if (ret == 1) -+ condlog(3, "wrote wwid %s to wwids file", wwid); -+ else -+ condlog(4, "wwid %s already in wwids file", wwid); -+ return 0; -+} -Index: multipath-tools/libmultipath/finder.h -=================================================================== ---- /dev/null -+++ multipath-tools/libmultipath/finder.h -@@ -0,0 +1,18 @@ -+/* -+ * Copyright (c) 2010 Benjamin Marzinski, Redhat -+ */ -+ -+#ifndef _FINDER_H -+#define _FINDER_H -+ -+#define WWIDS_FILE_HEADER \ -+"# Multipath wwids, Version : 1.0\n" \ -+"# NOTE: This file is automatically maintained by multipath and multipathd.\n" \ -+"# You should not need to edit this file in normal circumstances.\n" \ -+"#\n" \ -+"# Valid WWIDs:\n" -+ -+int should_multipath(struct path *pp, vector pathvec); -+int remember_wwid(char *wwid); -+ -+#endif /* _FINDER_H */ -Index: multipath-tools/multipath/main.c -=================================================================== ---- multipath-tools.orig/multipath/main.c -+++ multipath-tools/multipath/main.c -@@ -307,7 +307,7 @@ configure (void) - /* - * core logic entry point - */ -- r = coalesce_paths(&vecs, NULL, NULL, conf->force_reload); -+ r = coalesce_paths(&vecs, NULL, refwwid, conf->force_reload); - - out: - if (refwwid) -Index: multipath-tools/multipathd/main.c -=================================================================== ---- multipath-tools.orig/multipathd/main.c -+++ multipath-tools/multipathd/main.c -@@ -47,6 +47,7 @@ - #include <print.h> - #include <configure.h> - #include <prio.h> -+#include <finder.h> - - #include "main.h" - #include "pidfile.h" -@@ -397,7 +398,7 @@ ev_add_path (char * devname, struct vect - */ - if (memcmp(empty_buff, pp->wwid, WWID_SIZE) == 0) { - condlog(0, "%s: failed to get path uid", devname); -- return 1; /* leave path added to pathvec */ -+ goto fail; /* leave path added to pathvec */ - } - if (filter_path(conf, pp) > 0){ - int i = find_slot(vecs->pathvec, (void *)pp); -@@ -412,18 +413,26 @@ rescan: - condlog(4,"%s: adopting all paths for path %s", - mpp->alias, pp->dev); - if (adopt_paths(vecs->pathvec, mpp)) -- return 1; /* leave path added to pathvec */ -+ goto fail; /* leave path added to pathvec */ - - verify_paths(mpp, vecs, NULL); - mpp->flush_on_last_del = FLUSH_UNDEF; - mpp->action = ACT_RELOAD; - } - else { -+ if (conf->find_multipaths) { -+ if (should_multipath(pp, vecs->pathvec)) -+ remember_wwid(pp->wwid); -+ else { -+ orphan_path(pp); -+ return 0; -+ } -+ } - condlog(4,"%s: creating new map", pp->dev); - if ((mpp = add_map_with_path(vecs, pp, 1))) - mpp->action = ACT_CREATE; - else -- return 1; /* leave path added to pathvec */ -+ goto fail; /* leave path added to pathvec */ - } - - /* -@@ -432,7 +441,7 @@ rescan: - if (setup_map(mpp)) { - condlog(0, "%s: failed to setup map for addition of new " - "path %s", mpp->alias, devname); -- goto out; -+ goto fail_map; - } - /* - * reload the map for the multipath mapped device -@@ -450,7 +459,7 @@ rescan: - goto rescan; - } - else -- goto out; -+ goto fail_map; - } - dm_lib_release(); - -@@ -458,19 +467,21 @@ rescan: - * update our state from kernel regardless of create or reload - */ - if (setup_multipath(vecs, mpp)) -- goto out; -+ goto fail_map; - - sync_map_state(mpp); - - if (mpp->action == ACT_CREATE && - start_waiter_thread(mpp, vecs)) -- goto out; -+ goto fail_map; - - condlog(2, "%s path added to devmap %s", devname, mpp->alias); - return 0; - --out: -+fail_map: - remove_map(mpp, vecs, 1); -+fail: -+ orphan_path(pp); - return 1; - } - -Index: multipath-tools/libmultipath/Makefile -=================================================================== ---- multipath-tools.orig/libmultipath/Makefile -+++ multipath-tools/libmultipath/Makefile -@@ -12,7 +12,7 @@ OBJS = memory.o parser.o vector.o devmap - pgpolicies.o debug.o regex.o defaults.o uevent.o \ - switchgroup.o uxsock.o print.o alias.o log_pthread.o \ - log.o configure.o structs_vec.o sysfs.o prio.o checkers.o \ -- lock.o waiter.o -+ lock.o waiter.o file.o finder.o - - LIBDM_API_FLUSH = $(shell if test -d /lib64 ; then objdump -T /lib64/libdevmapper.so* ; else objdump -T /lib/libdevmapper.so.* ; fi | grep -c dm_task_no_flush) - -Index: multipath-tools/multipath/mpathconf -=================================================================== ---- /dev/null -+++ multipath-tools/multipath/mpathconf -@@ -0,0 +1,234 @@ -+#!/bin/sh -+# -+# Copyright (C) 2010 Red Hat, Inc. All rights reserved. -+# -+# This file is part of the device-mapper-multipath package. -+# -+# This copyrighted material is made available to anyone wishing to use, -+# modify, copy, or redistribute it subject to the terms and conditions -+# of the GNU General Public License v.2. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software Foundation, -+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ -+# -+# Simple editting of /etc/multipath.conf -+# This program was largely ripped off from lvmconf -+# -+ -+DEFAULT_CONFIGFILE="/usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf" -+CONFIGFILE="/etc/multipath.conf" -+MULTIPATHDIR="/etc/multipath" -+TMPFILE=/etc/multipath/.multipath.conf.tmp -+ -+function usage -+{ -+ echo "usage: $0 <command>" -+ echo "" -+ echo "Commands:" -+ echo "Enable: --enable [--user_friendly_names <y|n>] [--find_multipaths <y|n>" -+ echo "Disable: --disable" -+ echo "Set user_friendly_names: --user_friendly_names <y|n>" -+ echo "Set find_multipaths: --find_multipaths <y|n>" -+ echo "" -+} -+ -+function parse_args -+{ -+ while [ -n "$1" ]; do -+ case $1 in -+ --enable) -+ ENABLE=1 -+ shift -+ ;; -+ --disable) -+ ENABLE=0 -+ shift -+ ;; -+ --user_friendly_names) -+ if [ -n "$2" ]; then -+ FRIENDLY=$2 -+ shift 2 -+ else -+ usage -+ exit 1 -+ fi -+ ;; -+ --find_multipaths) -+ if [ -n "$2" ]; then -+ FIND=$2 -+ shift 2 -+ else -+ usage -+ exit 1 -+ fi -+ ;; -+ *) -+ usage -+ exit -+ esac -+ done -+} -+ -+function validate_args -+{ -+ if [ "$ENABLE" = "0" ] && [ -n "$FRIENDLY" -o -n "$FIND" ]; then -+ echo "ignoring extra parameters on disable" -+ FRIENDLY="" -+ FIND="" -+ fi -+ if [ -n "$FRIENDLY" ] && [ "$FRIENDLY" != "y" -a "$FRIENDLY" != "n" ]; then -+ echo "--user_friendly_names must be either 'y' or 'n'" -+ exit 1 -+ fi -+ if [ -n "$FIND" ] && [ "$FIND" != "y" -a "$FIND" != "n" ]; then -+ echo "--find_multipaths must be either 'y' or 'n'" -+ exit 1 -+ fi -+ if [ -z "$ENABLE" -a -z "$FIND" -a -z "$FRIENDLY" ]; then -+ DISPLAY=1 -+ fi -+} -+ -+umask 0077 -+ -+parse_args "$@" -+ -+validate_args -+ -+if [ ! -d "$MULTIPATHDIR" ]; then -+ echo "/etc/multipath/ does not exist. failing" -+ exit 1 -+fi -+ -+rm $TMPFILE 2> /dev/null -+if [ -f "$CONFIGFILE" ]; then -+ cp $CONFIGFILE $TMPFILE -+elif [ -f "$DEFAULT_CONFIGFILE" ]; then -+ cp $DEFAULT_CONFIGFILE $TMPFILE -+else -+ touch $TMPFILE -+fi -+ -+if grep -q "^blacklist[[:space:]]*{" $TMPFILE ; then -+ HAVE_BLACKLIST=1 -+fi -+ -+if grep -q "^defaults[[:space:]]*{" $TMPFILE ; then -+ HAVE_DEFAULTS=1 -+fi -+ -+if [ "$HAVE_BLACKLIST" = "1" ]; then -+ if sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*devnode \"\.\?\*\"" ; then -+ HAVE_DISABLE=1 -+ elif sed -n '/^blacklist[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*#[#[:space:]]*devnode \"\.\?\*\"" ; then -+ HAVE_DISABLE=0 -+ fi -+fi -+ -+if [ "$HAVE_DEFAULTS" = "1" ]; then -+ if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*find_multipaths[[:space:]]*$yes\|1$" ; then -+ HAVE_FIND=1 -+ elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*find_multipaths[[:space:]]*$no\|0$" ; then -+ HAVE_FIND=0 -+ fi -+ if sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]]*$yes\|1$" ; then -+ HAVE_FRIENDLY=1 -+ elif sed -n '/^defaults[[:space:]]*{/,/^}/ p' $TMPFILE | grep -q "^[[:space:]]*user_friendly_names[[:space:]]*$no\|0$" ; then -+ HAVE_FRIENDLY=0 -+ fi -+fi -+ -+if [ -n "$DISPLAY" ]; then -+ if [ -z "$HAVE_DISABLE" -o "$HAVE_DISABLE" = 0 ]; then -+ echo "multipath is enabled" -+ else -+ echo "multipath is disabled" -+ fi -+ if [ -z "$HAVE_FIND" -o "$HAVE_FIND" = 0 ]; then -+ echo "find_multipaths is disabled" -+ else -+ echo "find_multipaths is enabled" -+ fi -+ if [ -z "$HAVE_FRIENDLY" -o "$HAVE_FRIENDLY" = 0 ]; then -+ echo "user_friendly_names is disabled" -+ else -+ echo "user_friendly_names is enabled" -+ fi -+ exit 0 -+fi -+ -+if [ -z "$HAVE_BLACKLIST" ]; then -+ cat >> $TMPFILE <<- _EOF_ -+ -+blacklist { -+} -+_EOF_ -+fi -+ -+if [ -z "$HAVE_DEFAULTS" ]; then -+ cat >> $TMPFILE <<- _EOF_ -+ -+defaults { -+} -+_EOF_ -+fi -+ -+if [ "$ENABLE" = 1 ]; then -+ if [ "$HAVE_DISABLE" = 1 ]; then -+ sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*devnode \"\.\?\*\"/# devnode ".*"/' $TMPFILE -+ fi -+elif [ "$ENABLE" = 0 ]; then -+ if [ -z "$HAVE_DISABLE" ]; then -+ sed -i '/^blacklist[[:space:]]*{/ a\ -+ devnode "*" -+' $TMPFILE -+ elif [ "$HAVE_DISABLE" = 0 ]; then -+ sed -i '/^blacklist[[:space:]]*{/,/^}/ s/^[[:space:]]*#[#[:space:]]*devnode \"\.\?\*\"/ devnode ".*"/' $TMPFILE -+ fi -+fi -+ -+if [ "$FIND" = "n" ]; then -+ if [ "$HAVE_FIND" = 1 ]; then -+ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*find_multipaths[[:space:]]*$yes\|1$/ find_multipaths no/' $TMPFILE -+ fi -+elif [ "$FIND" = "y" ]; then -+ if [ -z "$HAVE_FIND" ]; then -+ sed -i '/^defaults[[:space:]]*{/ a\ -+ find_multipaths yes -+' $TMPFILE -+ elif [ "$HAVE_FIND" = 0 ]; then -+ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*find_multipaths[[:space:]]*$no\|0$/ find_multipaths yes/' $TMPFILE -+ fi -+fi -+ -+if [ "$FRIENDLY" = "n" ]; then -+ if [ "$HAVE_FRIENDLY" = 1 ]; then -+ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]]*$yes\|1$/ user_friendly_names no/' $TMPFILE -+ fi -+elif [ "$FRIENDLY" = "y" ]; then -+ if [ -z "$HAVE_FRIENDLY" ]; then -+ sed -i '/^defaults[[:space:]]*{/ a\ -+ user_friendly_names yes -+' $TMPFILE -+ elif [ "$HAVE_FRIENDLY" = 0 ]; then -+ sed -i '/^defaults[[:space:]]*{/,/^}/ s/^[[:space:]]*user_friendly_names[[:space:]]*$no\|0$/ user_friendly_names yes/' $TMPFILE -+ fi -+fi -+ -+if [ -f "$CONFIGFILE" ]; then -+ cp $CONFIGFILE $CONFIGFILE.old -+ if [ $? != 0 ]; then -+ echo "failed to backup old config file, $CONFIGFILE not updated" -+ exit 1 -+ fi -+fi -+ -+cp $TMPFILE $CONFIGFILE -+if [ $? != 0 ]; then -+ echo "failed to copy new config file into place, check $CONFIGFILE is still OK" -+ exit 1 -+fi -+ -+rm -f $TMPFILE -Index: multipath-tools/multipath/Makefile -=================================================================== ---- multipath-tools.orig/multipath/Makefile -+++ multipath-tools/multipath/Makefile -@@ -21,6 +21,7 @@ $(EXEC): $(OBJS) - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -+ $(INSTALL_PROGRAM) -m 755 mpathconf $(DESTDIR)$(bindir)/ - $(INSTALL_PROGRAM) -d $(DESTDIR)/lib/udev/rules.d - $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/lib/udev/rules.d/40-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -@@ -31,6 +32,7 @@ install: - uninstall: - rm $(DESTDIR)/lib/udev/rules.d/multipath.rules - rm $(DESTDIR)$(bindir)/$(EXEC) -+ rm $(DESTDIR)$(bindir)/mpathconf - rm $(DESTDIR)$(mandir)/$(EXEC).8.gz - rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz - diff --git a/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch b/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch deleted file mode 100644 index 95488b8..0000000 --- a/multipath-tools/patches/0022-RHBZ-557845-RHEL5-style-partitions.patch +++ /dev/null @@ -1,325 +0,0 @@ ---- - kpartx/bsd.c | 35 ---------------- - kpartx/dos.c | 7 +-- - kpartx/kpartx.c | 121 +++++++------------------------------------------------- - kpartx/kpartx.h | 1 - kpartx/sun.c | 35 ---------------- - 5 files changed, 24 insertions(+), 175 deletions(-) - -Index: multipath-tools/kpartx/bsd.c -=================================================================== ---- multipath-tools.orig/kpartx/bsd.c -+++ multipath-tools/kpartx/bsd.c -@@ -50,10 +50,10 @@ int - read_bsd_pt(int fd, struct slice all, struct slice *sp, int ns) { - struct bsd_disklabel *l; - struct bsd_partition *p; -- unsigned int offset = all.start, end; -+ unsigned int offset = all.start; - int max_partitions; - char *bp; -- int n = 0, i, j; -+ int n = 0; - - bp = getblock(fd, offset+1); /* 1 sector suffices */ - if (bp == NULL) -@@ -79,36 +79,5 @@ read_bsd_pt(int fd, struct slice all, st - break; - } - } -- /* -- * Convention has it that the bsd disklabel will always have -- * the 'c' partition spanning the entire disk. -- * So we have to check for contained slices. -- */ -- for(i = 0; i < n; i++) { -- if (sp[i].size == 0) -- continue; -- -- end = sp[i].start + sp[i].size; -- for(j = 0; j < n; j ++) { -- if ( i == j ) -- continue; -- if (sp[j].size == 0) -- continue; -- -- if (sp[i].start < sp[j].start) { -- if (end > sp[j].start && -- end < sp[j].start + sp[j].size) { -- /* Invalid slice */ -- fprintf(stderr, -- "bsd_disklabel: slice %d overlaps with %d\n", i , j); -- sp[i].size = 0; -- } -- } else { -- if (end <= sp[j].start + sp[j].size) { -- sp[i].container = j + 1; -- } -- } -- } -- } - return n; - } -Index: multipath-tools/kpartx/dos.c -=================================================================== ---- multipath-tools.orig/kpartx/dos.c -+++ multipath-tools/kpartx/dos.c -@@ -16,7 +16,7 @@ is_extended(int type) { - } - - static int --read_extended_partition(int fd, struct partition *ep, int en, -+read_extended_partition(int fd, struct partition *ep, - struct slice *sp, int ns) - { - struct partition p; -@@ -53,7 +53,6 @@ read_extended_partition(int fd, struct p - if (n < ns) { - sp[n].start = here + le32_to_cpu(p.start_sect); - sp[n].size = le32_to_cpu(p.nr_sects); -- sp[n].container = en + 1; - n++; - } else { - fprintf(stderr, -@@ -98,7 +97,9 @@ read_dos_pt(int fd, struct slice all, st - break; - } - if (is_extended(p.sys_type)) { -- n += read_extended_partition(fd, &p, i, sp+n, ns-n); -+ n += read_extended_partition(fd, &p, sp+n, ns-n); -+ /* hide the extended partition itself */ -+ sp[i].size = 2; - } - } - return n; -Index: multipath-tools/kpartx/kpartx.c -=================================================================== ---- multipath-tools.orig/kpartx/kpartx.c -+++ multipath-tools/kpartx/kpartx.c -@@ -185,7 +185,7 @@ get_hotplug_device(void) - - int - main(int argc, char **argv){ -- int fd, i, j, m, n, op, off, arg, c, d; -+ int fd, i, j, k, n, op, off, arg; - struct slice all; - struct pt *ptp; - enum action what = LIST; -@@ -355,49 +355,30 @@ main(int argc, char **argv){ - else - continue; - -+ /* -+ * test for overlap, as in the case of an extended partition -+ * zero their size to avoid mapping -+ */ -+ for (j = 0; j < n; j++) { -+ for (k = j + 1; k < n; k++) { -+ if (slices[k].start > slices[j].start && -+ slices[k].start < slices[j].start + -+ slices[j].size) -+ slices[j].size = 0; -+ } -+ } -+ - switch(what) { - case LIST: -- for (j = 0, c = 0, m = 0; j < n; j++) { -+ for (j = 0; j < n; j++) { - if (slices[j].size == 0) - continue; -- if (slices[j].container > 0) { -- c++; -- continue; -- } -- -- slices[j].minor = m++; - - printf("%s%s%d : 0 %" PRIu64 " %s %" PRIu64"\n", - mapname, delim, j+1, - slices[j].size, device, - slices[j].start); - } -- /* Loop to resolve contained slices */ -- d = c; -- while (c) { -- for (j = 0; j < n; j++) { -- uint64_t start; -- int k = slices[j].container - 1; -- -- if (slices[j].size == 0) -- continue; -- if (slices[j].minor > 0) -- continue; -- if (slices[j].container == 0) -- continue; -- slices[j].minor = m++; -- -- start = slices[j].start - slices[k].start; -- printf("%s%s%d : 0 %" PRIu64 " /dev/dm-%d %" PRIu64 "\n", -- mapname, delim, j+1, -- slices[j].size, -- slices[k].minor, start); -- c--; -- } -- /* Terminate loop if nothing more to resolve */ -- if (d == c) -- break; -- } - - if (loopcreated && S_ISREG (buf.st_mode)) { - if (del_loop(device)) { -@@ -443,16 +424,10 @@ main(int argc, char **argv){ - break; - - case ADD: -- for (j = 0, c = 0; j < n; j++) { -+ for (j = 0; j < n; j++) { - if (slices[j].size == 0) - continue; - -- /* Skip all contained slices */ -- if (slices[j].container > 0) { -- c++; -- continue; -- } -- - if (safe_sprintf(partname, "%s%s%d", - mapname, delim, j+1)) { - fprintf(stderr, "partname too small\n"); -@@ -493,70 +468,6 @@ main(int argc, char **argv){ - slices[j].minor, slices[j].size, - DM_TARGET, params); - } -- /* Loop to resolve contained slices */ -- d = c; -- while (c) { -- for (j = 0; j < n; j++) { -- uint64_t start; -- int k = slices[j].container - 1; -- -- if (slices[j].size == 0) -- continue; -- -- /* Skip all existing slices */ -- if (slices[j].minor > 0) -- continue; -- -- /* Skip all simple slices */ -- if (slices[j].container == 0) -- continue; -- -- /* Check container slice */ -- if (slices[k].size == 0) -- fprintf(stderr, "Invalid slice %d\n", -- k); -- -- if (safe_sprintf(partname, "%s%s%d", -- mapname, delim, j+1)) { -- fprintf(stderr, "partname too small\n"); -- exit(1); -- } -- strip_slash(partname); -- -- start = slices[j].start - slices[k].start; -- if (safe_sprintf(params, "%d:%d %" PRIu64, -- slices[k].major, -- slices[k].minor, -- start)) { -- fprintf(stderr, "params too small\n"); -- exit(1); -- } -- -- op = (dm_map_present(partname) ? -- DM_DEVICE_RELOAD : DM_DEVICE_CREATE); -- -- dm_addmap(op, partname, DM_TARGET, params, -- slices[j].size, uuid, j+1, -- buf.st_mode & 0777, -- buf.st_uid, buf.st_gid); -- -- if (op == DM_DEVICE_RELOAD) -- dm_simplecmd(DM_DEVICE_RESUME, -- partname, 1); -- -- dm_devn(partname, &slices[j].major, -- &slices[j].minor); -- -- if (verbose) -- printf("add map %s : 0 %" PRIu64 " %s %s\n", -- partname, slices[j].size, -- DM_TARGET, params); -- c--; -- } -- /* Terminate loop */ -- if (d == c) -- break; -- } - break; - - default: -Index: multipath-tools/kpartx/kpartx.h -=================================================================== ---- multipath-tools.orig/kpartx/kpartx.h -+++ multipath-tools/kpartx/kpartx.h -@@ -24,7 +24,6 @@ - struct slice { - uint64_t start; - uint64_t size; -- int container; - int major; - int minor; - }; -Index: multipath-tools/kpartx/sun.c -=================================================================== ---- multipath-tools.orig/kpartx/sun.c -+++ multipath-tools/kpartx/sun.c -@@ -62,8 +62,8 @@ int - read_sun_pt(int fd, struct slice all, struct slice *sp, int ns) { - struct sun_disk_label *l; - struct sun_raw_part *s; -- unsigned int offset = all.start, end; -- int i, j, n; -+ unsigned int offset = all.start; -+ int i, n; - char *bp; - - bp = getblock(fd, offset); -@@ -95,37 +95,6 @@ read_sun_pt(int fd, struct slice all, st - break; - } - } -- /* -- * Convention has it that the SUN disklabel will always have -- * the 'c' partition spanning the entire disk. -- * So we have to check for contained slices. -- */ -- for(i = 0; i < SUN_DISK_MAXPARTITIONS; i++) { -- if (sp[i].size == 0) -- continue; -- -- end = sp[i].start + sp[i].size; -- for(j = 0; j < SUN_DISK_MAXPARTITIONS; j ++) { -- if ( i == j ) -- continue; -- if (sp[j].size == 0) -- continue; -- -- if (sp[i].start < sp[j].start) { -- if (end > sp[j].start && -- end < sp[j].start + sp[j].size) { -- /* Invalid slice */ -- fprintf(stderr, -- "sun_disklabel: slice %d overlaps with %d\n", i , j); -- sp[i].size = 0; -- } -- } else { -- if (end <= sp[j].start + sp[j].size) { -- sp[i].container = j + 1; -- } -- } -- } -- } - return n; - } - diff --git a/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch b/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch deleted file mode 100644 index 0db517f..0000000 --- a/multipath-tools/patches/0023-RHBZ-557810-emc-invista-config.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: multipath-tools/libmultipath/hwtable.c -=================================================================== ---- multipath-tools.orig/libmultipath/hwtable.c -+++ multipath-tools/libmultipath/hwtable.c -@@ -282,6 +282,21 @@ static struct hwentry default_hw[] = { - .checker_name = EMC_CLARIION, - .prio_name = PRIO_EMC, - }, -+ { -+ .vendor = "EMC", -+ .product = "Invista", -+ .bl_product = "LUNZ", -+ .getuid = DEFAULT_GETUID, -+ .features = DEFAULT_FEATURES, -+ .hwhandler = DEFAULT_HWHANDLER, -+ .selector = DEFAULT_SELECTOR, -+ .pgpolicy = MULTIBUS, -+ .pgfailback = FAILBACK_UNDEF, -+ .rr_weight = RR_WEIGHT_NONE, -+ .no_path_retry = 5, -+ .minio = DEFAULT_MINIO, -+ .prio_name = DEFAULT_PRIO, -+ }, - /* - * Fujitsu controller family - * -Index: multipath-tools/multipath.conf.defaults -=================================================================== ---- multipath-tools.orig/multipath.conf.defaults -+++ multipath-tools/multipath.conf.defaults -@@ -209,6 +209,21 @@ - # prio emc - # } - # device { -+# vendor "EMC" -+# product "Invista" -+# product_blacklist "LUNZ" -+# getuid_callout "/lib/udev/scsi_id --whitelisted --page=pre-spc3-83 --device=/dev/%n" -+# features "0" -+# hardware_handler "0" -+# path_selector "round-robin 0" -+# path_grouping_policy multibus -+# rr_weight uniform -+# no_path_retry 5 -+# rr_min_io 1000 -+# path_checker tur -+# prio const -+# } -+# device { - # vendor "FSC" - # product "CentricStor" - # getuid_callout "/lib/udev/scsi_id --whitelisted --device=/dev/%n" diff --git a/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch b/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch deleted file mode 100644 index 44f12f7..0000000 --- a/multipath-tools/patches/0024-RHBZ-565933-checker-timeout.patch +++ /dev/null @@ -1,428 +0,0 @@ ---- - libmultipath/checkers.h | 15 +-------------- - libmultipath/checkers/emc_clariion.c | 4 ++-- - libmultipath/checkers/hp_sw.c | 12 ++++++------ - libmultipath/checkers/libsg.c | 5 +++-- - libmultipath/checkers/libsg.h | 3 ++- - libmultipath/checkers/rdac.c | 9 +++++---- - libmultipath/checkers/readsector0.c | 2 +- - libmultipath/checkers/tur.c | 4 ++-- - libmultipath/config.h | 1 + - libmultipath/dict.c | 29 +++++++++++++++++++++++++++++ - libmultipath/discovery.c | 27 +++++++++++++++++++++++++++ - libmultipath/discovery.h | 1 + - libmultipath/propsel.c | 19 +++++++++++++++++-- - multipath.conf.annotated | 9 +++++++++ - 14 files changed, 106 insertions(+), 34 deletions(-) - -Index: multipath-tools/libmultipath/checkers.h -=================================================================== ---- multipath-tools.orig/libmultipath/checkers.h -+++ multipath-tools/libmultipath/checkers.h -@@ -69,20 +69,6 @@ enum path_check_state { - - #define DEFAULT_CHECKER DIRECTIO - --/* -- * Overloaded storage response time can be very long. -- * SG_IO timouts after DEF_TIMEOUT milliseconds, and checkers interprets this -- * as a path failure. multipathd then proactively evicts the path from the DM -- * multipath table in this case. -- * -- * This generaly snow balls and ends up in full eviction and IO errors for end -- * users. Bad. This may also cause SCSI bus resets, causing disruption for all -- * local and external storage hardware users. -- * -- * Provision a long timeout. Longer than any real-world application would cope -- * with. -- */ --#define DEF_TIMEOUT 300000 - #define ASYNC_TIMEOUT_SEC 30 - - /* -@@ -98,6 +84,7 @@ struct checker { - struct list_head node; - int fd; - int sync; -+ unsigned int timeout; - int disable; - char name[CHECKER_NAME_LEN]; - char message[CHECKER_MSG_LEN]; /* comm with callers */ -Index: multipath-tools/libmultipath/checkers/emc_clariion.c -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/emc_clariion.c -+++ multipath-tools/libmultipath/checkers/emc_clariion.c -@@ -113,7 +113,7 @@ int libcheck_check (struct checker * c) - io_hdr.dxferp = sense_buffer; - io_hdr.cmdp = inqCmdBlk; - io_hdr.sbp = sb; -- io_hdr.timeout = DEF_TIMEOUT; -+ io_hdr.timeout = c->timeout; - io_hdr.pack_id = 0; - if (ioctl(c->fd, SG_IO, &io_hdr) < 0) { - MSG(c, "emc_clariion_checker: sending query command failed"); -@@ -182,7 +182,7 @@ int libcheck_check (struct checker * c) - unsigned char buf[4096]; - - memset(buf, 0, 4096); -- ret = sg_read(c->fd, &buf[0], sbb = &sb[0]); -+ ret = sg_read(c->fd, &buf[0], sbb = &sb[0], c->timeout); - if (ret == PATH_DOWN) { - hexadecimal_to_ascii(ct->wwn, wwnstr); - -Index: multipath-tools/libmultipath/checkers/hp_sw.c -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/hp_sw.c -+++ multipath-tools/libmultipath/checkers/hp_sw.c -@@ -46,7 +46,7 @@ void libcheck_free (struct checker * c) - - static int - do_inq(int sg_fd, int cmddt, int evpd, unsigned int pg_op, -- void *resp, int mx_resp_len, int noisy) -+ void *resp, int mx_resp_len, int noisy, unsigned int timeout) - { - unsigned char inqCmdBlk[INQUIRY_CMDLEN] = - { INQUIRY_CMD, 0, 0, 0, 0, 0 }; -@@ -70,7 +70,7 @@ do_inq(int sg_fd, int cmddt, int evpd, u - io_hdr.dxferp = resp; - io_hdr.cmdp = inqCmdBlk; - io_hdr.sbp = sense_b; -- io_hdr.timeout = DEF_TIMEOUT; -+ io_hdr.timeout = timeout; - - if (ioctl(sg_fd, SG_IO, &io_hdr) < 0) - return 1; -@@ -98,7 +98,7 @@ do_inq(int sg_fd, int cmddt, int evpd, u - } - - static int --do_tur (int fd) -+do_tur (int fd, unsigned int timeout) - { - unsigned char turCmdBlk[TUR_CMD_LEN] = { 0x00, 0, 0, 0, 0, 0 }; - struct sg_io_hdr io_hdr; -@@ -111,7 +111,7 @@ do_tur (int fd) - io_hdr.dxfer_direction = SG_DXFER_NONE; - io_hdr.cmdp = turCmdBlk; - io_hdr.sbp = sense_buffer; -- io_hdr.timeout = DEF_TIMEOUT; -+ io_hdr.timeout = timeout; - io_hdr.pack_id = 0; - - if (ioctl(fd, SG_IO, &io_hdr) < 0) -@@ -128,12 +128,12 @@ libcheck_check (struct checker * c) - { - char buff[MX_ALLOC_LEN]; - -- if (0 != do_inq(c->fd, 0, 1, 0x80, buff, MX_ALLOC_LEN, 0)) { -+ if (0 != do_inq(c->fd, 0, 1, 0x80, buff, MX_ALLOC_LEN, 0, c->timeout)) { - MSG(c, MSG_HP_SW_DOWN); - return PATH_DOWN; - } - -- if (do_tur(c->fd)) { -+ if (do_tur(c->fd, c->timeout)) { - MSG(c, MSG_HP_SW_GHOST); - return PATH_GHOST; - } -Index: multipath-tools/libmultipath/checkers/libsg.c -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/libsg.c -+++ multipath-tools/libmultipath/checkers/libsg.c -@@ -11,7 +11,8 @@ - #include "../libmultipath/sg_include.h" - - int --sg_read (int sg_fd, unsigned char * buff, unsigned char * senseBuff) -+sg_read (int sg_fd, unsigned char * buff, unsigned char * senseBuff, -+ unsigned int timeout) - { - /* defaults */ - int blocks = 1; -@@ -51,7 +52,7 @@ sg_read (int sg_fd, unsigned char * buff - io_hdr.dxferp = buff; - io_hdr.mx_sb_len = SENSE_BUFF_LEN; - io_hdr.sbp = senseBuff; -- io_hdr.timeout = DEF_TIMEOUT; -+ io_hdr.timeout = timeout; - io_hdr.pack_id = (int)start_block; - if (diop && *diop) - io_hdr.flags |= SG_FLAG_DIRECT_IO; -Index: multipath-tools/libmultipath/checkers/libsg.h -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/libsg.h -+++ multipath-tools/libmultipath/checkers/libsg.h -@@ -3,6 +3,7 @@ - - #define SENSE_BUFF_LEN 32 - --int sg_read (int sg_fd, unsigned char * buff, unsigned char * senseBuff); -+int sg_read (int sg_fd, unsigned char * buff, unsigned char * senseBuff, -+ unsigned int timeout); - - #endif /* _LIBSG_H */ -Index: multipath-tools/libmultipath/checkers/rdac.c -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/rdac.c -+++ multipath-tools/libmultipath/checkers/rdac.c -@@ -18,7 +18,6 @@ - #define INQUIRY_CMDLEN 6 - #define INQUIRY_CMD 0x12 - #define SENSE_BUFF_LEN 32 --#define RDAC_DEF_TIMEOUT 60000 - #define SCSI_CHECK_CONDITION 0x2 - #define SCSI_COMMAND_TERMINATED 0x22 - #define SG_ERR_DRIVER_SENSE 0x08 -@@ -43,7 +42,8 @@ void libcheck_free (struct checker * c) - } - - static int --do_inq(int sg_fd, unsigned int pg_op, void *resp, int mx_resp_len) -+do_inq(int sg_fd, unsigned int pg_op, void *resp, int mx_resp_len, -+ unsigned int timeout) - { - unsigned char inqCmdBlk[INQUIRY_CMDLEN] = { INQUIRY_CMD, 1, 0, 0, 0, 0 }; - unsigned char sense_b[SENSE_BUFF_LEN]; -@@ -62,7 +62,7 @@ do_inq(int sg_fd, unsigned int pg_op, vo - io_hdr.dxferp = resp; - io_hdr.cmdp = inqCmdBlk; - io_hdr.sbp = sense_b; -- io_hdr.timeout = RDAC_DEF_TIMEOUT; -+ io_hdr.timeout = timeout; - - if (ioctl(sg_fd, SG_IO, &io_hdr) < 0) - return 1; -@@ -103,7 +103,8 @@ libcheck_check (struct checker * c) - struct volume_access_inq inq; - - memset(&inq, 0, sizeof(struct volume_access_inq)); -- if (0 != do_inq(c->fd, 0xC9, &inq, sizeof(struct volume_access_inq))) { -+ if (0 != do_inq(c->fd, 0xC9, &inq, sizeof(struct volume_access_inq), -+ c->timeout)) { - MSG(c, MSG_RDAC_DOWN); - return PATH_DOWN; - } else { -Index: multipath-tools/libmultipath/checkers/readsector0.c -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/readsector0.c -+++ multipath-tools/libmultipath/checkers/readsector0.c -@@ -29,7 +29,7 @@ int libcheck_check (struct checker * c) - unsigned char sbuf[SENSE_BUFF_LEN]; - int ret; - -- ret = sg_read(c->fd, &buf[0], &sbuf[0]); -+ ret = sg_read(c->fd, &buf[0], &sbuf[0], c->timeout); - - switch (ret) - { -Index: multipath-tools/libmultipath/checkers/tur.c -=================================================================== ---- multipath-tools.orig/libmultipath/checkers/tur.c -+++ multipath-tools/libmultipath/checkers/tur.c -@@ -63,7 +63,7 @@ retry: - io_hdr.dxferp = (unsigned char *)resp_buffer; - io_hdr.cmdp = inq_cmd; - io_hdr.sbp = sense_buffer; -- io_hdr.timeout = 60; // IOCTL timeout value. -+ io_hdr.timeout = c->timeout; // IOCTL timeout value. - - if (ioctl(c->fd, SG_IO, &io_hdr) < 0) { - condlog(0, "SG_IO ioctl failed: %s", strerror(errno)); -@@ -148,7 +148,7 @@ libcheck_check (struct checker * c) - io_hdr.dxfer_direction = SG_DXFER_NONE; - io_hdr.cmdp = turCmdBlk; - io_hdr.sbp = sense_buffer; -- io_hdr.timeout = DEF_TIMEOUT; -+ io_hdr.timeout = c->timeout; - io_hdr.pack_id = 0; - if (ioctl(c->fd, SG_IO, &io_hdr) < 0) { - MSG(c, MSG_TUR_DOWN); -Index: multipath-tools/libmultipath/config.h -=================================================================== ---- multipath-tools.orig/libmultipath/config.h -+++ multipath-tools/libmultipath/config.h -@@ -80,6 +80,7 @@ struct config { - int max_fds; - int force_reload; - int queue_without_daemon; -+ int checker_timeout; - int daemon; - int flush_on_last_del; - int attribute_flags; -Index: multipath-tools/libmultipath/dict.c -=================================================================== ---- multipath-tools.orig/libmultipath/dict.c -+++ multipath-tools/libmultipath/dict.c -@@ -396,6 +396,25 @@ def_queue_without_daemon(vector strvec) - } - - static int -+def_checker_timeout_handler(vector strvec) -+{ -+ unsigned int checker_timeout; -+ char *buff; -+ -+ buff = set_value(strvec); -+ if (!buff) -+ return 1; -+ -+ if (sscanf(buff, "%u", &checker_timeout) == 1) -+ conf->checker_timeout = checker_timeout; -+ else -+ conf->checker_timeout = 0; -+ -+ free(buff); -+ return 0; -+} -+ -+static int - def_pg_timeout_handler(vector strvec) - { - int pg_timeout; -@@ -2068,6 +2087,15 @@ snprint_def_queue_without_daemon (char * - } - - static int -+snprint_def_checker_timeout (char *buff, int len, void *data) -+{ -+ if (!conf->checker_timeout) -+ return 0; -+ -+ return snprintf(buff, len, "%u", conf->checker_timeout); -+} -+ -+static int - snprint_def_pg_timeout (char * buff, int len, void * data) - { - if (conf->pg_timeout == DEFAULT_PGTIMEOUT) -@@ -2166,6 +2194,7 @@ init_keywords(void) - install_keyword("rr_weight", &def_weight_handler, &snprint_def_rr_weight); - install_keyword("no_path_retry", &def_no_path_retry_handler, &snprint_def_no_path_retry); - install_keyword("queue_without_daemon", &def_queue_without_daemon, &snprint_def_queue_without_daemon); -+ install_keyword("checker_timeout", &def_checker_timeout_handler, &snprint_def_checker_timeout); - install_keyword("pg_timeout", &def_pg_timeout_handler, &snprint_def_pg_timeout); - install_keyword("flush_on_last_del", &def_flush_on_last_del_handler, &snprint_def_flush_on_last_del); - install_keyword("user_friendly_names", &names_handler, &snprint_def_user_friendly_names); -Index: multipath-tools/libmultipath/discovery.c -=================================================================== ---- multipath-tools.orig/libmultipath/discovery.c -+++ multipath-tools/libmultipath/discovery.c -@@ -164,6 +164,31 @@ sysfs_get_dev (struct sysfs_device * dev - } - - int -+sysfs_get_timeout(struct sysfs_device *dev, unsigned int *timeout) -+{ -+ char *attr; -+ char attr_path[SYSFS_PATH_SIZE]; -+ int r; -+ unsigned int t; -+ -+ if (safe_sprintf(attr_path, "%s/device", dev->devpath)) -+ return 1; -+ -+ attr = sysfs_attr_get_value(dev->devpath, "timeout"); -+ if (!attr) -+ return 1; -+ -+ r = sscanf(attr, "%u\n", &t); -+ -+ if (r != 1) -+ return 1; -+ -+ *timeout = t * 1000; -+ -+ return 0; -+} -+ -+int - sysfs_get_size (struct sysfs_device * dev, unsigned long long * size) - { - char *attr; -@@ -791,6 +816,8 @@ get_state (struct path * pp, int daemon) - return PATH_PENDING; - checker_set_async(c); - } -+ if (!conf->checker_timeout) -+ sysfs_get_timeout(pp->sysdev, &(c->timeout)); - state = checker_check(c); - condlog(3, "%s: state = %i", pp->dev, state); - if (state == PATH_DOWN && strlen(checker_message(c))) -Index: multipath-tools/libmultipath/propsel.c -=================================================================== ---- multipath-tools.orig/libmultipath/propsel.c -+++ multipath-tools/libmultipath/propsel.c -@@ -16,6 +16,7 @@ - #include "defaults.h" - #include "devmapper.h" - #include "prio.h" -+#include "discovery.h" - - pgpolicyfn *pgpolicies[] = { - NULL, -@@ -274,17 +275,31 @@ select_checker(struct path *pp) - checker_get(c, pp->hwe->checker_name); - condlog(3, "%s: path checker = %s (controller setting)", - pp->dev, checker_name(c)); -- return 0; -+ goto out; - } - if (conf->checker_name) { - checker_get(c, conf->checker_name); - condlog(3, "%s: path checker = %s (config file default)", - pp->dev, checker_name(c)); -- return 0; -+ goto out; - } - checker_get(c, DEFAULT_CHECKER); - condlog(3, "%s: path checker = %s (internal default)", - pp->dev, checker_name(c)); -+out: -+ if (conf->checker_timeout) { -+ c->timeout = conf->checker_timeout * 1000; -+ condlog(3, "%s: checker timeout = %u ms (config file default)", -+ pp->dev, c->timeout); -+ } -+ else if (sysfs_get_timeout(pp->sysdev, &c->timeout) == 0) -+ condlog(3, "%s: checker timeout = %u ms (sysfs setting)", -+ pp->dev, c->timeout); -+ else { -+ c->timeout = DEF_TIMEOUT; -+ condlog(3, "%s: checker timeout = %u ms (internal default)", -+ pp->dev, c->timeout); -+ } - return 0; - } - -Index: multipath-tools/multipath.conf.annotated -=================================================================== ---- multipath-tools.orig/multipath.conf.annotated -+++ multipath-tools/multipath.conf.annotated -@@ -202,6 +202,15 @@ - # gid disk - # - # # -+# # name : checker_timeout -+# # scope : multipath & multipathd -+# # desc : The timeout to use for path checkers that issue scsi -+# # commands with an explicit timeout, in seconds. -+# # values : n > 0 -+# # default : taken from /sys/block/sd<x>/device/timeout -+# checker_timeout 60 -+# -+# # - # # name : fast_io_fail_tmo - # # scope : multipath & multipathd - # # desc : The number of seconds the scsi layer will wait after a -Index: multipath-tools/libmultipath/discovery.h -=================================================================== ---- multipath-tools.orig/libmultipath/discovery.h -+++ multipath-tools/libmultipath/discovery.h -@@ -36,6 +36,7 @@ int pathinfo (struct path *, vector hwta - struct path * store_pathinfo (vector pathvec, vector hwtable, - char * devname, int flag); - int sysfs_set_scsi_tmo (struct multipath *mpp); -+int sysfs_get_timeout(struct sysfs_device *dev, unsigned int *timeout); - - /* - * discovery bitmask diff --git a/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch b/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch new file mode 100644 index 0000000..1e1aa95 --- /dev/null +++ b/plymouth/patches/plymouth-0.8.6.1-create-missing-links-for-systemd-targets.patch @@ -0,0 +1,71 @@ +From edde4e0f2b85c6f298569fe219a08361b99b016b Mon Sep 17 00:00:00 2001 +From: Frederic Crozat <fcrozat(a)suse.com> +Date: Fri, 20 Jul 2012 13:28:31 +0000 +Subject: systemd: create missing links various targets + +--- +diff --git a/systemd-units/Makefile.am b/systemd-units/Makefile.am +index 1545a04..2f5e61f 100644 +--- a/systemd-units/Makefile.am ++++ b/systemd-units/Makefile.am +@@ -13,6 +13,58 @@ systemd_unit_templates = \ + if ENABLE_SYSTEMD_INTEGRATION + systemdunitdir=$(SYSTEMD_UNIT_DIR) + systemdunit_DATA = $(systemd_unit_templates:.in=) ++ ++install-data-hook: ++ $(MKDIR_P) -m 0755 \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants && \ ++ rm -f plymouth-start.service plymouth-read-write.service && \ ++ $(LN_S) ../plymouth-start.service && \ ++ $(LN_S) ../plymouth-read-write.service) ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants && \ ++ rm -f plymouth-quit.service plymouth-quit-wait.service && \ ++ $(LN_S) ../plymouth-quit.service && \ ++ $(LN_S) ../plymouth-quit-wait.service) ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants && \ ++ rm -f plymouth-reboot.service && \ ++ $(LN_S) ../plymouth-reboot.service) ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants && \ ++ rm -f plymouth-kexec.service && \ ++ $(LN_S) ../plymouth-kexec.service) ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants && \ ++ rm -f plymouth-poweroff.service && \ ++ $(LN_S) ../plymouth-poweroff.service) ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants && \ ++ rm -f plymouth-halt.service && \ ++ $(LN_S) ../plymouth-halt.service) ++ ++uninstall-hook: ++ rm -f \ ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants && \ ++ rm -f plymouth-start.service plymouth-read-write.service) \ ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants && \ ++ rm -f plymouth-quit.service plymouth-quit-wait.service) \ ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants && \ ++ rm -f plymouth-reboot.service) \ ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants && \ ++ rm -f plymouth-kexec.service) \ ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants && \ ++ rm -f plymouth-poweroff.service) \ ++ (cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants && \ ++ rm -f plymouth-halt.service) \ ++ rmdir --ignore-fail-on-non-empty \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants \ ++ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants ++ + endif + + EXTRA_DIST = $(systemd_unit_templates) $(systemdunit_DATA) +-- +cgit v0.9.0.2-2-gbebe diff --git a/plymouth/patches/plymouth-no-gtk.patch b/plymouth/patches/plymouth-no-gtk.patch deleted file mode 100644 index 49ab5fc..0000000 --- a/plymouth/patches/plymouth-no-gtk.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nur a/configure.ac b/configure.ac ---- a/configure.ac 2012-06-06 22:21:53.000000000 +0200 -+++ b/configure.ac 2012-06-30 20:55:30.743597988 +0200 -@@ -53,10 +53,6 @@ - AC_SUBST(PANGO_LIBS) - fi - --PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12.0 ]) --AC_SUBST(GTK_CFLAGS) --AC_SUBST(GTK_LIBS) -- - AC_ARG_ENABLE(libdrm_intel, AS_HELP_STRING([--enable-libdrm_intel],[enable building with libdrm_intel support]),enable_libdrm_intel=$enableval,enable_libdrm_intel=no) - AM_CONDITIONAL(ENABLE_LIBDRM_INTEL, [test "$enable_libdrm_intel" = yes]) - -diff -Nur a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2012-06-06 16:14:49.000000000 +0200 -+++ b/src/Makefile.am 2012-06-30 20:56:29.714189945 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = libply libply-splash-core libply-splash-graphics . plugins client viewer tests -+SUBDIRS = libply libply-splash-core libply-splash-graphics . plugins client tests - if ENABLE_UPSTART_MONITORING - SUBDIRS += upstart-bridge - endif -diff -Nur a/src/plugins/renderers/Makefile.am b/src/plugins/renderers/Makefile.am ---- a/src/plugins/renderers/Makefile.am 2012-06-06 16:14:54.000000000 +0200 -+++ b/src/plugins/renderers/Makefile.am 2012-06-30 20:56:59.811483344 +0200 -@@ -1,3 +1,3 @@ --SUBDIRS = frame-buffer x11 drm -+SUBDIRS = frame-buffer drm - - MAINTAINERCLEANFILES = Makefile.in diff --git a/plymouth/plymouth.nm b/plymouth/plymouth.nm index cee24a2..96507de 100644 --- a/plymouth/plymouth.nm +++ b/plymouth/plymouth.nm @@ -4,8 +4,8 @@ ############################################################################### name = plymouth -version = 0.8.5.1 -release = 4 +version = 0.8.6.1 +release = 1 groups = System/Base url = http://www.freedesktop.org/wiki/Software/Plymouth @@ -47,6 +47,7 @@ build configure_options += \ --libexecdir=/usr/lib \ --disable-libkms \ + --disable-gtk \ --enable-tracing \ --disable-tests \ --with-logo=%{datadir}/pixmaps/system-logo-white.png \ @@ -83,23 +84,6 @@ build cp -vf %{DIR_SOURCE}/plymouth-update-initrd \ %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd chmod 755 %{BUILDROOT}/usr/lib/plymouth/plymouth-update-initrd - - # XXX - may we can remove this at a later time. - # - # Enable plymouth systemd service files and link them to the correct targets. - mkdir -pv %{BUILDROOT}%{unitdir}/halt.target.wants - mkdir -pv %{BUILDROOT}%{unitdir}/multi-user.target.wants - mkdir -pv %{BUILDROOT}%{unitdir}/poweroff.target.wants - mkdir -pv %{BUILDROOT}%{unitdir}/reboot.target.wants - mkdir -pv %{BUILDROOT}%{unitdir}/sysinit.target.wants - - ln -svf ../plymouth-halt.service %{BUILDROOT}%{unitdir}/halt.target.wants/plymouth-halt.service - ln -svf ../plymouth-quit.service %{BUILDROOT}%{unitdir}/multi-user.target.wants/plymouth-quit.service - ln -svf ../plymouth-quit-wait.service %{BUILDROOT}%{unitdir}/multi-user.target.wants/plymouth-quit-wait.service - ln -svf ../plymouth-poweroff.service %{BUILDROOT}%{unitdir}/poweroff.target.wants/plymouth-poweroff.service - ln -svf ../plymouth-reboot.service %{BUILDROOT}%{unitdir}/reboot.target.wants/plymouth-reboot.service - ln -svf ../plymouth-read-write.service %{BUILDROOT}%{unitdir}/sysinit.target.wants/plymouth-read-write.service - ln -svf ../plymouth-start.service %{BUILDROOT}%{unitdir}/sysinit.target.wants/plymouth-start.service end end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a772829da5c360cf15c331bb275df534c653ab61
by git＠ipfire.org 29 Jul '12

29 Jul '12

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 3.x development tree". The branch, master has been updated via a772829da5c360cf15c331bb275df534c653ab61 (commit) from cf106a2116fe4643499d8afa5b5e68e19d63f465 (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 a772829da5c360cf15c331bb275df534c653ab61 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Jul 29 19:12:44 2012 +0200 ulogd2: Fix syntax error in makefile. ----------------------------------------------------------------------- Summary of changes: ulogd2/ulogd2.nm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/ulogd2/ulogd2.nm b/ulogd2/ulogd2.nm index 2fa98d6..bb896d7 100644 --- a/ulogd2/ulogd2.nm +++ b/ulogd2/ulogd2.nm @@ -5,7 +5,7 @@ name = ulogd2 version = 2.0.0 -release = 1 +release = 1.1 epoch = 1 thisapp = ulogd-%{version} @@ -75,7 +75,7 @@ packages systemctl daemon-reload >/dev/null 2>&1 || : systemctl try-restart ulogd.service >/dev/null 2>&1 || : end - end + end package %{name}-debuginfo template DEBUGINFO hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. cf106a2116fe4643499d8afa5b5e68e19d63f465
by git＠ipfire.org 29 Jul '12

29 Jul '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. d0cd3ef6b93217a9f5d7364ad4f3412b05684684
by git＠ipfire.org 29 Jul '12

29 Jul '12

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, kernel-update has been updated via d0cd3ef6b93217a9f5d7364ad4f3412b05684684 (commit) from df1374700091096fcf75a2560e4894e9a8752e8b (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 d0cd3ef6b93217a9f5d7364ad4f3412b05684684 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jul 29 18:46:44 2012 +0200 linux-xen: add linux2 lfs for xen kernel and header. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/linux-xen | 3882 +++++++++++++++++----------------- lfs/linux-xen | 2 +- lfs/{linux => linux2} | 0 make.sh | 8 +- src/paks/linux-xen/install.sh | 2 +- 5 files changed, 1948 insertions(+), 1946 deletions(-) copy lfs/{linux => linux2} (100%) Difference in files: diff --git a/config/rootfiles/packages/linux-xen b/config/rootfiles/packages/linux-xen index e9a6656..ec6b99a 100644 --- a/config/rootfiles/packages/linux-xen +++ b/config/rootfiles/packages/linux-xen @@ -1,1946 +1,1946 @@ -boot/System.map-KVER-ipfire-xen +boot/System.map-2.6.32.59-ipfire-xen boot/System.map-ipfire-xen -boot/config-KVER-ipfire-xen -boot/vmlinuz-KVER-ipfire-xen +boot/config-2.6.32.59-ipfire-xen +boot/vmlinuz-2.6.32.59-ipfire-xen boot/vmlinuz-ipfire-xen #lib/firmware/bnx2x-e1-5.0.21.0.fw #lib/firmware/bnx2x-e1h-5.0.21.0.fw #lib/modules -lib/modules/KVER-ipfire-xen -#lib/modules/KVER-ipfire-xen/build -#lib/modules/KVER-ipfire-xen/kernel -#lib/modules/KVER-ipfire-xen/kernel/arch -#lib/modules/KVER-ipfire-xen/kernel/arch/x86 -#lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto -#lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto/aes-i586.ko -#lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto/crc32c-intel.ko -#lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto/salsa20-i586.ko -#lib/modules/KVER-ipfire-xen/kernel/arch/x86/crypto/twofish-i586.ko -#lib/modules/KVER-ipfire-xen/kernel/arch/x86/kernel -#lib/modules/KVER-ipfire-xen/kernel/arch/x86/kernel/microcode.ko -#lib/modules/KVER-ipfire-xen/kernel/arch/x86/kernel/msr.ko -#lib/modules/KVER-ipfire-xen/kernel/arch/x86/kernel/scx200.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto -#lib/modules/KVER-ipfire-xen/kernel/crypto/aes_generic.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/ansi_cprng.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/anubis.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/arc4.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx -#lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_memcpy.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_pq.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_raid6_recov.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_tx.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/async_tx/async_xor.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/authenc.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/blowfish.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/camellia.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/cast5.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/cast6.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/cbc.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/ccm.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/crc32c.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/cryptd.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/ctr.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/cts.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/des_generic.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/ecb.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/fcrypt.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/gcm.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/gf128mul.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/ghash-generic.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/khazad.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/lrw.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/lzo.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/md5.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/michael_mic.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/pcbc.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/rmd128.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/rmd160.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/rmd256.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/rmd320.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/salsa20_generic.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/seed.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/seqiv.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/serpent.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/sha1_generic.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/sha256_generic.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/sha512_generic.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/tea.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/tgr192.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/twofish.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/twofish_common.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/vmac.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/wp512.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/xcbc.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/xor.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/xts.ko -#lib/modules/KVER-ipfire-xen/kernel/crypto/zlib.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/ac.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/acpi_pad.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/battery.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/button.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/container.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/fan.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/pci_slot.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/power_meter.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/processor.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/sbs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/sbshc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/thermal.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/acpi/video.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/ahci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/ata_generic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/ata_piix.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/libata.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_acpi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_ali.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_amd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_artop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_atiixp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_atp867x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cmd640.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cmd64x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cs5520.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cs5530.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cs5535.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cs5536.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_cypress.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_efar.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_hpt366.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_hpt37x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_hpt3x2n.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_hpt3x3.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_it8213.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_it821x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_jmicron.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_marvell.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_mpiix.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_netcell.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_ninja32.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_ns87410.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_ns87415.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_oldpiix.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_opti.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_optidma.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_pcmcia.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_pdc2027x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_pdc202xx_old.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_radisys.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_rdc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_rz1000.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_sc1200.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_sch.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_serverworks.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_sil680.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_sis.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_sl82c105.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_triflex.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pata_via.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/pdc_adma.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_inic162x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_mv.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_nv.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_promise.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_qstor.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_sil.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_sil24.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_sis.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_svw.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_sx4.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_uli.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_via.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ata/sata_vsc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/ambassador.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/atmtcp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/eni.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/firestream.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/fore_200e.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/he.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/horizon.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/idt77105.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/idt77252.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/iphase.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/lanai.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/nicstar.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/solos-pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/suni.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/uPD98402.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/atm/zatm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/block -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/DAC960.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/aoe -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/aoe/aoe.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/cciss.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/cpqarray.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/cryptoloop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/floppy.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/nbd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/osdblk.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/block/sx8.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/btusb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/agpgart.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/ali-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/amd-k7-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/amd64-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/ati-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/efficeon-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/intel-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/nvidia-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/sis-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/sworks-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/agp/via-agp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/cs5535_gpio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hangcheck-timer.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/amd-rng.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/geode-rng.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/intel-rng.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/rng-core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/timeriomem-rng.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/hw_random/via-rng.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/i8k.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi/ipmi_devintf.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi/ipmi_msghandler.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi/ipmi_poweroff.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi/ipmi_si.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ipmi/ipmi_watchdog.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/lp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/nozomi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/nsc_gpio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/nvram.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/pc8736x_gpio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/pcmcia -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/pcmcia/ipwireless -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/pcmcia/ipwireless/ipwireless.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/pcmcia/synclink_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/ppdev.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/scx200_gpio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/char/toshiba.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/clocksource -#lib/modules/KVER-ipfire-xen/kernel/drivers/clocksource/scx200_hrt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/connector -#lib/modules/KVER-ipfire-xen/kernel/drivers/connector/cn.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto -#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/geode-aes.ko.off -#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/hifn_795x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/padlock-aes.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/crypto/padlock-sha.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/dca -#lib/modules/KVER-ipfire-xen/kernel/drivers/dca/dca.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/dma -#lib/modules/KVER-ipfire-xen/kernel/drivers/dma/dmatest.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/dma/ioat -#lib/modules/KVER-ipfire-xen/kernel/drivers/dma/ioat/ioatdma.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire -#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-net.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-ohci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/firewire/firewire-sbp2.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/firmware -#lib/modules/KVER-ipfire-xen/kernel/drivers/firmware/iscsi_ibft.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/drm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/drm_kms_helper.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/i810 -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/i810/i810.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/i830 -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/i830/i830.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/i915 -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/i915/i915.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/mga -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/mga/mga.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/r128 -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/r128/r128.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/radeon -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/radeon/radeon.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/savage -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/savage/savage.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/sis -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/sis/sis.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/tdfx -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/tdfx/tdfx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/ttm -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/ttm/ttm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via -#lib/modules/KVER-ipfire-xen/kernel/drivers/gpu/drm/via/via.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-a4tech.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-apple.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-belkin.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-cherry.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-chicony.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-cypress.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-drff.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-ezkey.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-gaff.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-gyration.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-kensington.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-kye.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-logitech.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-microsoft.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-monterey.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-ntrig.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-petalynx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-pl.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-samsung.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-sjoy.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-sony.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-sunplus.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-tmff.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-topseed.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-twinhan.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-wacom.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/hid-zpff.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/usbhid -#lib/modules/KVER-ipfire-xen/kernel/drivers/hid/usbhid/usbhid.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/abituguru.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/abituguru3.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ad7414.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ad7418.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adm1021.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adm1025.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adm1026.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adm1029.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adm1031.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adm9240.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ads7828.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adt7462.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adt7470.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adt7473.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/adt7475.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/applesmc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/asb100.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/asus_atk0110.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/atxp1.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/coretemp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/dme1737.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ds1621.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/f71805f.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/f71882fg.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/f75375s.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/fschmd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/g760a.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/gl518sm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/gl520sm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/hdaps.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/hp_accel.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/hwmon-vid.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/hwmon.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/i5k_amb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ibmaem.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ibmpex.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/it87.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/k8temp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lis3lv02d.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm63.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm75.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm77.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm78.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm80.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm83.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm85.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm87.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm90.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm92.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm93.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/lm95241.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ltc4215.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/ltc4245.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/max1619.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/max6650.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/pc87360.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/pc87427.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/pcf8591.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/sis5595.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/smsc47b397.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/smsc47m1.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/smsc47m192.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/thmc50.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/tmp401.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/tmp421.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/via686a.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/vt1211.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/vt8231.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83627ehf.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83627hf.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83781d.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83791d.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83792d.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83793.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83l785ts.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/w83l786ng.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/wm831x-hwmon.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/hwmon/wm8350-hwmon.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/algos -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/algos/i2c-algo-bit.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/algos/i2c-algo-pca.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-ali1535.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-ali1563.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-ali15x3.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-amd756-s4882.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-amd756.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-amd8111.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-i801.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-isch.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-nforce2-s4985.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-nforce2.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-ocores.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-parport-light.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-parport.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-pca-platform.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-piix4.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-scmi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-simtec.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-sis5595.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-sis630.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-sis96x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-stub.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-tiny-usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-via.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-viapro.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/i2c-voodoo3.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/busses/scx200_acb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/ds1682.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/chips/tsl2550.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/i2c-core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/i2c/i2c-dev.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154 -#lib/modules/KVER-ipfire-xen/kernel/drivers/ieee802154/fakehard.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/ff-memless.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/input-polldev.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/adp5588-keys.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/lkkbd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/lm8323.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/max7359_keypad.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/newtonkbd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/opencores-kbd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/stowaway.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/sunkbd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/keyboard/xtkbd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/apanel.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/ati_remote.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/ati_remote2.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/cm109.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/keyspan_remote.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/pcf50633-input.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/pcspkr.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/powermate.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/winbond-cir.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/wm831x-on.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/input/misc/yealink.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi/capi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi/capidrv.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/capi/kernelcapi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/divert -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/divert/dss1_divert.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset/bas_gigaset.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset/gigaset.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset/ser_gigaset.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/gigaset/usb_gigaset.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/avm_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1dma.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/c4.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/avm/t1pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/diva_idi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/diva_mnt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divacapi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divadidd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divas.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/avma1_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/elsa_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hfc_usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hisax.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hisax_isac.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/hisax_st5481.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/sedlbauer_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hisax/teles_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hysdn -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/hysdn/hysdn.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdn.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/isdn/i4l/isdnhdlc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/led-class.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-alix2.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-bd2802.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-clevo-mail.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-lp3944.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-net48xx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-pca9532.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-pca955x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-wm831x-status.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-wm8350.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/leds-wrap.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-backlight.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-default-on.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-heartbeat.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-netdev.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/leds/ledtrig-timer.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-crypt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-delay.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-log-userspace.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-log.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-mirror.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-mod.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-multipath.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-queue-length.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-region-hash.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-round-robin.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-service-time.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-snapshot.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-zero.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/linear.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/md-mod.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/multipath.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid0.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid1.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid10.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid456.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/md/raid6_pq.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/mc44s803.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/mt20xx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tda8290.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tda9887.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tea5761.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tea5767.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tuner-simple.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tuner-types.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/tuner-xc2028.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/common/tuners/xc5000.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb/dvb-core -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/dvb/dvb-core/dvb-core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l1-compat.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l2-common.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/v4l2-int-device.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/media/video/videodev.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick -#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/core -#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/core/memstick.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/core/mspro_block.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/host -#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/host/jmb38x_ms.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/memstick/host/tifm_ms.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/message -#lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion -#lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion/mptbase.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion/mptctl.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion/mptfc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion/mptsas.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion/mptscsih.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/message/fusion/mptspi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/ab3100-core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/ab3100-otp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/htc-pasic3.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/mfd-core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/pcf50633-adc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/pcf50633-core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/pcf50633-gpio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/sm501.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/wm831x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/wm8350-i2c.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/wm8350.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mfd/wm8400-core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/c2port -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/c2port/c2port-duramar2150.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/c2port/core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/cb710 -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/cb710/cb710.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom/at24.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom/eeprom.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/eeprom/max6875.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/enclosure.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/hpilo.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/ics932s401.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/isl29003.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/tifm_7xx1.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/misc/tifm_core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/card -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/card/mmc_block.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/card/mmc_test.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/card/sdio_uart.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/core -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/core/mmc_core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/cb710-mmc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/ricoh_mmc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/sdhci-pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/sdhci-pltfm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/sdhci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/sdricoh_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/tifm_sd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/via-sdmmc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mmc/host/wbsd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/ar7part.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/chips -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/chips/chipreg.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/lpddr -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/lpddr/lpddr_cmds.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/lpddr/qinfo_probe.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/maps -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/maps/physmap.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtd_blkdevs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtdblock.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtdchar.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/mtdconcat.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_oobtest.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_pagetest.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_readtest.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_speedtest.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_stresstest.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_subpagetest.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/tests/mtd_torturetest.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/ubi -#lib/modules/KVER-ipfire-xen/kernel/drivers/mtd/ubi/ubi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/3c59x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/8139cp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/8139too.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/8390.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/acenic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/amd8111e.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atl1c -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atl1e -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atlx -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atlx/atl1.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atlx/atl2.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/atp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/b44.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/benet -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/benet/be2net.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bnx2.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bnx2x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bonding -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bonding/bonding.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/bsd_comp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/cassini.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/chelsio -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/chelsio/cxgb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/cnic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/cxgb3 -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/cxgb3/cxgb3.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/de600.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/de620.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/dl2k.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/dnet.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/dummy.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/e100.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/e1000 -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/e1000/e1000.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/e1000e -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/enic -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/enic/enic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/epic100.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/eql.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ethoc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/fealnx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/forcedeth.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/hamachi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/hp100.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ifb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/igb -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/igb/igb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/igbvf -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/igbvf/igbvf.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/imq.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ipg.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/ali-ircc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/donauboe.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/irda-usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/irtty-sir.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/kingsun-sir.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/ks959-sir.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/ksdazzle-sir.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/mcs7780.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/nsc-ircc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/sir-dev.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/smsc-ircc2.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/stir4200.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/via-ircc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/vlsi_ir.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/irda/w83977af_ir.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgb -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgb/ixgb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgbe -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ixgbe/ixgbe.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/jme.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ks8842.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ks8851_mll.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/macvlan.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mdio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mii.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mlx4 -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mlx4/mlx4_core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/mlx4/mlx4_en.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/myri10ge -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/myri10ge/myri10ge.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/natsemi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ne2k-pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/netxen -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/netxen/netxen_nic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/niu.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ns83820.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia/3c574_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia/3c589_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia/axnet_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia/fmvj18x_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia/nmclan_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia/pcnet_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia/smc91c92_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcmcia/xirc2ps_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pcnet32.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/broadcom.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/cicada.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/davicom.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/et1011c.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/icplus.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/lxt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/marvell.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/mdio-bitbang.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/national.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/qsemi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/realtek.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/smsc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/ste10Xp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/phy/vitesse.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ppp_async.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ppp_deflate.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ppp_generic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ppp_mppe.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/ppp_synctty.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pppoe.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pppol2tp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/pppox.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/qla3xxx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/qlge -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/qlge/qlge.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/r6040.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/r8169.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/s2io.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sb1000.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sc92031.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sis190.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sis900.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/skge.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sky2.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/slhc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/slip.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/smsc9420.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/starfire.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sundance.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sungem.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sungem_phy.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/sunhme.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tehuti.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tg3.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tlan.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tulip -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tulip/de2104x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tulip/de4x5.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tulip/dmfe.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tulip/tulip.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tulip/uli526x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tulip/winbond-840.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tulip/xircom_cb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/tun.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/typhoon.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/asix.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/catc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/cdc-phonet.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/dm9601.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/gl620a.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/hso.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/int51x1.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/kaweth.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/net1080.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/pegasus.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/plusb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/usbnet.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/usb/zaurus.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/veth.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/via-rhine.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/via-velocity.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/vxge -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/vxge/vxge.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax/i2400m -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax/i2400m/i2400m-sdio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax/i2400m/i2400m-usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wimax/i2400m/i2400m.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/airo.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/airo_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170 -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/atmel.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/atmel_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/atmel_pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43 -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43legacy -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_plx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2x00 -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas_tf -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54 -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/prism54 -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/prism54/prism54.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/ray_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00 -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rtl818x -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/wl12xx -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/wl3501_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/zd1201.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/zd1211rw -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/net/yellowfin.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/parport -#lib/modules/KVER-ipfire-xen/kernel/drivers/parport/parport.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/parport/parport_ax88796.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/parport/parport_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/parport/parport_pc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/pci -#lib/modules/KVER-ipfire-xen/kernel/drivers/pci/pci-stub.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia -#lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/i82092.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/pcmcia.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/pcmcia_core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/pd6729.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/rsrc_nonstatic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/pcmcia/yenta_socket.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86 -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/acer-wmi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/asus-laptop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/asus_acpi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/compal-laptop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/dell-wmi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/fujitsu-laptop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/hp-wmi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/intel_menlow.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/msi-laptop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/panasonic-laptop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/sony-laptop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/tc1100-wmi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/thinkpad_acpi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/topstar-laptop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/toshiba_acpi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/wmi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/power -#lib/modules/KVER-ipfire-xen/kernel/drivers/power/bq27x00_battery.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/power/ds2782_battery.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/power/max17040_battery.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/power/pcf50633-charger.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/power/wm831x_power.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/power/wm8350_power.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/pps -#lib/modules/KVER-ipfire-xen/kernel/drivers/pps/pps_core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ab3100.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-bq4802.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-cmos.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1286.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1307.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1374.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1511.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1553.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1672.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-ds1742.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-fm3130.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-isl1208.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-lib.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-m41t80.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-m48t35.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-m48t59.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-m48t86.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-max6900.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-pcf50633.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-pcf8563.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-pcf8583.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-rs5c372.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-rx8025.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-rx8581.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-s35390a.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-stk17ta8.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-test.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-v3020.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-wm831x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-wm8350.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/rtc/rtc-x1205.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/3w-9xxx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/3w-xxxx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/BusLogic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/a100u2w.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/aacraid -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/aacraid/aacraid.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/advansys.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/aic7xxx -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/aic7xxx/aic79xx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/aic7xxx/aic7xxx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/aic94xx -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/aic94xx/aic94xx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/arcmsr -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/arcmsr/arcmsr.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/atp870u.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/be2iscsi -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/be2iscsi/be2iscsi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bfa -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bfa/bfa.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bnx2i -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/bnx2i/bnx2i.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ch.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/cxgb3i -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/cxgb3i/cxgb3i.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/dc395x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh_alua.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh_emc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh_hp_sw.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh_rdac.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/dmx3191d.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/dpt_i2o.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/eata.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fcoe -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fcoe/fcoe.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fcoe/libfcoe.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fdomain.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fnic -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fnic/fnic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/gdth.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/hptiop.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/imm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/initio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ipr.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ips.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/iscsi_tcp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libfc -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libfc/libfc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libiscsi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libiscsi_tcp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libsas -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/libsas/libsas.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/lpfc -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/lpfc/lpfc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/megaraid -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/megaraid.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/megaraid/megaraid_mbox.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/megaraid/megaraid_mm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/megaraid/megaraid_sas.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/mvsas -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/mvsas/mvsas.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/nsp32.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/osd -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/osd/libosd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/osd/osd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/aha152x_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/fdomain_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/nsp_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/qlogic_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pcmcia/sym53c500_cs.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/pmcraid.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ppa.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qla1280.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qla2xxx -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qla2xxx/qla2xxx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qla4xxx -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qla4xxx/qla4xxx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/qlogicfas408.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_mod.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_transport_fc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_transport_iscsi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_transport_sas.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_transport_spi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_transport_srp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/scsi_wait_scan.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/sd_mod.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/ses.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/sg.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/sr_mod.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/stex.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/sym53c8xx_2 -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/sym53c8xx_2/sym53c8xx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/tmscsim.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/serial -#lib/modules/KVER-ipfire-xen/kernel/drivers/serial/jsm -#lib/modules/KVER-ipfire-xen/kernel/drivers/serial/jsm/jsm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/serial/serial_core.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/ssb -#lib/modules/KVER-ipfire-xen/kernel/drivers/ssb/ssb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/staging -#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/et131x -#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/et131x/et131x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/slicoss -#lib/modules/KVER-ipfire-xen/kernel/drivers/staging/slicoss/slicoss.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uio -#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_aec.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_cif.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_pci_generic.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_pdrv.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_pdrv_genirq.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_sercos3.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uio/uio_smx.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/atm -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/atm/cxacru.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/atm/speedtch.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/atm/ueagle-atm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/atm/usbatm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/atm/xusbatm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/class -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/class/cdc-acm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/class/cdc-wdm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/class/usblp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/class/usbtmc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/core -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/core/usbcore.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/ehci-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/hwa-hc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/isp116x-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/isp1362-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/ohci-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/oxu210hp-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/r8a66597-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/sl811-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/u132-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/uhci-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/whci -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/whci/whci-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/host/xhci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/berry_charge.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/cypress_cy7c63.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/cytherm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/emi26.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/emi62.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/ftdi-elan.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/iowarrior.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/isight_firmware.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/sisusbvga -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/sisusbvga/sisusbvga.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/usblcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/usbled.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/usbsevseg.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/uss720.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/misc/vstusb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/otg -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/otg/nop-usb-xceiv.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/aircable.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/ark3116.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/belkin_sa.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/ch341.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/cp210x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/cypress_m8.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/digi_acceleport.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/empeg.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/ftdi_sio.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/garmin_gps.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/hp4x.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/io_edgeport.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/ipw.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/iuu_phoenix.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/keyspan_pda.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/mct_u232.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/mos7720.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/mos7840.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/moto_modem.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/opticon.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/option.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/oti6858.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/pl2303.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/safe_serial.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/siemens_mpi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/sierra.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/spcp8x5.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/symbolserial.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/ti_usb_3410_5052.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/usbserial.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/serial/whiteheat.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-alauda.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-cypress.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-freecom.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-isd200.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-jumpshot.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-karma.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-onetouch.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-sddr09.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-sddr55.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/ums-usbat.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/storage/usb-storage.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/wusbcore -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/wusbcore/wusb-cbaf.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/wusbcore/wusb-wa.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/usb/wusbcore/wusbcore.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/hwa-rc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480 -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/dfu -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/i1480-est.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/i1480u-wlp -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/umc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/uwb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/whc-rc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/whci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/wlp -#lib/modules/KVER-ipfire-xen/kernel/drivers/uwb/wlp/wlp.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/arkfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/aty -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/aty/aty128fb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/aty/atyfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/aty/radeonfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/cr_bllcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/generic_bl.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/kb3886_bl.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/lcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/mbp_nvidia_bl.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/platform_lcd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/progear_bl.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/backlight/wm831x_bl.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/broadsheetfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/cirrusfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/cyber2000fb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/display -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/display/display.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/fb_ddc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/fb_sys_fops.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/geode -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/geode/gx1fb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/geode/gxfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/geode/lxfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/i810 -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/i810/i810fb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/kyro -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/kyro/kyrofb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/macmodes.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/g450_pll.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/i2c-matroxfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_DAC1064.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_Ti3026.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_accel.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_base.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_crtc2.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_g450.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_maven.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/matrox/matroxfb_misc.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/mb862xx -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/mb862xx/mb862xxfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/metronomefb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/neofb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/nvidia -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/nvidia/nvidiafb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/output.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/pm2fb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/pm3fb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/riva -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/riva/rivafb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/s3fb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/savage -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/savage/savagefb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/sis -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/sis/sisfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/sm501fb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/sstfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/svgalib.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/syscopyarea.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/sysfillrect.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/sysimgblt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/tdfxfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/tmiofb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/tridentfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/uvesafb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/vermilion -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/vermilion/crvml.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/vermilion/vmlfb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/vgastate.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/via -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/via/viafb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/video/vt8623fb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1 -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/masters -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/masters/ds2482.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/masters/ds2490.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/masters/matrox_w1.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_bq27000.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_ds2431.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_ds2433.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_ds2760.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_smem.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/slaves/w1_therm.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/w1/wire.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/acquirewdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/advantechwdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/alim1535_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/alim7101_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/cpu5wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/eurotechwdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/hpwdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/i6300esb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/iTCO_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/ib700wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/ibmasr.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/it8712f_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/it87_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/machzwd.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/pc87413_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/pcwd_pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/pcwd_usb.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sbc60xxwdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sbc7240_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sbc8360.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sbc_epx_c3.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sc1200wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sc520_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/sch311x_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/scx200_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/smsc37b787_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/softdog.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83627hf_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83697hf_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83697ug_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83877f_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/w83977f_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/wafer5823wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/wdt_pci.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/wm831x_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/wm8350_wdt.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/blktap2 -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/blktap2/blktap.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsiback -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsiback/xen-scsibk.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsifront -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsifront/xenscsi.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/usbback -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/usbback/usbbk.ko -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/usbfront -#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/usbfront/xen-hcd.ko -#lib/modules/KVER-ipfire-xen/kernel/fs -#lib/modules/KVER-ipfire-xen/kernel/fs/autofs -#lib/modules/KVER-ipfire-xen/kernel/fs/autofs/autofs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/autofs4 -#lib/modules/KVER-ipfire-xen/kernel/fs/autofs4/autofs4.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/cifs -#lib/modules/KVER-ipfire-xen/kernel/fs/cifs/cifs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/ecryptfs -#lib/modules/KVER-ipfire-xen/kernel/fs/ecryptfs/ecryptfs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/exportfs -#lib/modules/KVER-ipfire-xen/kernel/fs/exportfs/exportfs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/ext2 -#lib/modules/KVER-ipfire-xen/kernel/fs/ext2/ext2.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/ext3 -#lib/modules/KVER-ipfire-xen/kernel/fs/ext3/ext3.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/ext4 -#lib/modules/KVER-ipfire-xen/kernel/fs/ext4/ext4.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/fat -#lib/modules/KVER-ipfire-xen/kernel/fs/fat/fat.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/fat/vfat.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/fuse -#lib/modules/KVER-ipfire-xen/kernel/fs/fuse/cuse.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/fuse/fuse.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/isofs -#lib/modules/KVER-ipfire-xen/kernel/fs/isofs/isofs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/jbd -#lib/modules/KVER-ipfire-xen/kernel/fs/jbd/jbd.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/jbd2 -#lib/modules/KVER-ipfire-xen/kernel/fs/jbd2/jbd2.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/jffs2 -#lib/modules/KVER-ipfire-xen/kernel/fs/jffs2/jffs2.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/jfs -#lib/modules/KVER-ipfire-xen/kernel/fs/jfs/jfs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/lockd -#lib/modules/KVER-ipfire-xen/kernel/fs/lockd/lockd.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/mbcache.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/nfs -#lib/modules/KVER-ipfire-xen/kernel/fs/nfs/nfs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/nfs_common -#lib/modules/KVER-ipfire-xen/kernel/fs/nfs_common/nfs_acl.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/nfsd -#lib/modules/KVER-ipfire-xen/kernel/fs/nfsd/nfsd.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/quota -#lib/modules/KVER-ipfire-xen/kernel/fs/quota/quota_tree.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/quota/quota_v1.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/quota/quota_v2.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/reiser4 -#lib/modules/KVER-ipfire-xen/kernel/fs/reiser4/reiser4.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/reiserfs -#lib/modules/KVER-ipfire-xen/kernel/fs/reiserfs/reiserfs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/smbfs -#lib/modules/KVER-ipfire-xen/kernel/fs/smbfs/smbfs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/udf -#lib/modules/KVER-ipfire-xen/kernel/fs/udf/udf.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/ufs -#lib/modules/KVER-ipfire-xen/kernel/fs/ufs/xfs.ko -#lib/modules/KVER-ipfire-xen/kernel/fs/xfs -#lib/modules/KVER-ipfire-xen/kernel/fs/xfs/xfs.ko -#lib/modules/KVER-ipfire-xen/kernel/lib -#lib/modules/KVER-ipfire-xen/kernel/lib/crc-ccitt.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/crc-itu-t.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/crc-t10dif.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/crc16.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/crc7.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/libcrc32c.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/lzo -#lib/modules/KVER-ipfire-xen/kernel/lib/lzo/lzo_compress.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/lzo/lzo_decompress.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/ts_bm.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/ts_fsm.ko -#lib/modules/KVER-ipfire-xen/kernel/lib/ts_kmp.ko -#lib/modules/KVER-ipfire-xen/kernel/net -#lib/modules/KVER-ipfire-xen/kernel/net/802 -#lib/modules/KVER-ipfire-xen/kernel/net/802/garp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/802/p8022.ko -#lib/modules/KVER-ipfire-xen/kernel/net/802/psnap.ko -#lib/modules/KVER-ipfire-xen/kernel/net/802/stp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/8021q -#lib/modules/KVER-ipfire-xen/kernel/net/8021q/8021q.ko -#lib/modules/KVER-ipfire-xen/kernel/net/atm -#lib/modules/KVER-ipfire-xen/kernel/net/atm/atm.ko -#lib/modules/KVER-ipfire-xen/kernel/net/atm/br2684.ko -#lib/modules/KVER-ipfire-xen/kernel/net/atm/clip.ko -#lib/modules/KVER-ipfire-xen/kernel/net/atm/pppoatm.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/bluetooth.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/bnep -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/cmtp -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/hidp -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/l2cap.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/rfcomm -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bluetooth/sco.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/bridge.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_802_3.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_among.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_arp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_arpreply.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_dnat.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_ip.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_ip6.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_limit.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_log.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_mark.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_mark_m.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_nflog.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_pkttype.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_redirect.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_snat.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_stp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_ulog.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebt_vlan.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebtable_broute.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebtable_filter.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebtable_nat.ko -#lib/modules/KVER-ipfire-xen/kernel/net/bridge/netfilter/ebtables.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ieee802154 -#lib/modules/KVER-ipfire-xen/kernel/net/ieee802154/af_802154.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ieee802154/nl802154.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ieee802154/wpan-class.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4 -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/ah4.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/esp4.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/inet_diag.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/ip_gre.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/ipcomp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/ipip.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/arp_tables.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/arpt_mangle.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/arptable_filter.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ip_queue.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ip_tables.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_CLUSTERIP.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ECN.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_LOG.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_MASQUERADE.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_NETMAP.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_REJECT.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ULOG.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_addrtype.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ah.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ecn.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ipp2p.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_filter.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_mangle.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_nat.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_raw.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_amanda.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_ftp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_h323.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_irc.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_pptp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_proto_dccp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_proto_gre.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_proto_sctp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_proto_udplite.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_sip.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_snmp_basic.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_tftp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_bic.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_cubic.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_diag.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_highspeed.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_htcp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_hybla.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_illinois.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_lp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_scalable.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_vegas.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_veno.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_westwood.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tcp_yeah.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/tunnel4.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/xfrm4_tunnel.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6 -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ah6.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/esp6.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ip6_tunnel.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ipcomp6.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/ipv6.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/mip6.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6_queue.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6_tables.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_LOG.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_REJECT.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_ah.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_eui64.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_frag.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_hbh.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_mh.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_rt.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_filter.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_mangle.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_raw.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/sit.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/tunnel6.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_beet.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_ro.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_transport.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_mode_tunnel.ko -#lib/modules/KVER-ipfire-xen/kernel/net/ipv6/xfrm6_tunnel.ko -#lib/modules/KVER-ipfire-xen/kernel/net/irda -#lib/modules/KVER-ipfire-xen/kernel/net/irda/ircomm -#lib/modules/KVER-ipfire-xen/kernel/net/irda/ircomm/ircomm-tty.ko -#lib/modules/KVER-ipfire-xen/kernel/net/irda/ircomm/ircomm.ko -#lib/modules/KVER-ipfire-xen/kernel/net/irda/irda.ko -#lib/modules/KVER-ipfire-xen/kernel/net/irda/irlan -#lib/modules/KVER-ipfire-xen/kernel/net/irda/irlan/irlan.ko -#lib/modules/KVER-ipfire-xen/kernel/net/irda/irnet -#lib/modules/KVER-ipfire-xen/kernel/net/irda/irnet/irnet.ko -#lib/modules/KVER-ipfire-xen/kernel/net/key -#lib/modules/KVER-ipfire-xen/kernel/net/key/af_key.ko -#lib/modules/KVER-ipfire-xen/kernel/net/llc -#lib/modules/KVER-ipfire-xen/kernel/net/llc/llc.ko -#lib/modules/KVER-ipfire-xen/kernel/net/mac80211 -#lib/modules/KVER-ipfire-xen/kernel/net/mac80211/mac80211.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/ipvs -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/ipvs/ip_vs.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_amanda.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_ftp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_h323.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_irc.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_netbios_ns.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_netlink.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_pptp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_dccp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_gre.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_sctp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_udplite.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_sane.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_sip.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_tftp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_tproxy_core.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nfnetlink.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nfnetlink_log.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nfnetlink_queue.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/x_tables.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_CLASSIFY.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_CONNMARK.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_DSCP.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_HL.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_IMQ.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_LED.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_MARK.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_NFLOG.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_NFQUEUE.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_NOTRACK.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_RATEEST.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_TCPMSS.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_TCPOPTSTRIP.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_TPROXY.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_TRACE.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_cluster.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_comment.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_connbytes.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_connlimit.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_connmark.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_conntrack.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_dccp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_dscp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_esp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_hashlimit.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_helper.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_hl.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_iprange.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_layer7.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_length.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_limit.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_mac.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_mark.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_multiport.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_osf.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_owner.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_physdev.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_pkttype.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_policy.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_quota.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_rateest.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_realm.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_recent.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_sctp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_socket.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_state.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_statistic.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_string.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_tcpmss.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_tcpudp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_time.ko -#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/xt_u32.ko -#lib/modules/KVER-ipfire-xen/kernel/net/phonet -#lib/modules/KVER-ipfire-xen/kernel/net/phonet/phonet.ko -#lib/modules/KVER-ipfire-xen/kernel/net/phonet/pn_pep.ko -#lib/modules/KVER-ipfire-xen/kernel/net/rds -#lib/modules/KVER-ipfire-xen/kernel/net/rds/rds.ko -#lib/modules/KVER-ipfire-xen/kernel/net/rds/rds_tcp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/rfkill -#lib/modules/KVER-ipfire-xen/kernel/net/rfkill/rfkill.ko -#lib/modules/KVER-ipfire-xen/kernel/net/rxrpc -#lib/modules/KVER-ipfire-xen/kernel/net/rxrpc/af-rxrpc.ko -#lib/modules/KVER-ipfire-xen/kernel/net/rxrpc/rxkad.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched -#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_gact.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_ipt.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_mirred.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_nat.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_pedit.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_police.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/act_skbedit.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_basic.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_flow.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_fw.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_route.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_rsvp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_rsvp6.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_tcindex.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/cls_u32.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/em_cmp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/em_meta.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/em_nbyte.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/em_text.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/em_u32.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_atm.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_cbq.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_drr.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_dsmark.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_gred.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_hfsc.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_htb.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_ingress.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_multiq.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_netem.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_prio.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_red.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_sfq.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_tbf.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sched/sch_teql.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sunrpc -#lib/modules/KVER-ipfire-xen/kernel/net/sunrpc/auth_gss -#lib/modules/KVER-ipfire-xen/kernel/net/sunrpc/auth_gss/auth_rpcgss.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko -#lib/modules/KVER-ipfire-xen/kernel/net/sunrpc/sunrpc.ko -#lib/modules/KVER-ipfire-xen/kernel/net/wimax -#lib/modules/KVER-ipfire-xen/kernel/net/wimax/wimax.ko -#lib/modules/KVER-ipfire-xen/kernel/net/wireless -#lib/modules/KVER-ipfire-xen/kernel/net/wireless/cfg80211.ko -#lib/modules/KVER-ipfire-xen/kernel/net/wireless/lib80211.ko -#lib/modules/KVER-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko -#lib/modules/KVER-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko -#lib/modules/KVER-ipfire-xen/kernel/net/xfrm -#lib/modules/KVER-ipfire-xen/kernel/net/xfrm/xfrm_ipcomp.ko -#lib/modules/KVER-ipfire-xen/kernel/net/xfrm/xfrm_user.ko -#lib/modules/KVER-ipfire-xen/kernel/sound -#lib/modules/KVER-ipfire-xen/kernel/sound/ac97_bus.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core -#lib/modules/KVER-ipfire-xen/kernel/sound/core/oss -#lib/modules/KVER-ipfire-xen/kernel/sound/core/oss/snd-mixer-oss.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/oss/snd-pcm-oss.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq/oss -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq/oss/snd-seq-oss.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq/snd-seq-device.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq/snd-seq-dummy.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq/snd-seq-midi-emul.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq/snd-seq-midi-event.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq/snd-seq-midi.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq/snd-seq-virmidi.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/seq/snd-seq.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/snd-hwdep.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/snd-page-alloc.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/snd-pcm.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/snd-rawmidi.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/snd-timer.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/core/snd.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/mpu401 -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/mpu401/snd-mpu401-uart.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/mpu401/snd-mpu401.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/opl3 -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/opl3/snd-opl3-lib.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/opl3/snd-opl3-synth.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/snd-dummy.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/snd-mtpav.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/snd-mts64.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/snd-portman2x4.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/snd-serial-u16550.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/snd-virmidi.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/vx -#lib/modules/KVER-ipfire-xen/kernel/sound/drivers/vx/snd-vx-lib.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/i2c -#lib/modules/KVER-ipfire-xen/kernel/sound/i2c/other -#lib/modules/KVER-ipfire-xen/kernel/sound/i2c/other/snd-ak4114.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/i2c/other/snd-ak4117.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/i2c/other/snd-ak4xxx-adda.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/i2c/other/snd-pt2258.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/i2c/snd-cs8427.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/i2c/snd-i2c.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/isa -#lib/modules/KVER-ipfire-xen/kernel/sound/isa/sb -#lib/modules/KVER-ipfire-xen/kernel/sound/isa/sb/snd-sb-common.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/isa/sb/snd-sb16-dsp.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ac97 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ac97/snd-ac97-codec.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ali5451 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ali5451/snd-ali5451.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/au88x0 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/au88x0/snd-au8810.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/au88x0/snd-au8820.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/au88x0/snd-au8830.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ca0106 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ca0106/snd-ca0106.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/cs46xx -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/cs46xx/snd-cs46xx.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/cs5535audio -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/cs5535audio/snd-cs5535audio.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ctxfi -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ctxfi/snd-ctxfi.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-darla20.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-darla24.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-echo3g.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-gina20.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-gina24.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigo.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigodj.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigodjx.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigoio.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigoiox.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-layla20.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-layla24.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-mia.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/echoaudio/snd-mona.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/emu10k1 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/emu10k1/snd-emu10k1-synth.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/emu10k1/snd-emu10k1.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/emu10k1/snd-emu10k1x.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-analog.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-atihdmi.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-ca0110.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-cirrus.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-cmedia.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-conexant.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-idt.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-intelhdmi.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-nvhdmi.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-realtek.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-si3054.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-via.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/hda/snd-hda-intel.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ice1712 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ice1712/snd-ice1712.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ice1712/snd-ice1724.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ice1712/snd-ice17xx-ak4xxx.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/korg1212 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/korg1212/snd-korg1212.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/lx6464es -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/lx6464es/snd-lx6464es.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/mixart -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/mixart/snd-mixart.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/nm256 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/nm256/snd-nm256.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/oxygen -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/oxygen/snd-hifier.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/oxygen/snd-oxygen-lib.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/oxygen/snd-oxygen.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/oxygen/snd-virtuoso.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/pcxhr -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/pcxhr/snd-pcxhr.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/riptide -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/riptide/snd-riptide.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/rme9652 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/rme9652/snd-hdsp.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/rme9652/snd-hdspm.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/rme9652/snd-rme9652.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-ad1889.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-als300.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-als4000.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-atiixp-modem.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-atiixp.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-bt87x.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-cmipci.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-cs4281.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-cs5530.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-ens1370.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-ens1371.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-es1938.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-es1968.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-fm801.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-intel8x0.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-intel8x0m.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-maestro3.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-rme32.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-rme96.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-sis7019.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-sonicvibes.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-via82xx-modem.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/snd-via82xx.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/trident -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/trident/snd-trident.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/vx222 -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/vx222/snd-vx222.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ymfpci -#lib/modules/KVER-ipfire-xen/kernel/sound/pci/ymfpci/snd-ymfpci.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pcmcia -#lib/modules/KVER-ipfire-xen/kernel/sound/pcmcia/pdaudiocf -#lib/modules/KVER-ipfire-xen/kernel/sound/pcmcia/pdaudiocf/snd-pdaudiocf.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/pcmcia/vx -#lib/modules/KVER-ipfire-xen/kernel/sound/pcmcia/vx/snd-vxpocket.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ad73311.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ak4535.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ak4642.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-cs4270.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-l3.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-max9877.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-pcm3008.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-spdif.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ssm2602.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-tlv320aic23.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-tlv320aic3x.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-uda134x.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-uda1380.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm-hubs.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8350.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8400.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8510.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8523.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8580.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8728.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8731.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8750.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8753.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8776.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8900.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8903.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8940.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8960.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8961.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8971.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8974.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8988.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8990.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8993.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm9081.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soc/snd-soc-core.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/soundcore.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/synth -#lib/modules/KVER-ipfire-xen/kernel/sound/synth/emux -#lib/modules/KVER-ipfire-xen/kernel/sound/synth/emux/snd-emux-synth.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/synth/snd-util-mem.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/usb -#lib/modules/KVER-ipfire-xen/kernel/sound/usb/caiaq -#lib/modules/KVER-ipfire-xen/kernel/sound/usb/caiaq/snd-usb-caiaq.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/usb/snd-usb-audio.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/usb/snd-usb-lib.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/usb/usx2y -#lib/modules/KVER-ipfire-xen/kernel/sound/usb/usx2y/snd-usb-us122l.ko -#lib/modules/KVER-ipfire-xen/kernel/sound/usb/usx2y/snd-usb-usx2y.ko -#lib/modules/KVER-ipfire-xen/modules.alias -#lib/modules/KVER-ipfire-xen/modules.alias.bin -#lib/modules/KVER-ipfire-xen/modules.ccwmap -#lib/modules/KVER-ipfire-xen/modules.dep -#lib/modules/KVER-ipfire-xen/modules.dep.bin -#lib/modules/KVER-ipfire-xen/modules.ieee1394map -#lib/modules/KVER-ipfire-xen/modules.inputmap -#lib/modules/KVER-ipfire-xen/modules.isapnpmap -#lib/modules/KVER-ipfire-xen/modules.ofmap -#lib/modules/KVER-ipfire-xen/modules.order -#lib/modules/KVER-ipfire-xen/modules.pcimap -#lib/modules/KVER-ipfire-xen/modules.seriomap -#lib/modules/KVER-ipfire-xen/modules.symbols -#lib/modules/KVER-ipfire-xen/modules.symbols.bin -#lib/modules/KVER-ipfire-xen/modules.usbmap -#lib/modules/KVER-ipfire-xen/source +lib/modules/2.6.32.59-ipfire-xen +#lib/modules/2.6.32.59-ipfire-xen/build +#lib/modules/2.6.32.59-ipfire-xen/kernel +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86 +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86/crypto +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86/crypto/aes-i586.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86/crypto/crc32c-intel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86/crypto/salsa20-i586.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86/crypto/twofish-i586.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86/kernel +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86/kernel/microcode.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86/kernel/msr.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/arch/x86/kernel/scx200.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/aes_generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/ansi_cprng.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/anubis.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/arc4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/async_tx +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/async_tx/async_memcpy.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/async_tx/async_pq.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/async_tx/async_raid6_recov.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/async_tx/async_tx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/async_tx/async_xor.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/authenc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/blowfish.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/camellia.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/cast5.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/cast6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/cbc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/ccm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/crc32c.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/cryptd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/ctr.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/cts.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/des_generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/ecb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/fcrypt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/gcm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/gf128mul.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/ghash-generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/khazad.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/lrw.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/lzo.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/md5.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/michael_mic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/pcbc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/rmd128.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/rmd160.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/rmd256.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/rmd320.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/salsa20_generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/seed.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/seqiv.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/serpent.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/sha1_generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/sha256_generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/sha512_generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/tea.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/tgr192.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/twofish.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/twofish_common.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/vmac.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/wp512.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/xcbc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/xor.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/xts.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/crypto/zlib.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/ac.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/acpi_pad.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/battery.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/button.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/container.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/fan.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/pci_slot.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/power_meter.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/processor.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/sbs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/sbshc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/thermal.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/acpi/video.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/ahci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/ata_generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/ata_piix.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/libata.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_acpi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_ali.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_amd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_artop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_atiixp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_atp867x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_cmd640.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_cmd64x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_cs5520.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_cs5530.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_cs5535.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_cs5536.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_cypress.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_efar.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_hpt366.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_hpt37x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_hpt3x2n.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_hpt3x3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_it8213.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_it821x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_jmicron.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_marvell.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_mpiix.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_netcell.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_ninja32.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_ns87410.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_ns87415.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_oldpiix.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_opti.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_optidma.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_pcmcia.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_pdc2027x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_pdc202xx_old.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_radisys.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_rdc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_rz1000.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_sc1200.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_sch.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_serverworks.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_sil680.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_sis.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_sl82c105.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_triflex.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pata_via.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/pdc_adma.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_inic162x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_mv.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_nv.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_promise.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_qstor.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_sil.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_sil24.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_sis.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_svw.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_sx4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_uli.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_via.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ata/sata_vsc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/ambassador.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/atmtcp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/eni.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/firestream.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/fore_200e.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/he.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/horizon.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/idt77105.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/idt77252.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/iphase.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/lanai.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/nicstar.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/solos-pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/suni.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/uPD98402.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/atm/zatm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/DAC960.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/aoe +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/aoe/aoe.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/cciss.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/cpqarray.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/cryptoloop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/floppy.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/nbd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/osdblk.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/block/sx8.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/bcm203x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/bfusb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/bluecard_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/bpa10x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/bt3c_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/btmrvl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/btmrvl_sdio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/btsdio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/btuart_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/btusb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/dtl1_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/hci_uart.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/bluetooth/hci_vhci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/agpgart.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/ali-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/amd-k7-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/amd64-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/ati-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/efficeon-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/intel-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/nvidia-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/sis-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/sworks-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/agp/via-agp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/cs5535_gpio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/hangcheck-timer.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/hw_random +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/hw_random/amd-rng.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/hw_random/geode-rng.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/hw_random/intel-rng.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/hw_random/rng-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/hw_random/timeriomem-rng.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/hw_random/via-rng.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/i8k.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/ipmi +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/ipmi/ipmi_devintf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/ipmi/ipmi_msghandler.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/ipmi/ipmi_poweroff.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/ipmi/ipmi_si.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/ipmi/ipmi_watchdog.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/lp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/nozomi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/nsc_gpio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/nvram.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/pc8736x_gpio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/pcmcia +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/pcmcia/ipwireless +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/pcmcia/ipwireless/ipwireless.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/pcmcia/synclink_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/ppdev.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/scx200_gpio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/char/toshiba.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/clocksource +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/clocksource/scx200_hrt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/connector +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/connector/cn.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/crypto +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/crypto/geode-aes.ko.off +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/crypto/hifn_795x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/crypto/padlock-aes.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/crypto/padlock-sha.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/dca +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/dca/dca.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/dma +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/dma/dmatest.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/dma/ioat +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/dma/ioat/ioatdma.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/firewire +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/firewire/firewire-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/firewire/firewire-net.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/firewire/firewire-ohci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/firewire/firewire-sbp2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/firmware +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/firmware/iscsi_ibft.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/drm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/drm_kms_helper.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/i810 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/i810/i810.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/i830 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/i830/i830.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/i915 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/i915/i915.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/mga +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/mga/mga.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/r128 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/r128/r128.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/radeon +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/radeon/radeon.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/savage +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/savage/savage.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/sis +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/sis/sis.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/tdfx +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/tdfx/tdfx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/ttm +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/ttm/ttm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/via +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/gpu/drm/via/via.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-a4tech.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-apple.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-belkin.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-cherry.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-chicony.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-cypress.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-drff.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-ezkey.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-gaff.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-gyration.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-kensington.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-kye.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-logitech.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-microsoft.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-monterey.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-ntrig.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-petalynx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-pl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-samsung.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-sjoy.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-sony.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-sunplus.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-tmff.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-topseed.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-twinhan.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-wacom.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/hid-zpff.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/usbhid +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hid/usbhid/usbhid.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/abituguru.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/abituguru3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/ad7414.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/ad7418.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adm1021.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adm1025.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adm1026.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adm1029.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adm1031.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adm9240.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/ads7828.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adt7462.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adt7470.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adt7473.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/adt7475.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/applesmc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/asb100.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/asus_atk0110.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/atxp1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/coretemp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/dme1737.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/ds1621.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/f71805f.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/f71882fg.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/f75375s.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/fschmd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/g760a.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/gl518sm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/gl520sm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/hdaps.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/hp_accel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/hwmon-vid.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/hwmon.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/i5k_amb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/ibmaem.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/ibmpex.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/it87.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/k8temp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lis3lv02d.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm63.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm75.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm77.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm78.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm80.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm83.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm85.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm87.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm90.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm92.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm93.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/lm95241.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/ltc4215.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/ltc4245.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/max1619.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/max6650.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/pc87360.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/pc87427.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/pcf8591.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/sis5595.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/smsc47b397.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/smsc47m1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/smsc47m192.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/thmc50.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/tmp401.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/tmp421.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/via686a.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/vt1211.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/vt8231.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/w83627ehf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/w83627hf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/w83781d.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/w83791d.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/w83792d.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/w83793.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/w83l785ts.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/w83l786ng.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/wm831x-hwmon.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/hwmon/wm8350-hwmon.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/algos +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/algos/i2c-algo-bit.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/algos/i2c-algo-pca.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-ali1535.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-ali1563.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-ali15x3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-amd756-s4882.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-amd756.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-amd8111.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-i801.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-isch.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-nforce2-s4985.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-nforce2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-ocores.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-parport-light.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-parport.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-pca-platform.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-piix4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-scmi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-simtec.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-sis5595.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-sis630.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-sis96x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-stub.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-tiny-usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-via.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-viapro.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/i2c-voodoo3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/busses/scx200_acb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/chips +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/chips/ds1682.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/chips/tsl2550.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/i2c-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/i2c/i2c-dev.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ieee802154 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ieee802154/fakehard.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/ff-memless.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/input-polldev.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard/adp5588-keys.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard/lkkbd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard/lm8323.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard/max7359_keypad.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard/newtonkbd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard/opencores-kbd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard/stowaway.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard/sunkbd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/keyboard/xtkbd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/apanel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/ati_remote.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/ati_remote2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/cm109.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/keyspan_remote.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/pcf50633-input.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/pcspkr.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/powermate.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/winbond-cir.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/wm831x-on.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/input/misc/yealink.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/capi +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/capi/capi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/capi/capidrv.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/capi/kernelcapi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/divert +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/divert/dss1_divert.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/gigaset +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/gigaset/bas_gigaset.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/gigaset/gigaset.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/gigaset/ser_gigaset.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/gigaset/usb_gigaset.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/avm +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/avm/avm_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1dma.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/avm/b1pcmcia.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/avm/c4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/avm/t1pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/eicon +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/eicon/diva_idi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/eicon/diva_mnt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divacapi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divadidd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hardware/eicon/divas.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/avma1_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/elsa_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/hfc4s8s_l1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/hfc_usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/hisax.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/hisax_fcpcipnp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/hisax_isac.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/hisax_st5481.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/sedlbauer_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hisax/teles_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hysdn +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/hysdn/hysdn.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/i4l +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/i4l/isdn.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/i4l/isdn_bsdcomp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/isdn/i4l/isdnhdlc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/led-class.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-alix2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-bd2802.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-clevo-mail.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-lp3944.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-net48xx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-pca9532.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-pca955x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-wm831x-status.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-wm8350.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/leds-wrap.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/ledtrig-backlight.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/ledtrig-default-on.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/ledtrig-heartbeat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/ledtrig-netdev.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/leds/ledtrig-timer.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-crypt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-delay.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-log-userspace.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-log.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-mirror.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-mod.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-multipath.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-queue-length.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-region-hash.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-round-robin.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-service-time.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-snapshot.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/dm-zero.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/linear.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/md-mod.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/multipath.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/raid0.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/raid1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/raid10.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/raid456.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/md/raid6_pq.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/mc44s803.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/mt20xx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/tda8290.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/tda9887.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/tea5761.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/tea5767.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/tuner-simple.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/tuner-types.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/tuner-xc2028.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/common/tuners/xc5000.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/dvb +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/dvb/dvb-core +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/dvb/dvb-core/dvb-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/video +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/video/v4l1-compat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/video/v4l2-common.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/video/v4l2-int-device.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/media/video/videodev.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/memstick +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/memstick/core +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/memstick/core/memstick.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/memstick/core/mspro_block.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/memstick/host +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/memstick/host/jmb38x_ms.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/memstick/host/tifm_ms.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/message +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/message/fusion +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/message/fusion/mptbase.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/message/fusion/mptctl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/message/fusion/mptfc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/message/fusion/mptsas.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/message/fusion/mptscsih.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/message/fusion/mptspi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/ab3100-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/ab3100-otp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/htc-pasic3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/mfd-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/pcf50633-adc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/pcf50633-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/pcf50633-gpio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/sm501.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/wm831x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/wm8350-i2c.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/wm8350.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mfd/wm8400-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/c2port +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/c2port/c2port-duramar2150.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/c2port/core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/cb710 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/cb710/cb710.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/eeprom +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/eeprom/at24.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/eeprom/eeprom.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/eeprom/eeprom_93cx6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/eeprom/max6875.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/enclosure.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/hpilo.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/ics932s401.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/isl29003.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/tifm_7xx1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/misc/tifm_core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/card +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/card/mmc_block.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/card/mmc_test.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/card/sdio_uart.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/core +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/core/mmc_core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host/cb710-mmc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host/ricoh_mmc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host/sdhci-pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host/sdhci-pltfm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host/sdhci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host/sdricoh_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host/tifm_sd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host/via-sdmmc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mmc/host/wbsd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/ar7part.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/chips +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/chips/chipreg.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/lpddr +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/lpddr/lpddr_cmds.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/lpddr/qinfo_probe.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/maps +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/maps/physmap.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/mtd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/mtd_blkdevs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/mtdblock.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/mtdchar.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/mtdconcat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/tests +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/tests/mtd_oobtest.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/tests/mtd_pagetest.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/tests/mtd_readtest.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/tests/mtd_speedtest.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/tests/mtd_stresstest.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/tests/mtd_subpagetest.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/tests/mtd_torturetest.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/ubi +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/mtd/ubi/ubi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/3c59x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/8139cp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/8139too.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/8390.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/acenic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/amd8111e.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/atl1c +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/atl1c/atl1c.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/atl1e +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/atl1e/atl1e.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/atlx +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/atlx/atl1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/atlx/atl2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/atp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/b44.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/benet +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/benet/be2net.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/bnx2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/bnx2x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/bonding +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/bonding/bonding.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/bsd_comp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/cassini.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/chelsio +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/chelsio/cxgb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/cnic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/cxgb3 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/cxgb3/cxgb3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/de600.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/de620.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/dl2k.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/dnet.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/dummy.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/e100.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/e1000 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/e1000/e1000.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/e1000e +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/e1000e/e1000e.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/enic +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/enic/enic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/epic100.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/eql.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ethoc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/fealnx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/forcedeth.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/hamachi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/hp100.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ifb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/igb +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/igb/igb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/igbvf +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/igbvf/igbvf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/imq.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ipg.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/ali-ircc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/donauboe.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/irda-usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/irtty-sir.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/kingsun-sir.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/ks959-sir.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/ksdazzle-sir.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/mcs7780.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/nsc-ircc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/sir-dev.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/smsc-ircc2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/stir4200.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/via-ircc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/vlsi_ir.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/irda/w83977af_ir.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ixgb +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ixgb/ixgb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ixgbe +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ixgbe/ixgbe.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/jme.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ks8842.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ks8851_mll.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/macvlan.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/mdio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/mii.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/mlx4 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/mlx4/mlx4_core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/mlx4/mlx4_en.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/myri10ge +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/myri10ge/myri10ge.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/natsemi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ne2k-pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/netxen +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/netxen/netxen_nic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/niu.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ns83820.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcmcia +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcmcia/3c574_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcmcia/3c589_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcmcia/axnet_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcmcia/fmvj18x_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcmcia/nmclan_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcmcia/pcnet_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcmcia/smc91c92_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcmcia/xirc2ps_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pcnet32.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/broadcom.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/cicada.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/davicom.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/et1011c.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/icplus.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/lxt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/marvell.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/mdio-bitbang.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/national.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/qsemi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/realtek.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/smsc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/ste10Xp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/phy/vitesse.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ppp_async.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ppp_deflate.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ppp_generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ppp_mppe.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/ppp_synctty.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pppoe.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pppol2tp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/pppox.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/qla3xxx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/qlge +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/qlge/qlge.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/r6040.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/r8169.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/s2io.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/sb1000.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/sc92031.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/sis190.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/sis900.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/skge.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/sky2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/slhc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/slip.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/smsc9420.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/starfire.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/sundance.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/sungem.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/sungem_phy.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/sunhme.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tehuti.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tg3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tlan.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tulip +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tulip/de2104x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tulip/de4x5.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tulip/dmfe.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tulip/tulip.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tulip/uli526x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tulip/winbond-840.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tulip/xircom_cb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/tun.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/typhoon.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/asix.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/catc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/cdc-phonet.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/cdc_eem.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/cdc_ether.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/cdc_subset.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/dm9601.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/gl620a.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/hso.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/int51x1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/kaweth.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/mcs7830.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/net1080.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/pegasus.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/plusb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/rndis_host.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/rtl8150.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/smsc95xx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/usbnet.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/usb/zaurus.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/veth.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/via-rhine.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/via-velocity.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/vxge +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/vxge/vxge.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wimax +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wimax/i2400m +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wimax/i2400m/i2400m-sdio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wimax/i2400m/i2400m-usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wimax/i2400m/i2400m.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/adm8211.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/airo.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/airo_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/at76c50x-usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ath +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ath/ar9170/ar9170usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/atmel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/atmel_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/atmel_pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/b43 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/b43legacy +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/hostap +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/hostap/hostap_plx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ipw2x00 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2100.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/ipw2200.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ipw2x00/libipw.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/iwlwifi +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwl3945.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlagn.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/iwlwifi/iwlcore.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/iwmc3200wifi/iwmc3200wifi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/libertas +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/libertas/libertas_sdio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/libertas/usb8xxx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/libertas_tf +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/orinoco +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/p54 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/prism54 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/prism54/prism54.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/ray_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rndis_wlan.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2400pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2500usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2800usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt2x00usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt61pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rt2x00/rt73usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rtl818x +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8180.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/rtl818x/rtl8187.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/wl12xx +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/wl12xx/wl1251_sdio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/wl3501_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/zd1201.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/zd1211rw +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/wireless/zd1211rw/zd1211rw.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/net/yellowfin.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/parport +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/parport/parport.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/parport/parport_ax88796.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/parport/parport_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/parport/parport_pc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pci +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pci/pci-stub.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pcmcia +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pcmcia/i82092.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pcmcia/pcmcia.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pcmcia/pcmcia_core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pcmcia/pd6729.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pcmcia/rsrc_nonstatic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pcmcia/yenta_socket.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/acer-wmi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/asus-laptop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/asus_acpi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/compal-laptop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/dell-wmi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/fujitsu-laptop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/hp-wmi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/intel_menlow.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/msi-laptop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/panasonic-laptop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/sony-laptop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/tc1100-wmi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/thinkpad_acpi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/topstar-laptop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/toshiba_acpi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/platform/x86/wmi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/power +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/power/bq27x00_battery.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/power/ds2782_battery.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/power/max17040_battery.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/power/pcf50633-charger.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/power/wm831x_power.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/power/wm8350_power.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pps +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/pps/pps_core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-ab3100.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-bq4802.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-cmos.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-ds1286.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-ds1307.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-ds1374.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-ds1511.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-ds1553.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-ds1672.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-ds1742.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-fm3130.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-isl1208.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-lib.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-m41t80.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-m48t35.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-m48t59.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-m48t86.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-max6900.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-pcf50633.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-pcf8563.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-pcf8583.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-rs5c372.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-rx8025.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-rx8581.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-s35390a.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-stk17ta8.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-test.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-v3020.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-wm831x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-wm8350.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/rtc/rtc-x1205.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/3w-9xxx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/3w-xxxx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/BusLogic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/a100u2w.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/aacraid +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/aacraid/aacraid.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/advansys.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/aic7xxx +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/aic7xxx/aic79xx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/aic7xxx/aic7xxx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/aic94xx +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/aic94xx/aic94xx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/arcmsr +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/arcmsr/arcmsr.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/atp870u.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/be2iscsi +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/be2iscsi/be2iscsi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/bfa +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/bfa/bfa.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/bnx2i +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/bnx2i/bnx2i.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/ch.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/cxgb3i +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/cxgb3i/cxgb3i.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/dc395x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/device_handler +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh_alua.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh_emc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh_hp_sw.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/device_handler/scsi_dh_rdac.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/dmx3191d.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/dpt_i2o.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/eata.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/fcoe +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/fcoe/fcoe.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/fcoe/libfcoe.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/fdomain.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/fnic +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/fnic/fnic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/gdth.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/hptiop.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/imm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/initio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/ipr.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/ips.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/iscsi_tcp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/libfc +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/libfc/libfc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/libiscsi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/libiscsi_tcp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/libsas +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/libsas/libsas.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/lpfc +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/lpfc/lpfc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/megaraid +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/megaraid.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/megaraid/megaraid_mbox.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/megaraid/megaraid_mm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/megaraid/megaraid_sas.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/mvsas +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/mvsas/mvsas.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/nsp32.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/osd +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/osd/libosd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/osd/osd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/pcmcia +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/pcmcia/aha152x_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/pcmcia/fdomain_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/pcmcia/nsp_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/pcmcia/qlogic_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/pcmcia/sym53c500_cs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/pmcraid.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/ppa.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/qla1280.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/qla2xxx +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/qla2xxx/qla2xxx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/qla4xxx +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/qla4xxx/qla4xxx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/qlogicfas408.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/scsi_mod.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/scsi_transport_fc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/scsi_transport_iscsi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/scsi_transport_sas.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/scsi_transport_spi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/scsi_transport_srp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/scsi_wait_scan.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/sd_mod.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/ses.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/sg.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/sr_mod.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/stex.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/sym53c8xx_2 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/sym53c8xx_2/sym53c8xx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/scsi/tmscsim.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/serial +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/serial/jsm +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/serial/jsm/jsm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/serial/serial_core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ssb +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/ssb/ssb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/staging +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/staging/et131x +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/staging/et131x/et131x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/staging/slicoss +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/staging/slicoss/slicoss.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uio +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uio/uio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uio/uio_aec.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uio/uio_cif.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uio/uio_pci_generic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uio/uio_pdrv.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uio/uio_pdrv_genirq.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uio/uio_sercos3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uio/uio_smx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/atm +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/atm/cxacru.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/atm/speedtch.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/atm/ueagle-atm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/atm/usbatm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/atm/xusbatm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/class +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/class/cdc-acm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/class/cdc-wdm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/class/usblp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/class/usbtmc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/core +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/core/usbcore.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/ehci-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/hwa-hc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/isp116x-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/isp1362-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/ohci-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/oxu210hp-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/r8a66597-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/sl811-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/u132-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/uhci-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/whci +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/whci/whci-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/host/xhci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/berry_charge.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/cypress_cy7c63.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/cytherm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/emi26.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/emi62.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/ftdi-elan.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/iowarrior.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/isight_firmware.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/sisusbvga +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/sisusbvga/sisusbvga.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/usblcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/usbled.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/usbsevseg.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/uss720.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/misc/vstusb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/otg +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/otg/nop-usb-xceiv.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/aircable.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/ark3116.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/belkin_sa.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/ch341.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/cp210x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/cypress_m8.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/digi_acceleport.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/empeg.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/ftdi_sio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/garmin_gps.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/hp4x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/io_edgeport.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/ipw.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/iuu_phoenix.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/keyspan_pda.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/mct_u232.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/mos7720.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/mos7840.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/moto_modem.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/opticon.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/option.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/oti6858.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/pl2303.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/safe_serial.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/siemens_mpi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/sierra.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/spcp8x5.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/symbolserial.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/ti_usb_3410_5052.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/usbserial.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/serial/whiteheat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-alauda.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-cypress.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-freecom.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-isd200.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-jumpshot.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-karma.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-onetouch.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-sddr09.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-sddr55.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/ums-usbat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/storage/usb-storage.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/wusbcore +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/wusbcore/wusb-cbaf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/wusbcore/wusb-wa.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/usb/wusbcore/wusbcore.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/hwa-rc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/i1480 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/i1480/dfu +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/i1480/dfu/i1480-dfu-usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/i1480/i1480-est.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/i1480/i1480u-wlp +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/i1480/i1480u-wlp/i1480u-wlp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/umc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/uwb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/whc-rc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/whci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/wlp +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/uwb/wlp/wlp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/arkfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/aty +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/aty/aty128fb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/aty/atyfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/aty/radeonfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/backlight +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/backlight/cr_bllcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/backlight/generic_bl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/backlight/kb3886_bl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/backlight/lcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/backlight/mbp_nvidia_bl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/backlight/platform_lcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/backlight/progear_bl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/backlight/wm831x_bl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/broadsheetfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/cirrusfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/cyber2000fb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/display +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/display/display.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/fb_ddc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/fb_sys_fops.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/geode +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/geode/gx1fb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/geode/gxfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/geode/lxfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/i810 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/i810/i810fb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/kyro +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/kyro/kyrofb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/macmodes.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/g450_pll.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/i2c-matroxfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/matroxfb_DAC1064.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/matroxfb_Ti3026.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/matroxfb_accel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/matroxfb_base.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/matroxfb_crtc2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/matroxfb_g450.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/matroxfb_maven.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/matrox/matroxfb_misc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/mb862xx +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/mb862xx/mb862xxfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/metronomefb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/neofb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/nvidia +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/nvidia/nvidiafb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/output.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/pm2fb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/pm3fb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/riva +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/riva/rivafb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/s3fb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/savage +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/savage/savagefb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/sis +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/sis/sisfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/sm501fb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/sstfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/svgalib.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/syscopyarea.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/sysfillrect.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/sysimgblt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/tdfxfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/tmiofb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/tridentfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/uvesafb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/vermilion +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/vermilion/crvml.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/vermilion/vmlfb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/vgastate.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/via +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/via/viafb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/video/vt8623fb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/masters +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/masters/ds2482.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/masters/ds2490.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/masters/matrox_w1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/slaves +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/slaves/w1_bq27000.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/slaves/w1_ds2431.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/slaves/w1_ds2433.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/slaves/w1_ds2760.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/slaves/w1_smem.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/slaves/w1_therm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/w1/wire.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/acquirewdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/advantechwdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/alim1535_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/alim7101_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/cpu5wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/eurotechwdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/hpwdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/i6300esb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/iTCO_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/ib700wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/ibmasr.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/it8712f_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/it87_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/machzwd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/pc87413_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/pcwd_pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/pcwd_usb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/sbc60xxwdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/sbc7240_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/sbc8360.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/sbc_epx_c3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/sbc_fitpc2_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/sc1200wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/sc520_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/sch311x_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/scx200_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/smsc37b787_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/softdog.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/w83627hf_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/w83697hf_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/w83697ug_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/w83877f_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/w83977f_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/wafer5823wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/wdt_pci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/wm831x_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/watchdog/wm8350_wdt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/blktap2 +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/blktap2/blktap.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/scsiback +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/scsiback/xen-scsibk.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/scsifront +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/scsifront/xenscsi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/usbback +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/usbback/usbbk.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/usbfront +#lib/modules/2.6.32.59-ipfire-xen/kernel/drivers/xen/usbfront/xen-hcd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/autofs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/autofs/autofs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/autofs4 +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/autofs4/autofs4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/cifs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/cifs/cifs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ecryptfs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ecryptfs/ecryptfs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/exportfs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/exportfs/exportfs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ext2 +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ext2/ext2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ext3 +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ext3/ext3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ext4 +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ext4/ext4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/fat +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/fat/fat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/fat/vfat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/fuse +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/fuse/cuse.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/fuse/fuse.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/isofs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/isofs/isofs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/jbd +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/jbd/jbd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/jbd2 +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/jbd2/jbd2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/jffs2 +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/jffs2/jffs2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/jfs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/jfs/jfs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/lockd +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/lockd/lockd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/mbcache.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/nfs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/nfs/nfs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/nfs_common +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/nfs_common/nfs_acl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/nfsd +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/nfsd/nfsd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/quota +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/quota/quota_tree.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/quota/quota_v1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/quota/quota_v2.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/reiser4 +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/reiser4/reiser4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/reiserfs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/reiserfs/reiserfs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/smbfs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/smbfs/smbfs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/udf +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/udf/udf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ufs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/ufs/xfs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/xfs +#lib/modules/2.6.32.59-ipfire-xen/kernel/fs/xfs/xfs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/crc-ccitt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/crc-itu-t.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/crc-t10dif.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/crc16.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/crc7.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/libcrc32c.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/lzo +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/lzo/lzo_compress.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/lzo/lzo_decompress.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/ts_bm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/ts_fsm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/lib/ts_kmp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/802 +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/802/garp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/802/p8022.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/802/psnap.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/802/stp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/8021q +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/8021q/8021q.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/atm +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/atm/atm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/atm/br2684.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/atm/clip.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/atm/pppoatm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/bluetooth.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/bnep +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/bnep/bnep.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/cmtp +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/cmtp/cmtp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/hidp +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/hidp/hidp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/l2cap.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/rfcomm +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/rfcomm/rfcomm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bluetooth/sco.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/bridge.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_802_3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_among.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_arp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_arpreply.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_dnat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_ip.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_ip6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_limit.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_log.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_mark.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_mark_m.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_nflog.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_pkttype.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_redirect.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_snat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_stp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_ulog.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebt_vlan.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebtable_broute.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebtable_filter.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebtable_nat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/bridge/netfilter/ebtables.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ieee802154 +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ieee802154/af_802154.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ieee802154/nl802154.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ieee802154/wpan-class.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4 +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/ah4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/esp4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/inet_diag.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/ip_gre.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/ipcomp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/ipip.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/arp_tables.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/arpt_mangle.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/arptable_filter.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ip_queue.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ip_tables.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_CLUSTERIP.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ECN.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_LOG.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_MASQUERADE.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_NETMAP.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_REDIRECT.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_REJECT.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ULOG.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_addrtype.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ah.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ecn.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ipp2p.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/iptable_filter.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/iptable_mangle.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/iptable_nat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/iptable_raw.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_conntrack_ipv4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_defrag_ipv4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_amanda.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_ftp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_h323.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_irc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_pptp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_proto_dccp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_proto_gre.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_proto_sctp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_proto_udplite.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_sip.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_snmp_basic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/netfilter/nf_nat_tftp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_bic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_cubic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_diag.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_highspeed.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_htcp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_hybla.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_illinois.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_lp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_scalable.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_vegas.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_veno.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_westwood.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tcp_yeah.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/tunnel4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv4/xfrm4_tunnel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6 +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/ah6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/esp6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/ip6_tunnel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/ipcomp6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/ipv6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/mip6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6_queue.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6_tables.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_LOG.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_REJECT.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_ah.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_eui64.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_frag.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_hbh.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_ipv6header.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_mh.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6t_rt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_filter.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_mangle.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/ip6table_raw.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/netfilter/nf_conntrack_ipv6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/sit.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/tunnel6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/xfrm6_mode_beet.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/xfrm6_mode_ro.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/xfrm6_mode_transport.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/xfrm6_mode_tunnel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/ipv6/xfrm6_tunnel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/irda +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/irda/ircomm +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/irda/ircomm/ircomm-tty.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/irda/ircomm/ircomm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/irda/irda.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/irda/irlan +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/irda/irlan/irlan.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/irda/irnet +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/irda/irnet/irnet.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/key +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/key/af_key.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/llc +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/llc/llc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/mac80211 +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/mac80211/mac80211.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/ipvs +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/ipvs/ip_vs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_amanda.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_ftp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_h323.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_irc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_netbios_ns.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_netlink.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_pptp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_dccp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_gre.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_sctp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_udplite.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_sane.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_sip.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_conntrack_tftp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nf_tproxy_core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nfnetlink.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nfnetlink_log.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/nfnetlink_queue.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/x_tables.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_CLASSIFY.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_CONNMARK.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_DSCP.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_HL.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_IMQ.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_LED.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_MARK.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_NFLOG.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_NFQUEUE.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_NOTRACK.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_RATEEST.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_TCPMSS.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_TCPOPTSTRIP.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_TPROXY.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_TRACE.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_cluster.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_comment.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_connbytes.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_connlimit.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_connmark.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_conntrack.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_dccp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_dscp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_esp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_hashlimit.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_helper.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_hl.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_iprange.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_layer7.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_length.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_limit.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_mac.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_mark.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_multiport.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_osf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_owner.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_physdev.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_pkttype.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_policy.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_quota.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_rateest.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_realm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_recent.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_sctp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_socket.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_state.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_statistic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_string.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_tcpmss.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_tcpudp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_time.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/netfilter/xt_u32.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/phonet +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/phonet/phonet.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/phonet/pn_pep.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/rds +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/rds/rds.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/rds/rds_tcp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/rfkill +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/rfkill/rfkill.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/rxrpc +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/rxrpc/af-rxrpc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/rxrpc/rxkad.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/act_gact.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/act_ipt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/act_mirred.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/act_nat.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/act_pedit.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/act_police.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/act_skbedit.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/cls_basic.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/cls_flow.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/cls_fw.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/cls_route.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/cls_rsvp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/cls_rsvp6.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/cls_tcindex.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/cls_u32.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/em_cmp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/em_meta.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/em_nbyte.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/em_text.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/em_u32.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_atm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_cbq.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_drr.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_dsmark.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_gred.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_hfsc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_htb.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_ingress.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_multiq.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_netem.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_prio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_red.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_sfq.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_tbf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sched/sch_teql.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sunrpc +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sunrpc/auth_gss +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sunrpc/auth_gss/auth_rpcgss.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/sunrpc/sunrpc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/wimax +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/wimax/wimax.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/wireless +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/wireless/cfg80211.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/wireless/lib80211.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/wireless/lib80211_crypt_ccmp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/wireless/lib80211_crypt_tkip.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/wireless/lib80211_crypt_wep.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/xfrm +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/xfrm/xfrm_ipcomp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/net/xfrm/xfrm_user.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/ac97_bus.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/oss +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/oss/snd-mixer-oss.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/oss/snd-pcm-oss.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq/oss +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq/oss/snd-seq-oss.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq/snd-seq-device.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq/snd-seq-dummy.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq/snd-seq-midi-emul.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq/snd-seq-midi-event.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq/snd-seq-midi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq/snd-seq-virmidi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/seq/snd-seq.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/snd-hwdep.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/snd-page-alloc.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/snd-pcm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/snd-rawmidi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/snd-timer.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/core/snd.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/mpu401 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/mpu401/snd-mpu401-uart.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/mpu401/snd-mpu401.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/opl3 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/opl3/snd-opl3-lib.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/opl3/snd-opl3-synth.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/snd-dummy.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/snd-mtpav.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/snd-mts64.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/snd-portman2x4.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/snd-serial-u16550.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/snd-virmidi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/vx +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/drivers/vx/snd-vx-lib.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/i2c +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/i2c/other +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/i2c/other/snd-ak4114.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/i2c/other/snd-ak4117.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/i2c/other/snd-ak4xxx-adda.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/i2c/other/snd-pt2258.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/i2c/snd-cs8427.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/i2c/snd-i2c.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/isa +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/isa/sb +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/isa/sb/snd-sb-common.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/isa/sb/snd-sb16-dsp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ac97 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ac97/snd-ac97-codec.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ali5451 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ali5451/snd-ali5451.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/au88x0 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/au88x0/snd-au8810.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/au88x0/snd-au8820.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/au88x0/snd-au8830.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ca0106 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ca0106/snd-ca0106.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/cs46xx +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/cs46xx/snd-cs46xx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/cs5535audio +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/cs5535audio/snd-cs5535audio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ctxfi +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ctxfi/snd-ctxfi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-darla20.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-darla24.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-echo3g.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-gina20.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-gina24.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigo.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigodj.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigodjx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigoio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-indigoiox.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-layla20.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-layla24.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-mia.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/echoaudio/snd-mona.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/emu10k1 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/emu10k1/snd-emu10k1-synth.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/emu10k1/snd-emu10k1.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/emu10k1/snd-emu10k1x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-analog.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-atihdmi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-ca0110.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-cirrus.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-cmedia.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-conexant.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-idt.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-intelhdmi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-nvhdmi.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-realtek.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-si3054.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec-via.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-codec.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/hda/snd-hda-intel.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ice1712 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ice1712/snd-ice1712.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ice1712/snd-ice1724.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ice1712/snd-ice17xx-ak4xxx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/korg1212 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/korg1212/snd-korg1212.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/lx6464es +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/lx6464es/snd-lx6464es.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/mixart +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/mixart/snd-mixart.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/nm256 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/nm256/snd-nm256.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/oxygen +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/oxygen/snd-hifier.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/oxygen/snd-oxygen-lib.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/oxygen/snd-oxygen.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/oxygen/snd-virtuoso.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/pcxhr +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/pcxhr/snd-pcxhr.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/riptide +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/riptide/snd-riptide.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/rme9652 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/rme9652/snd-hdsp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/rme9652/snd-hdspm.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/rme9652/snd-rme9652.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-ad1889.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-als300.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-als4000.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-atiixp-modem.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-atiixp.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-bt87x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-cmipci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-cs4281.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-cs5530.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-ens1370.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-ens1371.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-es1938.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-es1968.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-fm801.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-intel8x0.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-intel8x0m.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-maestro3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-rme32.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-rme96.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-sis7019.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-sonicvibes.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-via82xx-modem.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/snd-via82xx.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/trident +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/trident/snd-trident.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/vx222 +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/vx222/snd-vx222.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ymfpci +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pci/ymfpci/snd-ymfpci.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pcmcia +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pcmcia/pdaudiocf +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pcmcia/pdaudiocf/snd-pdaudiocf.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pcmcia/vx +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/pcmcia/vx/snd-vxpocket.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ad73311.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ak4535.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ak4642.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-cs4270.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-l3.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-max9877.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-pcm3008.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-spdif.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-ssm2602.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-tlv320aic23.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-tlv320aic3x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-uda134x.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-uda1380.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm-hubs.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8350.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8400.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8510.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8523.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8580.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8728.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8731.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8750.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8753.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8776.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8900.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8903.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8940.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8960.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8961.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8971.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8974.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8988.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8990.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm8993.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/codecs/snd-soc-wm9081.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soc/snd-soc-core.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/soundcore.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/synth +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/synth/emux +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/synth/emux/snd-emux-synth.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/synth/snd-util-mem.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/usb +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/usb/caiaq +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/usb/caiaq/snd-usb-caiaq.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/usb/snd-usb-audio.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/usb/snd-usb-lib.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/usb/usx2y +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/usb/usx2y/snd-usb-us122l.ko +#lib/modules/2.6.32.59-ipfire-xen/kernel/sound/usb/usx2y/snd-usb-usx2y.ko +#lib/modules/2.6.32.59-ipfire-xen/modules.alias +#lib/modules/2.6.32.59-ipfire-xen/modules.alias.bin +#lib/modules/2.6.32.59-ipfire-xen/modules.ccwmap +#lib/modules/2.6.32.59-ipfire-xen/modules.dep +#lib/modules/2.6.32.59-ipfire-xen/modules.dep.bin +#lib/modules/2.6.32.59-ipfire-xen/modules.ieee1394map +#lib/modules/2.6.32.59-ipfire-xen/modules.inputmap +#lib/modules/2.6.32.59-ipfire-xen/modules.isapnpmap +#lib/modules/2.6.32.59-ipfire-xen/modules.ofmap +#lib/modules/2.6.32.59-ipfire-xen/modules.order +#lib/modules/2.6.32.59-ipfire-xen/modules.pcimap +#lib/modules/2.6.32.59-ipfire-xen/modules.seriomap +#lib/modules/2.6.32.59-ipfire-xen/modules.symbols +#lib/modules/2.6.32.59-ipfire-xen/modules.symbols.bin +#lib/modules/2.6.32.59-ipfire-xen/modules.usbmap +#lib/modules/2.6.32.59-ipfire-xen/source diff --git a/lfs/linux-xen b/lfs/linux-xen index 356fc8f..d0ac8e8 100644 --- a/lfs/linux-xen +++ b/lfs/linux-xen @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # diff --git a/lfs/linux2 b/lfs/linux2 new file mode 100644 index 0000000..fc60de2 --- /dev/null +++ b/lfs/linux2 @@ -0,0 +1,260 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +PATCHLEVEL = .59 +VER = 2.6.32.59 + +THISAPP = linux-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +CFLAGS = +CXXFLAGS = + +PAK_VER = 20 +DEPS = "" + +# Normal build or XEN build. +# + +VERSUFIX=ipfire$(KCFG) + +ifeq "$(HEADERS)" "1" +ifeq "$(TOOLS)" "1" + TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX)-tools + HEADERS_PREFIX = /tools +else + TARGET = $(DIR_INFO)/linux-libc-headers-$(VER)-$(VERSUFIX) + HEADERS_PREFIX = /usr +endif +else + TARGET = $(DIR_INFO)/linux-$(VER)-$(VERSUFIX) +endif + +ifeq "$(MACHINE_TYPE)" "arm" + HEADERS_ARCH=arm +else + HEADERS_ARCH=x86 +endif + +ifeq "$(KCFG)" "" +LASTKERNEL=1 +endif +ifeq "$(KCFG)" "-kirkwood" +LASTKERNEL=1 +endif + +############################################################################### +# Top-level Rules +############################################################################### +objects =$(DL_FILE) \ + netfilter-layer7-v2.22.tar.gz \ + patch-2.6.16-nath323-1.3.bz2 \ + reiser4-for-2.6.32.patch.bz2 \ + xen-patches-2.6.32-2f.tar.bz2 + +$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) +netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz +patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 +reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 +xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 + +$(DL_FILE)_MD5 = 69c68c4a8eb0f04b051a7dbcff16f6d0 +netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f +patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 +reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 +xen-patches-2.6.32-2f.tar.bz2_MD5 = b59d6f89e11accb9d40354418e13f31b + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) $(DIR_SRC)/linux $(DIR_SRC)/linux-*-suse_xen_patches $(DIR_SRC)/xen-* && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + ln -svf linux-$(VER) $(DIR_SRC)/linux + +ifeq "$(KCFG)" "-xen" + # Apply gentoo Xen patches + mkdir -p $(DIR_SRC)/xen-patches + cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2f.tar.bz2 + + for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \ + echo "*********** [Patch: $$x]"; \ + cd $(DIR_APP) && pwd && patch -Np1 < $$x || exit 1; \ + done + rm -rf $(DIR_SRC)/xen-patches + + # Linux Intermediate Queueing Device + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-imq-test2.patch +else + # Linux Intermediate Queueing Device + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch +endif + + # Not report deprecated syscall 1.23 (for kudzu) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch + + # Reiser4 (don't check if fail (some patches are already in xen patchset) + -cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1 + + # ipp2p 0.8.2-pomng + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch + + # Layer7-patch + cd $(DIR_SRC) && rm -rf $(DIR_SRC)/netfilter-layer7-v2.22 + cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.22/kernel-2.6.25-2.6.28-layer7-2.22.patch + + # Add some more LED triggers + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch + + # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch + + # Fix uevent PHYSDEVDRIVER + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch + + # Fix mv_cesa + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-crypto-mv_cesa.patch + +ifeq "$(KCFG)" "-kirkwood" + # Add dreamplug,guruplug and icy 62x0 support on ARM-kirkwood + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.57-arm_kirkwood_setups.patch +endif + +ifeq "$(MACHINE_TYPE)" "arm" + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.45_align_ssb_modtable_32bit_boundary.patch +endif + +ifeq "$(HEADERS)" "1" + # Install the header files + cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) INSTALL_HDR_PATH=dest headers_install + -mkdir -pv $(BUILDROOT)/$(HEADERS_PREFIX)/include + cd $(DIR_APP) && find dest/include $ -name .install -o -name ..install.cmd $ -delete + cd $(DIR_APP) && cp -rv dest/include/* $(BUILDROOT)/$(HEADERS_PREFIX)/include +else + + # Install ipfire logo + cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/kernel/ipfire_logo.ppm \ + drivers/video/logo/logo_linux_clut224.ppm + + # Cleanup kernel source + cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config + cd $(DIR_APP) && make CC="$(KGCC)" oldconfig + cd $(DIR_APP) && make CC="$(KGCC)" clean + cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ $(PATCHLEVEL)-$(VERSUFIX)/' Makefile + +ifeq "$(KCFG)" "-xen" + cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" vmlinuz + cd $(DIR_APP) && cp -v arch/i386/boot/vmlinuz /boot/vmlinuz-$(VER)-$(VERSUFIX) +else +ifeq "$(KCFG)" "-kirkwood" + cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" uImage + cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/vmlinuz-$(VER)-$(VERSUFIX) + cd $(DIR_APP) && cp -v arch/arm/boot/uImage /boot/uImage-$(VERSUFIX) +else +ifeq "$(KCFG)" "-versatile" + cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" zImage + cd $(DIR_APP) && cp -v arch/arm/boot/zImage /boot/vmlinuz-$(VER)-$(VERSUFIX) +else + cd $(DIR_APP) && make $(MAKETUNING) CC="$(KGCC)" bzImage + cd $(DIR_APP) && cp -v arch/i386/boot/bzImage /boot/vmlinuz-$(VER)-$(VERSUFIX) +endif +endif +endif + cd $(DIR_APP) && cp -v System.map /boot/System.map-$(VER)-$(VERSUFIX) + cd $(DIR_APP) && cp -v .config /boot/config-$(VER)-$(VERSUFIX) + ln -sf vmlinuz-$(VER)-$(VERSUFIX) /boot/vmlinuz-$(VERSUFIX) + ln -sf System.map-$(VER)-$(VERSUFIX) /boot/System.map-$(VERSUFIX) + cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules + cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) modules_install + cd $(DIR_APP) && make CC="$(KGCC)" $(MAKETUNING) firmware_install + +ifeq "$(LASTKERNEL)" "1" + # Only do this once + cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/ + + # Blacklist matroxfb_base + echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer + # Blacklist old framebuffer modules + for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \ + done + # Blacklist new drm framebuffer modules + for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \ + done + sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer + + # Blacklist isdn modules + for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \ + echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \ + done + sed -i -e "s|.ko||g" /etc/modprobe.d/isdn + + # Disable ipv6 at runtime + echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6 +endif + + # Remove mISDN modules + rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN + rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN + +ifneq "$(MACHINE_TYPE)" "arm" + # Disable geode_aes modul + mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \ + /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off +endif +endif + + @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-* + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 84447f5..2f2c79c 100755 --- a/make.sh +++ b/make.sh @@ -265,7 +265,7 @@ buildtoolchain() { lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH - lfsmake1 linux TOOLS=1 HEADERS=1 + lfsmake1 linux2 TOOLS=1 HEADERS=1 lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 lfsmake1 fake-environ @@ -302,7 +302,7 @@ buildbase() { LOGFILE="$BASEDIR/log/_build.base.log" export LOGFILE lfsmake2 stage2 - lfsmake2 linux HEADERS=1 + lfsmake2 linux2 HEADERS=1 lfsmake2 man-pages lfsmake2 glibc lfsmake2 tzdata @@ -382,7 +382,7 @@ buildipfire() { # The xen and PAE kernels are only available for x86 if [ "${MACHINE_TYPE}" != "arm" ]; then - ipfiremake linux KCFG="-xen" + ipfiremake linux2 KCFG="-xen" ipfiremake kqemu KCFG="-xen" ipfiremake v4l-dvb KCFG="-xen" ipfiremake madwifi KCFG="-xen" @@ -396,6 +396,7 @@ buildipfire() { ipfiremake e1000 KCFG="-xen" ipfiremake e1000e KCFG="-xen" ipfiremake igb KCFG="-xen" + ipfiremake linux KCFG="-pae" ipfiremake kqemu KCFG="-pae" ipfiremake kvm-kmod KCFG="-pae" @@ -412,6 +413,7 @@ buildipfire() { ipfiremake e1000 KCFG="-pae" ipfiremake e1000e KCFG="-pae" ipfiremake igb KCFG="-pae" + ipfiremake linux KCFG="" ipfiremake v4l-dvb KCFG="" ipfiremake kqemu KCFG="" diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 70efa9d..179d607 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=xxxKVERxxx +KVER=2.6.32.59 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. df1374700091096fcf75a2560e4894e9a8752e8b
by git＠ipfire.org 29 Jul '12

29 Jul '12

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, kernel-update has been updated via df1374700091096fcf75a2560e4894e9a8752e8b (commit) via 8e57f223289aeb8cf2eae3246cbd2dbf6ef29a12 (commit) from 50b5d7ce0bc813a35d3daaba150a87c1ae990faa (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 df1374700091096fcf75a2560e4894e9a8752e8b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jul 29 16:28:12 2012 +0200 iptables: update to 1.4.14. commit 8e57f223289aeb8cf2eae3246cbd2dbf6ef29a12 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Jul 29 16:24:05 2012 +0200 miniupnpd: fix for build with newer iptables. IPT_ALIGN is replaces by XT_ALIGN since iptables 1.4 and the compatiblity macro is removed in 1.4.14. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/iptables | 116 ++++--------- lfs/iptables | 10 +- lfs/miniupnpd | 5 +- ..._test1.patch => iptables-1.4.12-IMQ-test4.diff} | 47 ++++-- ...ch => iptables-1.4.14-ipp2p-0.8.2-ipfire.patch} | 4 +- src/patches/iptables-1.4.6-errorno_includes.patch | 170 -------------------- src/patches/miniupnpd-1.4_use_XT_ALIGN.patch | 47 ++++++ 7 files changed, 124 insertions(+), 275 deletions(-) rename src/patches/{iptables-1.4.6-imq_test1.patch => iptables-1.4.12-IMQ-test4.diff} (60%) rename src/patches/{iptables-1.4.6-ipp2p-0.8.2-pomng.patch => iptables-1.4.14-ipp2p-0.8.2-ipfire.patch} (99%) delete mode 100644 src/patches/iptables-1.4.6-errorno_includes.patch create mode 100644 src/patches/miniupnpd-1.4_use_XT_ALIGN.patch Difference in files: diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables index 8e1a6e4..e958a93 100644 --- a/config/rootfiles/common/iptables +++ b/config/rootfiles/common/iptables @@ -1,21 +1,27 @@ #lib/libip4tc.la lib/libip4tc.so lib/libip4tc.so.0 -lib/libip4tc.so.0.0.0 +lib/libip4tc.so.0.1.0 #lib/libip6tc.la lib/libip6tc.so lib/libip6tc.so.0 -lib/libip6tc.so.0.0.0 -#lib/libipq.a +lib/libip6tc.so.0.1.0 +#lib/libipq.la +lib/libipq.so +lib/libipq.so.0 +lib/libipq.so.0.0.0 #lib/libiptc.la lib/libiptc.so lib/libiptc.so.0 lib/libiptc.so.0.0.0 #lib/libxtables.la lib/libxtables.so -lib/libxtables.so.4 -lib/libxtables.so.4.0.0 +lib/libxtables.so.7 +lib/libxtables.so.7.0.0 #lib/pkgconfig +#lib/pkgconfig/libip4tc.pc +#lib/pkgconfig/libip6tc.pc +#lib/pkgconfig/libipq.pc #lib/pkgconfig/libiptc.pc #lib/pkgconfig/xtables.pc lib/xtables @@ -42,52 +48,62 @@ lib/xtables #lib/xtables/libipt_REDIRECT.so #lib/xtables/libipt_REJECT.so #lib/xtables/libipt_SAME.so -#lib/xtables/libipt_SET.so #lib/xtables/libipt_SNAT.so #lib/xtables/libipt_TTL.so #lib/xtables/libipt_ULOG.so -#lib/xtables/libipt_addrtype.so #lib/xtables/libipt_ah.so -#lib/xtables/libipt_ecn.so #lib/xtables/libipt_icmp.so #lib/xtables/libipt_ipp2p.so #lib/xtables/libipt_realm.so -#lib/xtables/libipt_set.so #lib/xtables/libipt_ttl.so #lib/xtables/libipt_unclean.so +#lib/xtables/libxt_AUDIT.so +#lib/xtables/libxt_CHECKSUM.so #lib/xtables/libxt_CLASSIFY.so #lib/xtables/libxt_CONNMARK.so #lib/xtables/libxt_CONNSECMARK.so +#lib/xtables/libxt_CT.so #lib/xtables/libxt_DSCP.so +#lib/xtables/libxt_IDLETIMER.so #lib/xtables/libxt_IMQ.so +#lib/xtables/libxt_LED.so #lib/xtables/libxt_MARK.so #lib/xtables/libxt_NFLOG.so #lib/xtables/libxt_NFQUEUE.so #lib/xtables/libxt_NOTRACK.so #lib/xtables/libxt_RATEEST.so #lib/xtables/libxt_SECMARK.so +#lib/xtables/libxt_SET.so #lib/xtables/libxt_TCPMSS.so #lib/xtables/libxt_TCPOPTSTRIP.so +#lib/xtables/libxt_TEE.so #lib/xtables/libxt_TOS.so #lib/xtables/libxt_TPROXY.so #lib/xtables/libxt_TRACE.so +#lib/xtables/libxt_addrtype.so #lib/xtables/libxt_cluster.so #lib/xtables/libxt_comment.so #lib/xtables/libxt_connbytes.so #lib/xtables/libxt_connlimit.so #lib/xtables/libxt_connmark.so #lib/xtables/libxt_conntrack.so +#lib/xtables/libxt_cpu.so +#lib/xtables/libxt_dccp.so +#lib/xtables/libxt_devgroup.so #lib/xtables/libxt_dscp.so +#lib/xtables/libxt_ecn.so #lib/xtables/libxt_esp.so #lib/xtables/libxt_hashlimit.so #lib/xtables/libxt_helper.so #lib/xtables/libxt_iprange.so +#lib/xtables/libxt_ipvs.so #lib/xtables/libxt_layer7.so #lib/xtables/libxt_length.so #lib/xtables/libxt_limit.so #lib/xtables/libxt_mac.so #lib/xtables/libxt_mark.so #lib/xtables/libxt_multiport.so +#lib/xtables/libxt_nfacct.so #lib/xtables/libxt_osf.so #lib/xtables/libxt_owner.so #lib/xtables/libxt_physdev.so @@ -96,7 +112,9 @@ lib/xtables #lib/xtables/libxt_quota.so #lib/xtables/libxt_rateest.so #lib/xtables/libxt_recent.so +#lib/xtables/libxt_rpfilter.so #lib/xtables/libxt_sctp.so +#lib/xtables/libxt_set.so #lib/xtables/libxt_socket.so #lib/xtables/libxt_standard.so #lib/xtables/libxt_state.so @@ -108,18 +126,14 @@ lib/xtables #lib/xtables/libxt_tos.so #lib/xtables/libxt_u32.so #lib/xtables/libxt_udp.so -#sbin/ip6tables -#sbin/ip6tables-multi -#sbin/ip6tables-restore -#sbin/ip6tables-save +sbin/ip6tables +sbin/ip6tables-restore +sbin/ip6tables-save sbin/iptables -sbin/iptables-multi -#sbin/iptables-restore -#sbin/iptables-save -#sbin/iptables-xml -#usr/include/asm-generic -#usr/include/asm-generic/errno-base.h -#usr/include/asm-generic/errno.h +sbin/iptables-restore +sbin/iptables-save +sbin/iptables-xml +sbin/xtables-multi #usr/include/iptables #usr/include/iptables.h #usr/include/iptables/internal.h @@ -129,6 +143,7 @@ sbin/iptables-multi #usr/include/libiptc/libip6tc.h #usr/include/libiptc/libiptc.h #usr/include/libiptc/libxtc.h +#usr/include/libiptc/xtcshared.h #usr/include/libipulog #usr/include/libipulog/libipulog.h #usr/include/libnetfilter_queue @@ -139,12 +154,9 @@ sbin/iptables-multi #usr/include/libnfnetlink/libnfnetlink.h #usr/include/libnfnetlink/linux_nfnetlink.h #usr/include/libnfnetlink/linux_nfnetlink_compat.h -#usr/include/linux/netfilter #usr/include/linux/netfilter/Kbuild #usr/include/linux/netfilter/nf_conntrack_amanda.h -#usr/include/linux/netfilter/nf_conntrack_common.h #usr/include/linux/netfilter/nf_conntrack_dccp.h -#usr/include/linux/netfilter/nf_conntrack_ftp.h #usr/include/linux/netfilter/nf_conntrack_h323.h #usr/include/linux/netfilter/nf_conntrack_h323_asn1.h #usr/include/linux/netfilter/nf_conntrack_h323_types.h @@ -152,67 +164,11 @@ sbin/iptables-multi #usr/include/linux/netfilter/nf_conntrack_pptp.h #usr/include/linux/netfilter/nf_conntrack_proto_gre.h #usr/include/linux/netfilter/nf_conntrack_sane.h -#usr/include/linux/netfilter/nf_conntrack_sctp.h #usr/include/linux/netfilter/nf_conntrack_sip.h -#usr/include/linux/netfilter/nf_conntrack_tcp.h #usr/include/linux/netfilter/nf_conntrack_tftp.h -#usr/include/linux/netfilter/nf_conntrack_tuple_common.h -#usr/include/linux/netfilter/nfnetlink.h -#usr/include/linux/netfilter/nfnetlink_compat.h -#usr/include/linux/netfilter/nfnetlink_conntrack.h -#usr/include/linux/netfilter/nfnetlink_log.h -#usr/include/linux/netfilter/nfnetlink_queue.h -#usr/include/linux/netfilter/x_tables.h -#usr/include/linux/netfilter/xt_CLASSIFY.h -#usr/include/linux/netfilter/xt_CONNMARK.h -#usr/include/linux/netfilter/xt_CONNSECMARK.h -#usr/include/linux/netfilter/xt_DSCP.h #usr/include/linux/netfilter/xt_IMQ.h -#usr/include/linux/netfilter/xt_LED.h -#usr/include/linux/netfilter/xt_MARK.h -#usr/include/linux/netfilter/xt_NFLOG.h -#usr/include/linux/netfilter/xt_NFQUEUE.h -#usr/include/linux/netfilter/xt_RATEEST.h -#usr/include/linux/netfilter/xt_SECMARK.h -#usr/include/linux/netfilter/xt_TCPMSS.h -#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h -#usr/include/linux/netfilter/xt_TPROXY.h -#usr/include/linux/netfilter/xt_cluster.h -#usr/include/linux/netfilter/xt_comment.h -#usr/include/linux/netfilter/xt_connbytes.h -#usr/include/linux/netfilter/xt_connlimit.h -#usr/include/linux/netfilter/xt_connmark.h -#usr/include/linux/netfilter/xt_conntrack.h -#usr/include/linux/netfilter/xt_dccp.h -#usr/include/linux/netfilter/xt_dscp.h -#usr/include/linux/netfilter/xt_esp.h -#usr/include/linux/netfilter/xt_hashlimit.h -#usr/include/linux/netfilter/xt_helper.h -#usr/include/linux/netfilter/xt_iprange.h #usr/include/linux/netfilter/xt_layer7.h -#usr/include/linux/netfilter/xt_length.h -#usr/include/linux/netfilter/xt_limit.h -#usr/include/linux/netfilter/xt_mac.h -#usr/include/linux/netfilter/xt_mark.h -#usr/include/linux/netfilter/xt_multiport.h -#usr/include/linux/netfilter/xt_osf.h -#usr/include/linux/netfilter/xt_owner.h -#usr/include/linux/netfilter/xt_physdev.h -#usr/include/linux/netfilter/xt_pkttype.h -#usr/include/linux/netfilter/xt_policy.h -#usr/include/linux/netfilter/xt_quota.h -#usr/include/linux/netfilter/xt_rateest.h -#usr/include/linux/netfilter/xt_realm.h -#usr/include/linux/netfilter/xt_recent.h -#usr/include/linux/netfilter/xt_sctp.h #usr/include/linux/netfilter/xt_socket.h -#usr/include/linux/netfilter/xt_state.h -#usr/include/linux/netfilter/xt_statistic.h -#usr/include/linux/netfilter/xt_string.h -#usr/include/linux/netfilter/xt_tcpmss.h -#usr/include/linux/netfilter/xt_tcpudp.h -#usr/include/linux/netfilter/xt_time.h -#usr/include/linux/netfilter/xt_u32.h #usr/include/net/netfilter #usr/include/net/netfilter/nf_conntrack_tuple.h #usr/include/net/netfilter/nf_nat.h @@ -234,6 +190,7 @@ usr/lib/libnfnetlink.so.0 usr/lib/libnfnetlink.so.0.2.0 #usr/lib/pkgconfig/libnetfilter_queue.pc #usr/lib/pkgconfig/libnfnetlink.pc +#usr/share/man/man1/iptables-xml.1 #usr/share/man/man3/ipq_create_handle.3 #usr/share/man/man3/ipq_destroy_handle.3 #usr/share/man/man3/ipq_errstr.3 @@ -250,5 +207,4 @@ usr/lib/libnfnetlink.so.0.2.0 #usr/share/man/man8/ip6tables.8 #usr/share/man/man8/iptables-restore.8 #usr/share/man/man8/iptables-save.8 -#usr/share/man/man8/iptables-xml.8 #usr/share/man/man8/iptables.8 diff --git a/lfs/iptables b/lfs/iptables index 6d36990..33a00e4 100644 --- a/lfs/iptables +++ b/lfs/iptables @@ -24,7 +24,7 @@ include Config -VER = 1.4.6 +VER = 1.4.14 THISAPP = iptables-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz libnfnetlink-1.0.0.tar.bz2 = $(URL_IPFIRE)/libnfnetlink-1.0.0.tar.bz2 libnetfilter_queue-0.0.17.tar.bz2 = $(URL_IPFIRE)/libnetfilter_queue-0.0.17.tar.bz2 -$(DL_FILE)_MD5 = c67cf30e281a924def6426be0973df56 +$(DL_FILE)_MD5 = 5ab24ad683f76689cfe7e0c73f44855d netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f libnfnetlink-1.0.0.tar.bz2_MD5 = 016fdec8389242615024c529acc1adb8 libnetfilter_queue-0.0.17.tar.bz2_MD5 = 2cde35e678ead3a8f9eb896bf807a159 @@ -89,11 +89,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ./extensions/ # ipp2p 0.8.2-pomng - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.14-ipp2p-0.8.2-ipfire.patch # imq - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-imq_test1.patch - chmod +x $(DIR_APP)/extensions/.IMQ-test* + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.12-IMQ-test4.diff +# chmod +x $(DIR_APP)/extensions/.IMQ-test* cd $(DIR_APP) && ./configure --prefix=/usr --with-ksource=/usr/src/linux \ --libdir=/lib --includedir=/usr/include --enable-libipq \ diff --git a/lfs/miniupnpd b/lfs/miniupnpd index 470fc28..c7ba937 100644 --- a/lfs/miniupnpd +++ b/lfs/miniupnpd @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = miniupnpd -PAK_VER = 0 +PAK_VER = 1 ############################################################################### # Top-level Rules @@ -76,6 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/miniupnpd-iptcrdr.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/miniupnpd-1.4_use_XT_ALIGN.patch cd $(DIR_APP) && make -f Makefile.linux \ CFLAGS="$(CFLAGS) -DIPTABLES_143 -I/usr/src/linux/include" diff --git a/src/patches/iptables-1.4.12-IMQ-test4.diff b/src/patches/iptables-1.4.12-IMQ-test4.diff new file mode 100644 index 0000000..5ce17e1 --- /dev/null +++ b/src/patches/iptables-1.4.12-IMQ-test4.diff @@ -0,0 +1,141 @@ +diff -Naur iptables-1.4.12.1/extensions/libxt_IMQ.c iptables-1.4.12.1-imq/extensions/libxt_IMQ.c +--- iptables-1.4.12.1/extensions/libxt_IMQ.c 1970-01-01 02:00:00.000000000 +0200 ++++ iptables-1.4.12.1-imq/extensions/libxt_IMQ.c 2011-09-30 13:53:21.000000000 +0300 +@@ -0,0 +1,105 @@ ++/* Shared library add-on to iptables to add IMQ target support. */ ++#include <stdio.h> ++#include <string.h> ++#include <stdlib.h> ++#include <getopt.h> ++ ++#include <xtables.h> ++#include <linux/netfilter/x_tables.h> ++#include <linux/netfilter/xt_IMQ.h> ++ ++/* Function which prints out usage message. */ ++static void IMQ_help(void) ++{ ++ printf( ++"IMQ target options:\n" ++" --todev <N> enqueue to imq<N>, defaults to 0\n"); ++ ++} ++ ++static struct option IMQ_opts[] = { ++ { "todev", 1, 0, '1' }, ++ { 0 } ++}; ++ ++/* Initialize the target. */ ++static void IMQ_init(struct xt_entry_target *t) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)t->data; ++ ++ mr->todev = 0; ++} ++ ++/* Function which parses command options; returns true if it ++ ate an option */ ++static int IMQ_parse(int c, char **argv, int invert, unsigned int *flags, ++ const void *entry, struct xt_entry_target **target) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)(*target)->data; ++ ++ switch(c) { ++ case '1': ++/* if (xtables_check_inverse(optarg, &invert, NULL, 0, argv)) ++ xtables_error(PARAMETER_PROBLEM, ++ "Unexpected `!' after --todev"); ++*/ ++ mr->todev=atoi(optarg); ++ break; ++ ++ default: ++ return 0; ++ } ++ return 1; ++} ++ ++/* Prints out the targinfo. */ ++static void IMQ_print(const void *ip, ++ const struct xt_entry_target *target, ++ int numeric) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)target->data; ++ ++ printf("IMQ: todev %u ", mr->todev); ++} ++ ++/* Saves the union ipt_targinfo in parsable form to stdout. */ ++static void IMQ_save(const void *ip, const struct xt_entry_target *target) ++{ ++ struct xt_imq_info *mr = (struct xt_imq_info*)target->data; ++ ++ printf(" --todev %u", mr->todev); ++} ++ ++static struct xtables_target imq_target = { ++ .name = "IMQ", ++ .version = XTABLES_VERSION, ++ .family = NFPROTO_IPV4, ++ .size = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .help = IMQ_help, ++ .init = IMQ_init, ++ .parse = IMQ_parse, ++ .print = IMQ_print, ++ .save = IMQ_save, ++ .extra_opts = IMQ_opts, ++}; ++ ++static struct xtables_target imq_target6 = { ++ .name = "IMQ", ++ .version = XTABLES_VERSION, ++ .family = NFPROTO_IPV6, ++ .size = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)), ++ .help = IMQ_help, ++ .init = IMQ_init, ++ .parse = IMQ_parse, ++ .print = IMQ_print, ++ .save = IMQ_save, ++ .extra_opts = IMQ_opts, ++}; ++ ++// void __attribute((constructor)) nf_ext_init(void){ ++void _init(void){ ++ xtables_register_target(&imq_target); ++ xtables_register_target(&imq_target6); ++} +diff -Naur iptables-1.4.12.1/extensions/libxt_IMQ.man iptables-1.4.12.1-imq/extensions/libxt_IMQ.man +--- iptables-1.4.12.1/extensions/libxt_IMQ.man 1970-01-01 02:00:00.000000000 +0200 ++++ iptables-1.4.12.1-imq/extensions/libxt_IMQ.man 2011-09-30 13:53:21.000000000 +0300 +@@ -0,0 +1,15 @@ ++This target is used to redirect the traffic to the IMQ driver and you can apply ++QoS rules like HTB or CBQ. ++For example you can select only traffic comming from a specific interface or ++is going out on a specific interface. ++Also it permits to capture the traffic BEFORE NAT in the case of outgoing traffic ++or AFTER NAT in the case of incomming traffic. ++.TP ++\fB\-\-to\-dev\fP \fIvalue\fP ++Set the IMQ interface where to send this traffic ++.TP ++Example: ++.TP ++Redirect incomming traffic from interface eth0 to imq0 and outgoing traffic to imq1: ++iptables \-t mangle \-A FORWARD \-i eth0 \-j IMQ \-\-to\-dev 0 ++iptables \-t mangle \-A FORWARD \-o eth0 \-j IMQ \-\-to\-dev 1 +diff -Naur iptables-1.4.12.1/include/linux/netfilter/xt_IMQ.h iptables-1.4.12.1-imq/include/linux/netfilter/xt_IMQ.h +--- iptables-1.4.12.1/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000 +0200 ++++ iptables-1.4.12.1-imq/include/linux/netfilter/xt_IMQ.h 2011-09-30 13:53:21.000000000 +0300 +@@ -0,0 +1,9 @@ ++#ifndef _XT_IMQ_H ++#define _XT_IMQ_H ++ ++struct xt_imq_info { ++ unsigned int todev; /* target imq device */ ++}; ++ ++#endif /* _XT_IMQ_H */ ++ diff --git a/src/patches/iptables-1.4.14-ipp2p-0.8.2-ipfire.patch b/src/patches/iptables-1.4.14-ipp2p-0.8.2-ipfire.patch new file mode 100644 index 0000000..9a11eb5 --- /dev/null +++ b/src/patches/iptables-1.4.14-ipp2p-0.8.2-ipfire.patch @@ -0,0 +1,481 @@ +diff -Naur iptables-1.4.6.org/extensions/.ipp2p-test iptables-1.4.6/extensions/.ipp2p-test +--- iptables-1.4.6.org/extensions/.ipp2p-test 1970-01-01 01:00:00.000000000 +0100 ++++ iptables-1.4.6/extensions/.ipp2p-test 2010-02-13 20:02:52.000000000 +0100 +@@ -0,0 +1,2 @@ ++#! /bin/sh ++[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_ipp2p.h ] && echo ipp2p +diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extensions/libipt_ipp2p.c +--- iptables-1.4.6.org/extensions/libipt_ipp2p.c 1970-01-01 01:00:00.000000000 +0100 ++++ iptables-1.4.6/extensions/libipt_ipp2p.c 2010-02-13 20:02:52.000000000 +0100 +@@ -0,0 +1,424 @@ ++#include <stdio.h> ++#include <netdb.h> ++#include <string.h> ++#include <stdlib.h> ++#include <getopt.h> ++#include <ctype.h> ++ ++#include <iptables.h> ++ ++#include <linux/netfilter_ipv4/ipt_ipp2p.h> ++ ++#ifndef XTABLES_VERSION ++#define XTABLES_VERSION IPTABLES_VERSION ++#endif ++ ++#ifdef IPT_LIB_DIR ++#define xtables_target iptables_target ++#define xtables_register_target register_target ++#endif ++ ++static void ++help(void) ++{ ++ printf( ++ "IPP2P v%s options:\n" ++ " --ipp2p Grab all known p2p packets\n" ++ " --edk [TCP&UDP] All known eDonkey/eMule/Overnet packets\n" ++ " --dc [TCP] All known Direct Connect packets\n" ++ " --kazaa [TCP&UDP] All known KaZaA packets\n" ++ " --gnu [TCP&UDP] All known Gnutella packets\n" ++ " --bit [TCP&UDP] All known BitTorrent packets\n" ++ " --apple [TCP] All known AppleJuice packets\n" ++ " --winmx [TCP] All known WinMX\n" ++ " --soul [TCP] All known SoulSeek\n" ++ " --ares [TCP] All known Ares\n\n" ++ " EXPERIMENTAL protocols (please send feedback to: ipp2p(a)ipp2p.org) :\n" ++ " --mute [TCP] All known Mute packets\n" ++ " --waste [TCP] All known Waste packets\n" ++ " --xdcc [TCP] All known XDCC packets (only xdcc login)\n\n" ++ " DEBUG SUPPPORT, use only if you know why\n" ++ " --debug Generate kernel debug output, THIS WILL SLOW DOWN THE FILTER\n" ++ "\nNote that the follwing options will have the same meaning:\n" ++ " '--ipp2p' is equal to '--edk --dc --kazaa --gnu --bit --apple --winmx --soul --ares'\n" ++ "\nIPP2P was intended for TCP only. Due to increasing usage of UDP we needed to change this.\n" ++ "You can now use -p udp to search UDP packets only or without -p switch to search UDP and TCP packets.\n" ++ "\nSee README included with this package for more details or visit http://www.ipp2p.org\n" ++ "\nExamples:\n" ++ " iptables -A FORWARD -m ipp2p --ipp2p -j MARK --set-mark 0x01\n" ++ " iptables -A FORWARD -p udp -m ipp2p --kazaa --bit -j DROP\n" ++ " iptables -A FORWARD -p tcp -m ipp2p --edk --soul -j DROP\n\n" ++ , IPP2P_VERSION); ++} ++ ++static struct option opts[] = { ++ { "ipp2p", 0, 0, '1' }, ++ { "edk", 0, 0, '2' }, ++ { "dc", 0, 0, '7' }, ++ { "gnu", 0, 0, '9' }, ++ { "kazaa", 0, 0, 'a' }, ++ { "bit", 0, 0, 'b' }, ++ { "apple", 0, 0, 'c' }, ++ { "soul", 0, 0, 'd' }, ++ { "winmx", 0, 0, 'e' }, ++ { "ares", 0, 0, 'f' }, ++ { "mute", 0, 0, 'g' }, ++ { "waste", 0, 0, 'h' }, ++ { "xdcc", 0, 0, 'i' }, ++ { "debug", 0, 0, 'j' }, ++ {0} ++}; ++ ++ ++static void ++#ifdef _XTABLES_H ++init(struct xt_entry_match *m) ++#else ++init(struct ipt_entry_match *t, unsigned int *nfcache) ++#endif ++{ ++ struct ipt_p2p_info *info = (struct ipt_p2p_info *)m->data; ++ ++#ifndef _XTABLES_H ++ *nfcache |= NFC_UNKNOWN; ++#endif ++ ++ /*init the module with default values*/ ++ info->cmd = 0; ++ info->debug = 0; ++ ++} ++ ++ ++static int ++parse(int c, char **argv, int invert, unsigned int *flags, ++#ifdef _XTABLES_H ++ const void *entry, struct xt_entry_match **match) ++#else ++ const struct ipt_entry *entry, unsigned int *nfcache, struct ipt_entry_match **match) ++#endif ++{ ++ struct ipt_p2p_info *info = (struct ipt_p2p_info *)(*match)->data; ++ ++ switch (c) { ++ case '1': /*cmd: ipp2p*/ ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified once!"); ++ ++/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p-data' may only be " ++ "specified alone!"); ++*/ ++ ++ if ((*flags) != 0) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += SHORT_HAND_IPP2P; ++ info->cmd = *flags; ++ break; ++ ++ case '2': /*cmd: edk*/ ++ if ((*flags & IPP2P_EDK) == IPP2P_EDK) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--edk' may only be " ++ "specified once"); ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p-data' may only be " ++ "specified alone!");*/ ++ if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: use `--edk' OR `--edk-data' but not both of them!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_EDK; ++ info->cmd = *flags; ++ break; ++ ++ ++ case '7': /*cmd: dc*/ ++ if ((*flags & IPP2P_DC) == IPP2P_DC) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--dc' may only be " ++ "specified once!"); ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p-data' may only be " ++ "specified alone!");*/ ++ if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: use `--dc' OR `--dc-data' but not both of them!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_DC; ++ info->cmd = *flags; ++ break; ++ ++ ++ case '9': /*cmd: gnu*/ ++ if ((*flags & IPP2P_GNU) == IPP2P_GNU) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--gnu' may only be " ++ "specified once!"); ++/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p-data' may only be " ++ "specified alone!");*/ ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++ if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: use `--gnu' OR `--gnu-data' but not both of them!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_GNU; ++ info->cmd = *flags; ++ break; ++ ++ case 'a': /*cmd: kazaa*/ ++ if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--kazaa' may only be " ++ "specified once!"); ++/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p-data' may only be " ++ "specified alone!");*/ ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++ if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_KAZAA; ++ info->cmd = *flags; ++ break; ++ ++ case 'b': /*cmd: bit*/ ++ if ((*flags & IPP2P_BIT) == IPP2P_BIT) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--bit' may only be " ++ "specified once!"); ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_BIT; ++ info->cmd = *flags; ++ break; ++ ++ case 'c': /*cmd: apple*/ ++ if ((*flags & IPP2P_APPLE) == IPP2P_APPLE) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--apple' may only be " ++ "specified once!"); ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_APPLE; ++ info->cmd = *flags; ++ break; ++ ++ ++ case 'd': /*cmd: soul*/ ++ if ((*flags & IPP2P_SOUL) == IPP2P_SOUL) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--soul' may only be " ++ "specified once!"); ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_SOUL; ++ info->cmd = *flags; ++ break; ++ ++ ++ case 'e': /*cmd: winmx*/ ++ if ((*flags & IPP2P_WINMX) == IPP2P_WINMX) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--winmx' may only be " ++ "specified once!"); ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_WINMX; ++ info->cmd = *flags; ++ break; ++ ++ case 'f': /*cmd: ares*/ ++ if ((*flags & IPP2P_ARES) == IPP2P_ARES) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ares' may only be " ++ "specified once!"); ++ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ipp2p' may only be " ++ "specified alone!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_ARES; ++ info->cmd = *flags; ++ break; ++ ++ case 'g': /*cmd: mute*/ ++ if ((*flags & IPP2P_MUTE) == IPP2P_MUTE) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--mute' may only be " ++ "specified once!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_MUTE; ++ info->cmd = *flags; ++ break; ++ case 'h': /*cmd: waste*/ ++ if ((*flags & IPP2P_WASTE) == IPP2P_WASTE) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--waste' may only be " ++ "specified once!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_WASTE; ++ info->cmd = *flags; ++ break; ++ case 'i': /*cmd: xdcc*/ ++ if ((*flags & IPP2P_XDCC) == IPP2P_XDCC) ++ xtables_error(PARAMETER_PROBLEM, ++ "ipp2p: `--ares' may only be " ++ "specified once!"); ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ *flags += IPP2P_XDCC; ++ info->cmd = *flags; ++ break; ++ ++ case 'j': /*cmd: debug*/ ++ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); ++ info->debug = 1; ++ break; ++ ++ default: ++// xtables_error(PARAMETER_PROBLEM, ++// "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n"); ++ return 0; ++ } ++ return 1; ++} ++ ++ ++static void ++final_check(unsigned int flags) ++{ ++ if (!flags) ++ xtables_error(PARAMETER_PROBLEM, ++ "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n"); ++} ++ ++static void ++#ifdef _XTABLES_H ++print(const void *ip, ++ const struct xt_entry_match *match, ++#else ++print(const struct ipt_ip *ip, ++ const struct ipt_entry_match *match, ++#endif ++ int numeric) ++{ ++ struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data; ++ ++ printf("ipp2p v%s", IPP2P_VERSION); ++ if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf(" --ipp2p"); ++// if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf(" --ipp2p-data"); ++ if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf(" --kazaa"); ++// if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf(" --kazaa-data"); ++// if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf(" --gnu-data"); ++ if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf(" --gnu"); ++ if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf(" --edk"); ++// if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf(" --edk-data"); ++// if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf(" --dc-data"); ++ if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf(" --dc"); ++ if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf(" --bit"); ++ if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf(" --apple"); ++ if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf(" --soul"); ++ if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf(" --winmx"); ++ if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf(" --ares"); ++ if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute"); ++ if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste"); ++ if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc"); ++ if (info->debug != 0) printf(" --debug"); ++ printf(" "); ++} ++ ++static void ++#ifdef _XTABLES_H ++save(const void *ip, ++ const struct xt_entry_match *match) ++#else ++save(const struct ipt_ip *ip, ++ const struct ipt_entry_match *match) ++#endif ++{ ++ struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data; ++ ++ if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf("--ipp2p "); ++// if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf("--ipp2p-data "); ++ if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf("--kazaa "); ++// if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf("--kazaa-data "); ++// if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf("--gnu-data "); ++ if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf("--gnu "); ++ if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf("--edk "); ++// if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf("--edk-data "); ++// if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf("--dc-data "); ++ if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf("--dc "); ++ if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf("--bit "); ++ if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf("--apple "); ++ if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf("--soul "); ++ if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf("--winmx "); ++ if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf("--ares "); ++ if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute"); ++ if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste"); ++ if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc"); ++ if (info->debug != 0) printf("--debug "); ++} ++ ++ ++static ++struct xtables_match ipp2p= ++{ ++ .next = NULL, ++ .name = "ipp2p", ++ .version = XTABLES_VERSION, ++ .size = XT_ALIGN(sizeof(struct ipt_p2p_info)), ++ .userspacesize = XT_ALIGN(sizeof(struct ipt_p2p_info)), ++ .help = &help, ++ .init = &init, ++ .parse = &parse, ++ .final_check = &final_check, ++ .print = &print, ++ .save = &save, ++ .extra_opts = opts ++}; ++ ++ ++ ++void _init(void) ++{ ++ xtables_register_match(&ipp2p); ++} ++ +diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.man iptables-1.4.6/extensions/libipt_ipp2p.man +--- iptables-1.4.6.org/extensions/libipt_ipp2p.man 1970-01-01 01:00:00.000000000 +0100 ++++ iptables-1.4.6/extensions/libipt_ipp2p.man 2010-02-13 20:02:52.000000000 +0100 +@@ -0,0 +1,43 @@ ++This module matches certain packets in P2P flows. It is not ++designed to match all packets belonging to a P2P connection - ++use IPP2P together with CONNMARK for this purpose. Also visit ++http://www.ipp2p.org for detailed information. ++ ++Use it together with -p tcp or -p udp to search these protocols ++only or without -p switch to search packets of both protocols. ++ ++IPP2P provides the following options: ++.TP ++.B "--edk " ++Matches as many eDonkey/eMule packets as possible. ++.TP ++.B "--kazaa " ++Matches as many KaZaA packets as possible. ++.TP ++.B "--gnu " ++Matches as many Gnutella packets as possible. ++.TP ++.B "--dc " ++Matches as many Direct Connect packets as possible. ++.TP ++.B "--bit " ++Matches BitTorrent packets. ++.TP ++.B "--apple " ++Matches AppleJuice packets. ++.TP ++.B "--soul " ++Matches some SoulSeek packets. Considered as beta, use careful! ++.TP ++.B "--winmx " ++Matches some WinMX packets. Considered as beta, use careful! ++.TP ++.B "--ares " ++Matches Ares and AresLite packets. Use together with -j DROP only. ++.TP ++.B "--ipp2p " ++Short hand for: --edk --kazaa --gnu --dc ++.TP ++.B "--debug " ++Prints some information about each hit into kernel logfile. May ++produce huge logfiles so beware! diff --git a/src/patches/iptables-1.4.6-errorno_includes.patch b/src/patches/iptables-1.4.6-errorno_includes.patch deleted file mode 100644 index a25c5a3..0000000 --- a/src/patches/iptables-1.4.6-errorno_includes.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff -Naur include.org/asm/errno.h include/asm/errno.h ---- include.org/asm/errno.h 2010-02-12 18:21:40.000000000 +0100 -+++ include/asm/errno.h 2010-02-12 18:19:41.000000000 +0100 -@@ -5,4 +5,8 @@ - #include <linux/errno.h> - #endif - -+#ifndef _ASM_GENERIC_ERRNO_H -+ #include <asm-generic/errno.h> -+#endif -+ - #endif -diff -Naur include.org/asm-generic/errno-base.h include/asm-generic/errno-base.h ---- include.org/asm-generic/errno-base.h 1970-01-01 01:00:00.000000000 +0100 -+++ include/asm-generic/errno-base.h 2010-02-09 13:57:19.000000000 +0100 -@@ -0,0 +1,39 @@ -+#ifndef _ASM_GENERIC_ERRNO_BASE_H -+#define _ASM_GENERIC_ERRNO_BASE_H -+ -+#define EPERM 1 /* Operation not permitted */ -+#define ENOENT 2 /* No such file or directory */ -+#define ESRCH 3 /* No such process */ -+#define EINTR 4 /* Interrupted system call */ -+#define EIO 5 /* I/O error */ -+#define ENXIO 6 /* No such device or address */ -+#define E2BIG 7 /* Argument list too long */ -+#define ENOEXEC 8 /* Exec format error */ -+#define EBADF 9 /* Bad file number */ -+#define ECHILD 10 /* No child processes */ -+#define EAGAIN 11 /* Try again */ -+#define ENOMEM 12 /* Out of memory */ -+#define EACCES 13 /* Permission denied */ -+#define EFAULT 14 /* Bad address */ -+#define ENOTBLK 15 /* Block device required */ -+#define EBUSY 16 /* Device or resource busy */ -+#define EEXIST 17 /* File exists */ -+#define EXDEV 18 /* Cross-device link */ -+#define ENODEV 19 /* No such device */ -+#define ENOTDIR 20 /* Not a directory */ -+#define EISDIR 21 /* Is a directory */ -+#define EINVAL 22 /* Invalid argument */ -+#define ENFILE 23 /* File table overflow */ -+#define EMFILE 24 /* Too many open files */ -+#define ENOTTY 25 /* Not a typewriter */ -+#define ETXTBSY 26 /* Text file busy */ -+#define EFBIG 27 /* File too large */ -+#define ENOSPC 28 /* No space left on device */ -+#define ESPIPE 29 /* Illegal seek */ -+#define EROFS 30 /* Read-only file system */ -+#define EMLINK 31 /* Too many links */ -+#define EPIPE 32 /* Broken pipe */ -+#define EDOM 33 /* Math argument out of domain of func */ -+#define ERANGE 34 /* Math result not representable */ -+ -+#endif -diff -Naur include.org/asm-generic/errno.h include/asm-generic/errno.h ---- include.org/asm-generic/errno.h 1970-01-01 01:00:00.000000000 +0100 -+++ include/asm-generic/errno.h 2010-02-09 13:57:19.000000000 +0100 -@@ -0,0 +1,111 @@ -+#ifndef _ASM_GENERIC_ERRNO_H -+#define _ASM_GENERIC_ERRNO_H -+ -+#include <asm-generic/errno-base.h> -+ -+#define EDEADLK 35 /* Resource deadlock would occur */ -+#define ENAMETOOLONG 36 /* File name too long */ -+#define ENOLCK 37 /* No record locks available */ -+#define ENOSYS 38 /* Function not implemented */ -+#define ENOTEMPTY 39 /* Directory not empty */ -+#define ELOOP 40 /* Too many symbolic links encountered */ -+#define EWOULDBLOCK EAGAIN /* Operation would block */ -+#define ENOMSG 42 /* No message of desired type */ -+#define EIDRM 43 /* Identifier removed */ -+#define ECHRNG 44 /* Channel number out of range */ -+#define EL2NSYNC 45 /* Level 2 not synchronized */ -+#define EL3HLT 46 /* Level 3 halted */ -+#define EL3RST 47 /* Level 3 reset */ -+#define ELNRNG 48 /* Link number out of range */ -+#define EUNATCH 49 /* Protocol driver not attached */ -+#define ENOCSI 50 /* No CSI structure available */ -+#define EL2HLT 51 /* Level 2 halted */ -+#define EBADE 52 /* Invalid exchange */ -+#define EBADR 53 /* Invalid request descriptor */ -+#define EXFULL 54 /* Exchange full */ -+#define ENOANO 55 /* No anode */ -+#define EBADRQC 56 /* Invalid request code */ -+#define EBADSLT 57 /* Invalid slot */ -+ -+#define EDEADLOCK EDEADLK -+ -+#define EBFONT 59 /* Bad font file format */ -+#define ENOSTR 60 /* Device not a stream */ -+#define ENODATA 61 /* No data available */ -+#define ETIME 62 /* Timer expired */ -+#define ENOSR 63 /* Out of streams resources */ -+#define ENONET 64 /* Machine is not on the network */ -+#define ENOPKG 65 /* Package not installed */ -+#define EREMOTE 66 /* Object is remote */ -+#define ENOLINK 67 /* Link has been severed */ -+#define EADV 68 /* Advertise error */ -+#define ESRMNT 69 /* Srmount error */ -+#define ECOMM 70 /* Communication error on send */ -+#define EPROTO 71 /* Protocol error */ -+#define EMULTIHOP 72 /* Multihop attempted */ -+#define EDOTDOT 73 /* RFS specific error */ -+#define EBADMSG 74 /* Not a data message */ -+#define EOVERFLOW 75 /* Value too large for defined data type */ -+#define ENOTUNIQ 76 /* Name not unique on network */ -+#define EBADFD 77 /* File descriptor in bad state */ -+#define EREMCHG 78 /* Remote address changed */ -+#define ELIBACC 79 /* Can not access a needed shared library */ -+#define ELIBBAD 80 /* Accessing a corrupted shared library */ -+#define ELIBSCN 81 /* .lib section in a.out corrupted */ -+#define ELIBMAX 82 /* Attempting to link in too many shared libraries */ -+#define ELIBEXEC 83 /* Cannot exec a shared library directly */ -+#define EILSEQ 84 /* Illegal byte sequence */ -+#define ERESTART 85 /* Interrupted system call should be restarted */ -+#define ESTRPIPE 86 /* Streams pipe error */ -+#define EUSERS 87 /* Too many users */ -+#define ENOTSOCK 88 /* Socket operation on non-socket */ -+#define EDESTADDRREQ 89 /* Destination address required */ -+#define EMSGSIZE 90 /* Message too long */ -+#define EPROTOTYPE 91 /* Protocol wrong type for socket */ -+#define ENOPROTOOPT 92 /* Protocol not available */ -+#define EPROTONOSUPPORT 93 /* Protocol not supported */ -+#define ESOCKTNOSUPPORT 94 /* Socket type not supported */ -+#define EOPNOTSUPP 95 /* Operation not supported on transport endpoint */ -+#define EPFNOSUPPORT 96 /* Protocol family not supported */ -+#define EAFNOSUPPORT 97 /* Address family not supported by protocol */ -+#define EADDRINUSE 98 /* Address already in use */ -+#define EADDRNOTAVAIL 99 /* Cannot assign requested address */ -+#define ENETDOWN 100 /* Network is down */ -+#define ENETUNREACH 101 /* Network is unreachable */ -+#define ENETRESET 102 /* Network dropped connection because of reset */ -+#define ECONNABORTED 103 /* Software caused connection abort */ -+#define ECONNRESET 104 /* Connection reset by peer */ -+#define ENOBUFS 105 /* No buffer space available */ -+#define EISCONN 106 /* Transport endpoint is already connected */ -+#define ENOTCONN 107 /* Transport endpoint is not connected */ -+#define ESHUTDOWN 108 /* Cannot send after transport endpoint shutdown */ -+#define ETOOMANYREFS 109 /* Too many references: cannot splice */ -+#define ETIMEDOUT 110 /* Connection timed out */ -+#define ECONNREFUSED 111 /* Connection refused */ -+#define EHOSTDOWN 112 /* Host is down */ -+#define EHOSTUNREACH 113 /* No route to host */ -+#define EALREADY 114 /* Operation already in progress */ -+#define EINPROGRESS 115 /* Operation now in progress */ -+#define ESTALE 116 /* Stale NFS file handle */ -+#define EUCLEAN 117 /* Structure needs cleaning */ -+#define ENOTNAM 118 /* Not a XENIX named type file */ -+#define ENAVAIL 119 /* No XENIX semaphores available */ -+#define EISNAM 120 /* Is a named type file */ -+#define EREMOTEIO 121 /* Remote I/O error */ -+#define EDQUOT 122 /* Quota exceeded */ -+ -+#define ENOMEDIUM 123 /* No medium found */ -+#define EMEDIUMTYPE 124 /* Wrong medium type */ -+#define ECANCELED 125 /* Operation Canceled */ -+#define ENOKEY 126 /* Required key not available */ -+#define EKEYEXPIRED 127 /* Key has expired */ -+#define EKEYREVOKED 128 /* Key has been revoked */ -+#define EKEYREJECTED 129 /* Key was rejected by service */ -+ -+/* for robust mutexes */ -+#define EOWNERDEAD 130 /* Owner died */ -+#define ENOTRECOVERABLE 131 /* State not recoverable */ -+ -+#define ERFKILL 132 /* Operation not possible due to RF-kill */ -+ -+#endif diff --git a/src/patches/iptables-1.4.6-imq_test1.patch b/src/patches/iptables-1.4.6-imq_test1.patch deleted file mode 100644 index 2b4fb79..0000000 --- a/src/patches/iptables-1.4.6-imq_test1.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -Naurw iptables-1.4.1/extensions/.IMQ-testx iptables-1.4.1.imq/extensions/.IMQ-testx ---- iptables-1.4.1/extensions/.IMQ-testx 1969-12-31 21:00:00.000000000 -0300 -+++ iptables-1.4.1.imq/extensions/.IMQ-testx 2008-06-24 22:20:06.000000000 -0300 -@@ -0,0 +1,3 @@ -+#!/bin/sh -+# True if IMQ target patch is applied. -+[ -f $KERNEL_DIR/include/linux/netfilter/xt_IMQ.h ] && echo IMQ -diff -Naurw iptables-1.4.1/extensions/libxt_IMQ.c iptables-1.4.1.imq/extensions/libxt_IMQ.c ---- iptables-1.4.1/extensions/libxt_IMQ.c 1969-12-31 21:00:00.000000000 -0300 -+++ iptables-1.4.1.imq/extensions/libxt_IMQ.c 2008-06-24 22:31:02.000000000 -0300 -@@ -0,0 +1,103 @@ -+/* Shared library add-on to iptables to add IMQ target support. */ -+#include <stdio.h> -+#include <string.h> -+#include <stdlib.h> -+#include <getopt.h> -+ -+#include <xtables.h> -+#include <linux/netfilter/x_tables.h> -+#include <linux/netfilter/xt_IMQ.h> -+ -+/* Function which prints out usage message. */ -+static void IMQ_help(void) -+{ -+ printf( -+"IMQ target options:\n" -+" --todev <N> enqueue to imq<N>, defaults to 0\n"); -+ -+} -+ -+static struct option IMQ_opts[] = { -+ { "todev", 1, 0, '1' }, -+ { 0 } -+}; -+ -+/* Initialize the target. */ -+static void IMQ_init(struct xt_entry_target *t) -+{ -+ struct xt_imq_info *mr = (struct xt_imq_info*)t->data; -+ -+ mr->todev = 0; -+} -+ -+/* Function which parses command options; returns true if it -+ ate an option */ -+static int IMQ_parse(int c, char **argv, int invert, unsigned int *flags, -+ const void *entry, struct xt_entry_target **target) -+{ -+ struct xt_imq_info *mr = (struct xt_imq_info*)(*target)->data; -+ -+ switch(c) { -+ case '1': -+ if (xtables_check_inverse(optarg, &invert, NULL, 0, argv)) -+ xtables_error(PARAMETER_PROBLEM, -+ "Unexpected `!' for --todev"); -+ mr->todev=atoi(optarg); -+ break; -+ default: -+ return 0; -+ } -+ return 1; -+} -+ -+/* Prints out the targinfo. */ -+static void IMQ_print(const void *ip, -+ const struct xt_entry_target *target, -+ int numeric) -+{ -+ struct xt_imq_info *mr = (struct xt_imq_info*)target->data; -+ -+ printf("IMQ: todev %u ", mr->todev); -+} -+ -+/* Saves the union ipt_targinfo in parsable form to stdout. */ -+static void IMQ_save(const void *ip, const struct xt_entry_target *target) -+{ -+ struct xt_imq_info *mr = (struct xt_imq_info*)target->data; -+ -+ printf("--todev %u", mr->todev); -+} -+ -+static struct xtables_target imq_target = { -+ .name = "IMQ", -+ .version = XTABLES_VERSION, -+ .family = NFPROTO_IPV4, -+ .size = XT_ALIGN(sizeof(struct xt_imq_info)), -+ .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)), -+ .help = IMQ_help, -+ .init = IMQ_init, -+ .parse = IMQ_parse, -+ .print = IMQ_print, -+ .save = IMQ_save, -+ .extra_opts = IMQ_opts, -+}; -+ -+static struct xtables_target imq_target6 = { -+ .name = "IMQ", -+ .version = XTABLES_VERSION, -+ .family = NFPROTO_IPV6, -+ .size = XT_ALIGN(sizeof(struct xt_imq_info)), -+ .userspacesize = XT_ALIGN(sizeof(struct xt_imq_info)), -+ .help = IMQ_help, -+ .init = IMQ_init, -+ .parse = IMQ_parse, -+ .print = IMQ_print, -+ .save = IMQ_save, -+ .extra_opts = IMQ_opts, -+}; -+ -+// void __attribute((constructor)) nf_ext_init(void){ -+void _init(void){ -+ xtables_register_target(&imq_target); -+ xtables_register_target(&imq_target6); -+} ---- iptables-1.4.1.1/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000 +0200 -+++ iptables-1.4.1.1.new/include/linux/netfilter/xt_IMQ.h 2008-08-05 00:41:28.000000000 +0300 -@@ -0,0 +1,9 @@ -+#ifndef _XT_IMQ_H -+#define _XT_IMQ_H -+ -+struct xt_imq_info { -+ unsigned int todev; /* target imq device */ -+}; -+ -+#endif /* _XT_IMQ_H */ -+ diff --git a/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch b/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch deleted file mode 100644 index 68e44b1..0000000 --- a/src/patches/iptables-1.4.6-ipp2p-0.8.2-pomng.patch +++ /dev/null @@ -1,481 +0,0 @@ -diff -Naur iptables-1.4.6.org/extensions/.ipp2p-test iptables-1.4.6/extensions/.ipp2p-test ---- iptables-1.4.6.org/extensions/.ipp2p-test 1970-01-01 01:00:00.000000000 +0100 -+++ iptables-1.4.6/extensions/.ipp2p-test 2010-02-13 20:02:52.000000000 +0100 -@@ -0,0 +1,2 @@ -+#! /bin/sh -+[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_ipp2p.h ] && echo ipp2p -diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.c iptables-1.4.6/extensions/libipt_ipp2p.c ---- iptables-1.4.6.org/extensions/libipt_ipp2p.c 1970-01-01 01:00:00.000000000 +0100 -+++ iptables-1.4.6/extensions/libipt_ipp2p.c 2010-02-13 20:02:52.000000000 +0100 -@@ -0,0 +1,424 @@ -+#include <stdio.h> -+#include <netdb.h> -+#include <string.h> -+#include <stdlib.h> -+#include <getopt.h> -+#include <ctype.h> -+ -+#include <iptables.h> -+ -+#include <linux/netfilter_ipv4/ipt_ipp2p.h> -+ -+#ifndef XTABLES_VERSION -+#define XTABLES_VERSION IPTABLES_VERSION -+#endif -+ -+#ifdef IPT_LIB_DIR -+#define xtables_target iptables_target -+#define xtables_register_target register_target -+#endif -+ -+static void -+help(void) -+{ -+ printf( -+ "IPP2P v%s options:\n" -+ " --ipp2p Grab all known p2p packets\n" -+ " --edk [TCP&UDP] All known eDonkey/eMule/Overnet packets\n" -+ " --dc [TCP] All known Direct Connect packets\n" -+ " --kazaa [TCP&UDP] All known KaZaA packets\n" -+ " --gnu [TCP&UDP] All known Gnutella packets\n" -+ " --bit [TCP&UDP] All known BitTorrent packets\n" -+ " --apple [TCP] All known AppleJuice packets\n" -+ " --winmx [TCP] All known WinMX\n" -+ " --soul [TCP] All known SoulSeek\n" -+ " --ares [TCP] All known Ares\n\n" -+ " EXPERIMENTAL protocols (please send feedback to: ipp2p(a)ipp2p.org) :\n" -+ " --mute [TCP] All known Mute packets\n" -+ " --waste [TCP] All known Waste packets\n" -+ " --xdcc [TCP] All known XDCC packets (only xdcc login)\n\n" -+ " DEBUG SUPPPORT, use only if you know why\n" -+ " --debug Generate kernel debug output, THIS WILL SLOW DOWN THE FILTER\n" -+ "\nNote that the follwing options will have the same meaning:\n" -+ " '--ipp2p' is equal to '--edk --dc --kazaa --gnu --bit --apple --winmx --soul --ares'\n" -+ "\nIPP2P was intended for TCP only. Due to increasing usage of UDP we needed to change this.\n" -+ "You can now use -p udp to search UDP packets only or without -p switch to search UDP and TCP packets.\n" -+ "\nSee README included with this package for more details or visit http://www.ipp2p.org\n" -+ "\nExamples:\n" -+ " iptables -A FORWARD -m ipp2p --ipp2p -j MARK --set-mark 0x01\n" -+ " iptables -A FORWARD -p udp -m ipp2p --kazaa --bit -j DROP\n" -+ " iptables -A FORWARD -p tcp -m ipp2p --edk --soul -j DROP\n\n" -+ , IPP2P_VERSION); -+} -+ -+static struct option opts[] = { -+ { "ipp2p", 0, 0, '1' }, -+ { "edk", 0, 0, '2' }, -+ { "dc", 0, 0, '7' }, -+ { "gnu", 0, 0, '9' }, -+ { "kazaa", 0, 0, 'a' }, -+ { "bit", 0, 0, 'b' }, -+ { "apple", 0, 0, 'c' }, -+ { "soul", 0, 0, 'd' }, -+ { "winmx", 0, 0, 'e' }, -+ { "ares", 0, 0, 'f' }, -+ { "mute", 0, 0, 'g' }, -+ { "waste", 0, 0, 'h' }, -+ { "xdcc", 0, 0, 'i' }, -+ { "debug", 0, 0, 'j' }, -+ {0} -+}; -+ -+ -+static void -+#ifdef _XTABLES_H -+init(struct xt_entry_match *m) -+#else -+init(struct ipt_entry_match *t, unsigned int *nfcache) -+#endif -+{ -+ struct ipt_p2p_info *info = (struct ipt_p2p_info *)m->data; -+ -+#ifndef _XTABLES_H -+ *nfcache |= NFC_UNKNOWN; -+#endif -+ -+ /*init the module with default values*/ -+ info->cmd = 0; -+ info->debug = 0; -+ -+} -+ -+ -+static int -+parse(int c, char **argv, int invert, unsigned int *flags, -+#ifdef _XTABLES_H -+ const void *entry, struct xt_entry_match **match) -+#else -+ const struct ipt_entry *entry, unsigned int *nfcache, struct ipt_entry_match **match) -+#endif -+{ -+ struct ipt_p2p_info *info = (struct ipt_p2p_info *)(*match)->data; -+ -+ switch (c) { -+ case '1': /*cmd: ipp2p*/ -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified once!"); -+ -+/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p-data' may only be " -+ "specified alone!"); -+*/ -+ -+ if ((*flags) != 0) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += SHORT_HAND_IPP2P; -+ info->cmd = *flags; -+ break; -+ -+ case '2': /*cmd: edk*/ -+ if ((*flags & IPP2P_EDK) == IPP2P_EDK) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--edk' may only be " -+ "specified once"); -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p-data' may only be " -+ "specified alone!");*/ -+ if ((*flags & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: use `--edk' OR `--edk-data' but not both of them!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_EDK; -+ info->cmd = *flags; -+ break; -+ -+ -+ case '7': /*cmd: dc*/ -+ if ((*flags & IPP2P_DC) == IPP2P_DC) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--dc' may only be " -+ "specified once!"); -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p-data' may only be " -+ "specified alone!");*/ -+ if ((*flags & IPP2P_DATA_DC) == IPP2P_DATA_DC) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: use `--dc' OR `--dc-data' but not both of them!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_DC; -+ info->cmd = *flags; -+ break; -+ -+ -+ case '9': /*cmd: gnu*/ -+ if ((*flags & IPP2P_GNU) == IPP2P_GNU) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--gnu' may only be " -+ "specified once!"); -+/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p-data' may only be " -+ "specified alone!");*/ -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+ if ((*flags & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: use `--gnu' OR `--gnu-data' but not both of them!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_GNU; -+ info->cmd = *flags; -+ break; -+ -+ case 'a': /*cmd: kazaa*/ -+ if ((*flags & IPP2P_KAZAA) == IPP2P_KAZAA) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--kazaa' may only be " -+ "specified once!"); -+/* if ((*flags & SHORT_HAND_DATA) == SHORT_HAND_DATA) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p-data' may only be " -+ "specified alone!");*/ -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+ if ((*flags & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: use `--kazaa' OR `--kazaa-data' but not both of them!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_KAZAA; -+ info->cmd = *flags; -+ break; -+ -+ case 'b': /*cmd: bit*/ -+ if ((*flags & IPP2P_BIT) == IPP2P_BIT) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--bit' may only be " -+ "specified once!"); -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_BIT; -+ info->cmd = *flags; -+ break; -+ -+ case 'c': /*cmd: apple*/ -+ if ((*flags & IPP2P_APPLE) == IPP2P_APPLE) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--apple' may only be " -+ "specified once!"); -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_APPLE; -+ info->cmd = *flags; -+ break; -+ -+ -+ case 'd': /*cmd: soul*/ -+ if ((*flags & IPP2P_SOUL) == IPP2P_SOUL) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--soul' may only be " -+ "specified once!"); -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_SOUL; -+ info->cmd = *flags; -+ break; -+ -+ -+ case 'e': /*cmd: winmx*/ -+ if ((*flags & IPP2P_WINMX) == IPP2P_WINMX) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--winmx' may only be " -+ "specified once!"); -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_WINMX; -+ info->cmd = *flags; -+ break; -+ -+ case 'f': /*cmd: ares*/ -+ if ((*flags & IPP2P_ARES) == IPP2P_ARES) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ares' may only be " -+ "specified once!"); -+ if ((*flags & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ipp2p' may only be " -+ "specified alone!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_ARES; -+ info->cmd = *flags; -+ break; -+ -+ case 'g': /*cmd: mute*/ -+ if ((*flags & IPP2P_MUTE) == IPP2P_MUTE) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--mute' may only be " -+ "specified once!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_MUTE; -+ info->cmd = *flags; -+ break; -+ case 'h': /*cmd: waste*/ -+ if ((*flags & IPP2P_WASTE) == IPP2P_WASTE) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--waste' may only be " -+ "specified once!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_WASTE; -+ info->cmd = *flags; -+ break; -+ case 'i': /*cmd: xdcc*/ -+ if ((*flags & IPP2P_XDCC) == IPP2P_XDCC) -+ xtables_error(PARAMETER_PROBLEM, -+ "ipp2p: `--ares' may only be " -+ "specified once!"); -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ *flags += IPP2P_XDCC; -+ info->cmd = *flags; -+ break; -+ -+ case 'j': /*cmd: debug*/ -+ if (invert) xtables_error(PARAMETER_PROBLEM, "ipp2p: invert [!] is not allowed!"); -+ info->debug = 1; -+ break; -+ -+ default: -+// xtables_error(PARAMETER_PROBLEM, -+// "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n"); -+ return 0; -+ } -+ return 1; -+} -+ -+ -+static void -+final_check(unsigned int flags) -+{ -+ if (!flags) -+ xtables_error(PARAMETER_PROBLEM, -+ "\nipp2p-parameter problem: for ipp2p usage type: iptables -m ipp2p --help\n"); -+} -+ -+static void -+#ifdef _XTABLES_H -+print(const void *ip, -+ const struct xt_entry_match *match, -+#else -+print(const struct ipt_ip *ip, -+ const struct ipt_entry_match *match, -+#endif -+ int numeric) -+{ -+ struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data; -+ -+ printf("ipp2p v%s", IPP2P_VERSION); -+ if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf(" --ipp2p"); -+// if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf(" --ipp2p-data"); -+ if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf(" --kazaa"); -+// if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf(" --kazaa-data"); -+// if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf(" --gnu-data"); -+ if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf(" --gnu"); -+ if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf(" --edk"); -+// if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf(" --edk-data"); -+// if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf(" --dc-data"); -+ if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf(" --dc"); -+ if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf(" --bit"); -+ if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf(" --apple"); -+ if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf(" --soul"); -+ if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf(" --winmx"); -+ if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf(" --ares"); -+ if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute"); -+ if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste"); -+ if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc"); -+ if (info->debug != 0) printf(" --debug"); -+ printf(" "); -+} -+ -+static void -+#ifdef _XTABLES_H -+save(const void *ip, -+ const struct xt_entry_match *match) -+#else -+save(const struct ipt_ip *ip, -+ const struct ipt_entry_match *match) -+#endif -+{ -+ struct ipt_p2p_info *info = (struct ipt_p2p_info *)match->data; -+ -+ if ((info->cmd & SHORT_HAND_IPP2P) == SHORT_HAND_IPP2P) printf("--ipp2p "); -+// if ((info->cmd & SHORT_HAND_DATA) == SHORT_HAND_DATA) printf("--ipp2p-data "); -+ if ((info->cmd & IPP2P_KAZAA) == IPP2P_KAZAA) printf("--kazaa "); -+// if ((info->cmd & IPP2P_DATA_KAZAA) == IPP2P_DATA_KAZAA) printf("--kazaa-data "); -+// if ((info->cmd & IPP2P_DATA_GNU) == IPP2P_DATA_GNU) printf("--gnu-data "); -+ if ((info->cmd & IPP2P_GNU) == IPP2P_GNU) printf("--gnu "); -+ if ((info->cmd & IPP2P_EDK) == IPP2P_EDK) printf("--edk "); -+// if ((info->cmd & IPP2P_DATA_EDK) == IPP2P_DATA_EDK) printf("--edk-data "); -+// if ((info->cmd & IPP2P_DATA_DC) == IPP2P_DATA_DC) printf("--dc-data "); -+ if ((info->cmd & IPP2P_DC) == IPP2P_DC) printf("--dc "); -+ if ((info->cmd & IPP2P_BIT) == IPP2P_BIT) printf("--bit "); -+ if ((info->cmd & IPP2P_APPLE) == IPP2P_APPLE) printf("--apple "); -+ if ((info->cmd & IPP2P_SOUL) == IPP2P_SOUL) printf("--soul "); -+ if ((info->cmd & IPP2P_WINMX) == IPP2P_WINMX) printf("--winmx "); -+ if ((info->cmd & IPP2P_ARES) == IPP2P_ARES) printf("--ares "); -+ if ((info->cmd & IPP2P_MUTE) == IPP2P_MUTE) printf(" --mute"); -+ if ((info->cmd & IPP2P_WASTE) == IPP2P_WASTE) printf(" --waste"); -+ if ((info->cmd & IPP2P_XDCC) == IPP2P_XDCC) printf(" --xdcc"); -+ if (info->debug != 0) printf("--debug "); -+} -+ -+ -+static -+struct xtables_match ipp2p= -+{ -+ .next = NULL, -+ .name = "ipp2p", -+ .version = XTABLES_VERSION, -+ .size = IPT_ALIGN(sizeof(struct ipt_p2p_info)), -+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_p2p_info)), -+ .help = &help, -+ .init = &init, -+ .parse = &parse, -+ .final_check = &final_check, -+ .print = &print, -+ .save = &save, -+ .extra_opts = opts -+}; -+ -+ -+ -+void _init(void) -+{ -+ xtables_register_match(&ipp2p); -+} -+ -diff -Naur iptables-1.4.6.org/extensions/libipt_ipp2p.man iptables-1.4.6/extensions/libipt_ipp2p.man ---- iptables-1.4.6.org/extensions/libipt_ipp2p.man 1970-01-01 01:00:00.000000000 +0100 -+++ iptables-1.4.6/extensions/libipt_ipp2p.man 2010-02-13 20:02:52.000000000 +0100 -@@ -0,0 +1,43 @@ -+This module matches certain packets in P2P flows. It is not -+designed to match all packets belonging to a P2P connection - -+use IPP2P together with CONNMARK for this purpose. Also visit -+http://www.ipp2p.org for detailed information. -+ -+Use it together with -p tcp or -p udp to search these protocols -+only or without -p switch to search packets of both protocols. -+ -+IPP2P provides the following options: -+.TP -+.B "--edk " -+Matches as many eDonkey/eMule packets as possible. -+.TP -+.B "--kazaa " -+Matches as many KaZaA packets as possible. -+.TP -+.B "--gnu " -+Matches as many Gnutella packets as possible. -+.TP -+.B "--dc " -+Matches as many Direct Connect packets as possible. -+.TP -+.B "--bit " -+Matches BitTorrent packets. -+.TP -+.B "--apple " -+Matches AppleJuice packets. -+.TP -+.B "--soul " -+Matches some SoulSeek packets. Considered as beta, use careful! -+.TP -+.B "--winmx " -+Matches some WinMX packets. Considered as beta, use careful! -+.TP -+.B "--ares " -+Matches Ares and AresLite packets. Use together with -j DROP only. -+.TP -+.B "--ipp2p " -+Short hand for: --edk --kazaa --gnu --dc -+.TP -+.B "--debug " -+Prints some information about each hit into kernel logfile. May -+produce huge logfiles so beware! diff --git a/src/patches/miniupnpd-1.4_use_XT_ALIGN.patch b/src/patches/miniupnpd-1.4_use_XT_ALIGN.patch new file mode 100644 index 0000000..8c33222 --- /dev/null +++ b/src/patches/miniupnpd-1.4_use_XT_ALIGN.patch @@ -0,0 +1,47 @@ +diff -Naur miniupnpd-1.4.org/netfilter/iptcrdr.c miniupnpd-1.4/netfilter/iptcrdr.c +--- miniupnpd-1.4.org/netfilter/iptcrdr.c 2009-10-10 21:19:41.000000000 +0200 ++++ miniupnpd-1.4/netfilter/iptcrdr.c 2012-07-29 16:09:42.640363971 +0200 +@@ -443,8 +443,8 @@ + struct ipt_entry_match *match; + struct ipt_tcp * tcpinfo; + size_t size; +- size = IPT_ALIGN(sizeof(struct ipt_entry_match)) +- + IPT_ALIGN(sizeof(struct ipt_tcp)); ++ size = XT_ALIGN(sizeof(struct ipt_entry_match)) ++ + XT_ALIGN(sizeof(struct ipt_tcp)); + match = calloc(1, size); + match->u.match_size = size; + strncpy(match->u.user.name, "tcp", IPT_FUNCTION_MAXNAMELEN); +@@ -462,8 +462,8 @@ + struct ipt_entry_match *match; + struct ipt_udp * udpinfo; + size_t size; +- size = IPT_ALIGN(sizeof(struct ipt_entry_match)) +- + IPT_ALIGN(sizeof(struct ipt_udp)); ++ size = XT_ALIGN(sizeof(struct ipt_entry_match)) ++ + XT_ALIGN(sizeof(struct ipt_udp)); + match = calloc(1, size); + match->u.match_size = size; + strncpy(match->u.user.name, "udp", IPT_FUNCTION_MAXNAMELEN); +@@ -483,8 +483,8 @@ + struct ip_nat_range * range; + size_t size; + +- size = IPT_ALIGN(sizeof(struct ipt_entry_target)) +- + IPT_ALIGN(sizeof(struct ip_nat_multi_range)); ++ size = XT_ALIGN(sizeof(struct ipt_entry_target)) ++ + XT_ALIGN(sizeof(struct ip_nat_multi_range)); + target = calloc(1, size); + target->u.target_size = size; + strncpy(target->u.user.name, "DNAT", IPT_FUNCTION_MAXNAMELEN); +@@ -614,8 +614,8 @@ + { + struct ipt_entry_target * target = NULL; + size_t size; +- size = IPT_ALIGN(sizeof(struct ipt_entry_target)) +- + IPT_ALIGN(sizeof(int)); ++ size = XT_ALIGN(sizeof(struct ipt_entry_target)) ++ + XT_ALIGN(sizeof(int)); + target = calloc(1, size); + target->u.user.target_size = size; + strncpy(target->u.user.name, "ACCEPT", IPT_FUNCTION_MAXNAMELEN); hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 74af03130fc87ecb5a25b23d39ff03c2f2c971a7
by git＠ipfire.org 29 Jul '12

29 Jul '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, updated. 50b5d7ce0bc813a35d3daaba150a87c1ae990faa
by git＠ipfire.org 28 Jul '12

28 Jul '12

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, kernel-update has been updated via 50b5d7ce0bc813a35d3daaba150a87c1ae990faa (commit) via 9776dede5dfed3803272ccbe627f862481cbdcd2 (commit) via 3d08d9377d220d4be9238270599fab53f8d66d1b (commit) via bec9089df8be9090e82ad5442176f6b7b4c6897b (commit) via 8a21b99afe9587ab043fcc8ee6b7a28c7d435a55 (commit) via a81cf4fee51002221b269d2b5d90d7632052e9d9 (commit) via 162fe203c5be7f6c5d541b7d5c7d675b67f0749b (commit) via 33a2c62fb34958200189b40a2f4b8f6b94907702 (commit) via e41b341fafa73cc7126e7e7ac0847a301e255d66 (commit) via 75556d531bccbd916f6f05064ae499b285f23034 (commit) via 00b73e3b0fea55577ee03a04935dd12467cdfd2b (commit) via 4dca0bd05db7369de01cbf28ade0a1f1e940798a (commit) via 86d3ada4c67a095d12b897be84bd93a053c8b15f (commit) via 7c8031e54e0be4e2575c73d01da725849b62efc1 (commit) via ee717901edaf6e7496cdd649e29c0b5b06cf67b4 (commit) from 141c7c95753e00366d0e993d879db1cdc5dc870d (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 50b5d7ce0bc813a35d3daaba150a87c1ae990faa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 28 13:02:59 2012 +0200 usb-stick: fix path of mbr-install. commit 9776dede5dfed3803272ccbe627f862481cbdcd2 Merge: 141c7c9 3d08d93 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 27 17:34:45 2012 +0200 Merge remote-tracking branch 'ms/thirteen' into kernel-update commit 3d08d9377d220d4be9238270599fab53f8d66d1b Author: Jan Lentfer <jan.lentfer(a)ipfire.org> Date: Sat Jun 16 12:31:18 2012 +0200 asterisk: Update to 1.8.13.0. The 1.4 branch of asterisk does not build with the new flex and bison. Also, the 1.4 branch was EOL'ed April 2012. The 1.8 branch has long term support until 2015. This patch also update chan_capi to the most recent version (HEAD), as this is the only one that compiles with asterisk 1.8. Asterisk 1.8 ships addons as part of the main tarball. Asterisk 1.8 has no build in mp3 support anymore, mp3 libs need to be downloaded seperatly via svn (see asterisk-1.8.13.0/contrib/scripts/get_mp3_source.sh). This patch DOES NOT include mp3 support. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bec9089df8be9090e82ad5442176f6b7b4c6897b Author: Jan Lentfer <jan.lentfer(a)ipfire.org> Date: Sat Jun 16 12:27:04 2012 +0200 lcr: Update to 1.10. This is a prerequisite for updating asterisk. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8a21b99afe9587ab043fcc8ee6b7a28c7d435a55 Author: Jan Lentfer <jan.lentfer(a)ipfire.org> Date: Sat Jun 16 12:24:32 2012 +0200 pam: Update 0.99.10.0. The prior verion in base system did not build with the new version of bison and flex. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a81cf4fee51002221b269d2b5d90d7632052e9d9 Author: Jan Lentfer <jan.lentfer(a)ipfire.org> Date: Sat Jun 16 12:22:31 2012 +0200 flex: Update to 2.5.35. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 162fe203c5be7f6c5d541b7d5c7d675b67f0749b Author: Jan Lentfer <jan.lentfer(a)ipfire.org> Date: Sat Jun 16 12:21:12 2012 +0200 m4: Update to 1.4.16. This is a prerequisite for updating bison and flex Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 33a2c62fb34958200189b40a2f4b8f6b94907702 Author: Jan Lentfer <jan.lentfer(a)ipfire.org> Date: Sat Jun 16 12:17:57 2012 +0200 bison: Update to 2.5.1. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e41b341fafa73cc7126e7e7ac0847a301e255d66 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 15 11:36:40 2012 +0200 mbr: Update to 1.1.11 and move tools to /usr. The previous version did not build with the new kernel headers. commit 75556d531bccbd916f6f05064ae499b285f23034 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 15 11:35:13 2012 +0200 sdl: Add patches for PAGE_SIZE on i586 as well. asm/page.h does not exist in the new kernel headers and that needs to be fixed in the SDL code. commit 00b73e3b0fea55577ee03a04935dd12467cdfd2b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 15 11:34:09 2012 +0200 man: Remove obsolete compiler flag to fix the build. commit 4dca0bd05db7369de01cbf28ade0a1f1e940798a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jun 15 11:32:00 2012 +0200 libc-headers: Extract header files from kernel. Previously, there have been header sanizied header files used from kernel 2.6.12.0, which got harder to maintain over the years and may cause unseen problems. commit 86d3ada4c67a095d12b897be84bd93a053c8b15f Merge: 3e011c2 7c8031e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 14 23:31:17 2012 +0200 Merge branch 'glibc-update' into thirteen commit 7c8031e54e0be4e2575c73d01da725849b62efc1 Merge: ee71790 81b2c3f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 13 18:41:17 2012 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc-update commit ee717901edaf6e7496cdd649e29c0b5b06cf67b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 13 15:22:56 2012 +0200 glibc: Update to 2.5 on i586. This enabled IPFire to run some precompiled third-party software on it. We may as well expect some performance improvements. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/glibc | 14 +- config/rootfiles/common/i586/glibc | 201 ++- config/rootfiles/common/linux-libc-header | 1624 ++++---------------- config/rootfiles/common/mbr | 5 +- lfs/glibc | 24 +- lfs/linux-libc-header | 105 -- lfs/man | 1 + lfs/mbr | 6 +- lfs/sdl | 2 - lfs/usb-stick | 4 +- make.sh | 12 +- ...libc-2.3.6-dont_use_origin_on_privil_exec.patch | 67 - src/patches/glibc-2.3.6-inotify-1.patch | 45 - src/patches/glibc-2.3.6-linux_types-1.patch | 33 - .../linux-libc-headers-2.6.12.0-inotify-3.patch | 115 -- 15 files changed, 418 insertions(+), 1840 deletions(-) delete mode 100644 lfs/linux-libc-header delete mode 100644 src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch delete mode 100644 src/patches/glibc-2.3.6-inotify-1.patch delete mode 100644 src/patches/glibc-2.3.6-linux_types-1.patch delete mode 100644 src/patches/linux-libc-headers-2.6.12.0-inotify-3.patch Difference in files: diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index 77db7bc..51cd839 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -2,10 +2,10 @@ lib/ld-2.5.so lib/ld-linux.so.3 lib/libBrokenLocale-2.5.so -#lib/libBrokenLocale.so.1 +lib/libBrokenLocale.so.1 #lib/libSegFault.so lib/libanl-2.5.so -#lib/libanl.so.1 +lib/libanl.so.1 lib/libc-2.5.so lib/libc.so.6 lib/libcrypt-2.5.so @@ -24,11 +24,11 @@ lib/libnss_dns.so.2 lib/libnss_files-2.5.so lib/libnss_files.so.2 lib/libnss_hesiod-2.5.so -#lib/libnss_hesiod.so.2 +lib/libnss_hesiod.so.2 lib/libnss_nis-2.5.so -#lib/libnss_nis.so.2 +lib/libnss_nis.so.2 lib/libnss_nisplus-2.5.so -#lib/libnss_nisplus.so.2 +lib/libnss_nisplus.so.2 #lib/libpcprofile.so lib/libpthread-2.5.so lib/libpthread.so.0 @@ -36,8 +36,8 @@ lib/libresolv-2.5.so lib/libresolv.so.2 lib/librt-2.5.so lib/librt.so.1 -#lib/libthread_db-1.0.so -#lib/libthread_db.so.1 +lib/libthread_db-1.0.so +lib/libthread_db.so.1 lib/libutil-2.5.so lib/libutil.so.1 sbin/ldconfig diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index 2648e70..7ceb057 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -1,46 +1,46 @@ -etc/ld.so.cache +#etc/ld.so.cache etc/localtime #etc/rpc -lib/ld-2.3.6.so +lib/ld-2.5.so lib/ld-linux.so.2 -#lib/libBrokenLocale-2.3.6.so -#lib/libBrokenLocale.so.1 +lib/libBrokenLocale-2.5.so +lib/libBrokenLocale.so.1 #lib/libSegFault.so -#lib/libanl-2.3.6.so -#lib/libanl.so.1 -lib/libc-2.3.6.so +lib/libanl-2.5.so +lib/libanl.so.1 +lib/libc-2.5.so lib/libc.so.6 -lib/libcrypt-2.3.6.so +lib/libcrypt-2.5.so lib/libcrypt.so.1 -lib/libdl-2.3.6.so +lib/libdl-2.5.so lib/libdl.so.2 -lib/libm-2.3.6.so +lib/libm-2.5.so lib/libm.so.6 #lib/libmemusage.so -lib/libnsl-2.3.6.so +lib/libnsl-2.5.so lib/libnsl.so.1 -lib/libnss_compat-2.3.6.so +lib/libnss_compat-2.5.so lib/libnss_compat.so.2 -lib/libnss_dns-2.3.6.so +lib/libnss_dns-2.5.so lib/libnss_dns.so.2 -lib/libnss_files-2.3.6.so +lib/libnss_files-2.5.so lib/libnss_files.so.2 -#lib/libnss_hesiod-2.3.6.so -#lib/libnss_hesiod.so.2 -#lib/libnss_nis-2.3.6.so -#lib/libnss_nis.so.2 -#lib/libnss_nisplus-2.3.6.so -#lib/libnss_nisplus.so.2 +lib/libnss_hesiod-2.5.so +lib/libnss_hesiod.so.2 +lib/libnss_nis-2.5.so +lib/libnss_nis.so.2 +lib/libnss_nisplus-2.5.so +lib/libnss_nisplus.so.2 #lib/libpcprofile.so -lib/libpthread-2.3.6.so +lib/libpthread-2.5.so lib/libpthread.so.0 -lib/libresolv-2.3.6.so +lib/libresolv-2.5.so lib/libresolv.so.2 -lib/librt-2.3.6.so +lib/librt-2.5.so lib/librt.so.1 -#lib/libthread_db-1.0.so -#lib/libthread_db.so.1 -lib/libutil-2.3.6.so +lib/libthread_db-1.0.so +lib/libthread_db.so.1 +lib/libutil-2.5.so lib/libutil.so.1 sbin/ldconfig #sbin/sln @@ -100,12 +100,15 @@ usr/bin/ldd #usr/include/bits/ipc.h #usr/include/bits/ipctypes.h #usr/include/bits/libc-lock.h +#usr/include/bits/libio-ldbl.h +#usr/include/bits/link.h #usr/include/bits/local_lim.h #usr/include/bits/locale.h #usr/include/bits/mathcalls.h #usr/include/bits/mathdef.h #usr/include/bits/mathinline.h #usr/include/bits/mman.h +#usr/include/bits/monetary-ldbl.h #usr/include/bits/mqueue.h #usr/include/bits/msq.h #usr/include/bits/nan.h @@ -114,6 +117,7 @@ usr/bin/ldd #usr/include/bits/posix1_lim.h #usr/include/bits/posix2_lim.h #usr/include/bits/posix_opt.h +#usr/include/bits/printf-ldbl.h #usr/include/bits/pthreadtypes.h #usr/include/bits/resource.h #usr/include/bits/sched.h @@ -131,32 +135,42 @@ usr/bin/ldd #usr/include/bits/sigthread.h #usr/include/bits/sockaddr.h #usr/include/bits/socket.h +#usr/include/bits/socket2.h #usr/include/bits/stab.def #usr/include/bits/stat.h #usr/include/bits/statfs.h #usr/include/bits/statvfs.h +#usr/include/bits/stdio-ldbl.h #usr/include/bits/stdio-lock.h #usr/include/bits/stdio.h #usr/include/bits/stdio2.h #usr/include/bits/stdio_lim.h +#usr/include/bits/stdlib-ldbl.h +#usr/include/bits/stdlib.h #usr/include/bits/string.h #usr/include/bits/string2.h #usr/include/bits/string3.h #usr/include/bits/stropts.h #usr/include/bits/sys_errlist.h #usr/include/bits/syscall.h +#usr/include/bits/syslog-ldbl.h +#usr/include/bits/syslog-path.h +#usr/include/bits/syslog.h #usr/include/bits/termios.h #usr/include/bits/time.h #usr/include/bits/types.h #usr/include/bits/typesizes.h #usr/include/bits/uio.h +#usr/include/bits/unistd.h #usr/include/bits/ustat.h #usr/include/bits/utmp.h #usr/include/bits/utmpx.h #usr/include/bits/utsname.h #usr/include/bits/waitflags.h #usr/include/bits/waitstatus.h +#usr/include/bits/wchar-ldbl.h #usr/include/bits/wchar.h +#usr/include/bits/wchar2.h #usr/include/bits/wordsize.h #usr/include/bits/xopen_lim.h #usr/include/bits/xtitypes.h @@ -190,6 +204,7 @@ usr/bin/ldd #usr/include/gnu-versions.h #usr/include/gnu/lib-names.h #usr/include/gnu/libc-version.h +#usr/include/gnu/stubs-32.h #usr/include/gnu/stubs.h #usr/include/grp.h #usr/include/iconv.h @@ -534,18 +549,52 @@ usr/bin/ldd #usr/lib/gconv/IBM037.so #usr/lib/gconv/IBM038.so #usr/lib/gconv/IBM1004.so +#usr/lib/gconv/IBM1008.so +#usr/lib/gconv/IBM1008_420.so +#usr/lib/gconv/IBM1025.so #usr/lib/gconv/IBM1026.so #usr/lib/gconv/IBM1046.so #usr/lib/gconv/IBM1047.so +#usr/lib/gconv/IBM1097.so +#usr/lib/gconv/IBM1112.so +#usr/lib/gconv/IBM1122.so +#usr/lib/gconv/IBM1123.so #usr/lib/gconv/IBM1124.so #usr/lib/gconv/IBM1129.so +#usr/lib/gconv/IBM1130.so #usr/lib/gconv/IBM1132.so #usr/lib/gconv/IBM1133.so +#usr/lib/gconv/IBM1137.so +#usr/lib/gconv/IBM1140.so +#usr/lib/gconv/IBM1141.so +#usr/lib/gconv/IBM1142.so +#usr/lib/gconv/IBM1143.so +#usr/lib/gconv/IBM1144.so +#usr/lib/gconv/IBM1145.so +#usr/lib/gconv/IBM1146.so +#usr/lib/gconv/IBM1147.so +#usr/lib/gconv/IBM1148.so +#usr/lib/gconv/IBM1149.so +#usr/lib/gconv/IBM1153.so +#usr/lib/gconv/IBM1154.so +#usr/lib/gconv/IBM1155.so +#usr/lib/gconv/IBM1156.so +#usr/lib/gconv/IBM1157.so +#usr/lib/gconv/IBM1158.so #usr/lib/gconv/IBM1160.so #usr/lib/gconv/IBM1161.so #usr/lib/gconv/IBM1162.so #usr/lib/gconv/IBM1163.so #usr/lib/gconv/IBM1164.so +#usr/lib/gconv/IBM1166.so +#usr/lib/gconv/IBM1167.so +#usr/lib/gconv/IBM12712.so +#usr/lib/gconv/IBM1364.so +#usr/lib/gconv/IBM1371.so +#usr/lib/gconv/IBM1388.so +#usr/lib/gconv/IBM1390.so +#usr/lib/gconv/IBM1399.so +#usr/lib/gconv/IBM16804.so #usr/lib/gconv/IBM256.so #usr/lib/gconv/IBM273.so #usr/lib/gconv/IBM274.so @@ -562,7 +611,13 @@ usr/bin/ldd #usr/lib/gconv/IBM423.so #usr/lib/gconv/IBM424.so #usr/lib/gconv/IBM437.so +#usr/lib/gconv/IBM4517.so +#usr/lib/gconv/IBM4899.so +#usr/lib/gconv/IBM4909.so +#usr/lib/gconv/IBM4971.so #usr/lib/gconv/IBM500.so +#usr/lib/gconv/IBM5347.so +#usr/lib/gconv/IBM803.so #usr/lib/gconv/IBM850.so #usr/lib/gconv/IBM851.so #usr/lib/gconv/IBM852.so @@ -585,10 +640,15 @@ usr/bin/ldd #usr/lib/gconv/IBM875.so #usr/lib/gconv/IBM880.so #usr/lib/gconv/IBM891.so +#usr/lib/gconv/IBM901.so +#usr/lib/gconv/IBM902.so #usr/lib/gconv/IBM903.so +#usr/lib/gconv/IBM9030.so #usr/lib/gconv/IBM904.so #usr/lib/gconv/IBM905.so +#usr/lib/gconv/IBM9066.so #usr/lib/gconv/IBM918.so +#usr/lib/gconv/IBM921.so #usr/lib/gconv/IBM922.so #usr/lib/gconv/IBM930.so #usr/lib/gconv/IBM932.so @@ -597,6 +657,7 @@ usr/bin/ldd #usr/lib/gconv/IBM937.so #usr/lib/gconv/IBM939.so #usr/lib/gconv/IBM943.so +#usr/lib/gconv/IBM9448.so #usr/lib/gconv/IEC_P27-1.so #usr/lib/gconv/INIS-8.so #usr/lib/gconv/INIS-CYRILLIC.so @@ -626,6 +687,7 @@ usr/bin/ldd #usr/lib/gconv/ISO8859-8.so #usr/lib/gconv/ISO8859-9.so #usr/lib/gconv/ISO_10367-BOX.so +#usr/lib/gconv/ISO_11548-1.so #usr/lib/gconv/ISO_2033.so #usr/lib/gconv/ISO_5427-EXT.so #usr/lib/gconv/ISO_5427.so @@ -643,6 +705,7 @@ usr/bin/ldd #usr/lib/gconv/MAC-SAMI.so #usr/lib/gconv/MAC-UK.so #usr/lib/gconv/MACINTOSH.so +#usr/lib/gconv/MIK.so #usr/lib/gconv/NATS-DANO.so #usr/lib/gconv/NATS-SEFI.so #usr/lib/gconv/PT154.so @@ -713,7 +776,6 @@ usr/bin/ldd usr/lib/locale/locale-archive #usr/sbin/iconvconfig #usr/sbin/nscd -#usr/sbin/nscd_nischeck #usr/sbin/rpcinfo #usr/sbin/zdump #usr/sbin/zic @@ -868,6 +930,7 @@ usr/lib/locale/locale-archive #usr/share/i18n/charmaps/ISO-IR-90.gz #usr/share/i18n/charmaps/ISO_10367-BOX.gz #usr/share/i18n/charmaps/ISO_10646.gz +#usr/share/i18n/charmaps/ISO_11548-1.gz #usr/share/i18n/charmaps/ISO_2033-1983.gz #usr/share/i18n/charmaps/ISO_5427-EXT.gz #usr/share/i18n/charmaps/ISO_5427.gz @@ -905,6 +968,7 @@ usr/lib/locale/locale-archive #usr/share/i18n/charmaps/MAC-SAMI.gz #usr/share/i18n/charmaps/MAC-UK.gz #usr/share/i18n/charmaps/MACINTOSH.gz +#usr/share/i18n/charmaps/MIK.gz #usr/share/i18n/charmaps/MSZ_7795.3.gz #usr/share/i18n/charmaps/NATS-DANO-ADD.gz #usr/share/i18n/charmaps/NATS-DANO.gz @@ -963,8 +1027,10 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/ar_SY #usr/share/i18n/locales/ar_TN #usr/share/i18n/locales/ar_YE +#usr/share/i18n/locales/as_IN #usr/share/i18n/locales/az_AZ #usr/share/i18n/locales/be_BY +#usr/share/i18n/locales/be_BY@latin #usr/share/i18n/locales/bg_BG #usr/share/i18n/locales/bn_BD #usr/share/i18n/locales/bn_IN @@ -972,9 +1038,13 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/br_FR@euro #usr/share/i18n/locales/bs_BA #usr/share/i18n/locales/byn_ER +#usr/share/i18n/locales/ca_AD #usr/share/i18n/locales/ca_ES #usr/share/i18n/locales/ca_ES@euro +#usr/share/i18n/locales/ca_FR +#usr/share/i18n/locales/ca_IT #usr/share/i18n/locales/cs_CZ +#usr/share/i18n/locales/csb_PL #usr/share/i18n/locales/cy_GB #usr/share/i18n/locales/da_DK #usr/share/i18n/locales/de_AT @@ -986,6 +1056,8 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/de_DE@euro #usr/share/i18n/locales/de_LU #usr/share/i18n/locales/de_LU@euro +#usr/share/i18n/locales/dz_BT +#usr/share/i18n/locales/el_CY #usr/share/i18n/locales/el_GR #usr/share/i18n/locales/el_GR@euro #usr/share/i18n/locales/en_AU @@ -1039,6 +1111,7 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/fr_FR@euro #usr/share/i18n/locales/fr_LU #usr/share/i18n/locales/fr_LU@euro +#usr/share/i18n/locales/fy_NL #usr/share/i18n/locales/ga_IE #usr/share/i18n/locales/ga_IE@euro #usr/share/i18n/locales/gd_GB @@ -1053,6 +1126,7 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/he_IL #usr/share/i18n/locales/hi_IN #usr/share/i18n/locales/hr_HR +#usr/share/i18n/locales/hsb_DE #usr/share/i18n/locales/hu_HU #usr/share/i18n/locales/hy_AM #usr/share/i18n/locales/i18n @@ -1067,13 +1141,17 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/ka_GE #usr/share/i18n/locales/kk_KZ #usr/share/i18n/locales/kl_GL +#usr/share/i18n/locales/km_KH #usr/share/i18n/locales/kn_IN #usr/share/i18n/locales/ko_KR +#usr/share/i18n/locales/ku_TR #usr/share/i18n/locales/kw_GB +#usr/share/i18n/locales/ky_KG #usr/share/i18n/locales/lg_UG #usr/share/i18n/locales/lo_LA #usr/share/i18n/locales/lt_LT #usr/share/i18n/locales/lv_LV +#usr/share/i18n/locales/mg_MG #usr/share/i18n/locales/mi_NZ #usr/share/i18n/locales/mk_MK #usr/share/i18n/locales/ml_IN @@ -1088,10 +1166,14 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/nl_NL #usr/share/i18n/locales/nl_NL@euro #usr/share/i18n/locales/nn_NO +#usr/share/i18n/locales/nr_ZA +#usr/share/i18n/locales/nso_ZA #usr/share/i18n/locales/oc_FR #usr/share/i18n/locales/om_ET #usr/share/i18n/locales/om_KE +#usr/share/i18n/locales/or_IN #usr/share/i18n/locales/pa_IN +#usr/share/i18n/locales/pa_PK #usr/share/i18n/locales/pl_PL #usr/share/i18n/locales/pt_BR #usr/share/i18n/locales/pt_PT @@ -1099,7 +1181,9 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/ro_RO #usr/share/i18n/locales/ru_RU #usr/share/i18n/locales/ru_UA +#usr/share/i18n/locales/rw_RW #usr/share/i18n/locales/se_NO +#usr/share/i18n/locales/si_LK #usr/share/i18n/locales/sid_ET #usr/share/i18n/locales/sk_SK #usr/share/i18n/locales/sl_SI @@ -1109,6 +1193,8 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/so_SO #usr/share/i18n/locales/sq_AL #usr/share/i18n/locales/sr_CS +#usr/share/i18n/locales/sr_ME +#usr/share/i18n/locales/ss_ZA #usr/share/i18n/locales/st_ZA #usr/share/i18n/locales/sv_FI #usr/share/i18n/locales/sv_FI@euro @@ -1121,6 +1207,8 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/ti_ET #usr/share/i18n/locales/tig_ER #usr/share/i18n/locales/tl_PH +#usr/share/i18n/locales/tn_ZA +#usr/share/i18n/locales/tr_CY #usr/share/i18n/locales/tr_TR #usr/share/i18n/locales/translit_circle #usr/share/i18n/locales/translit_cjk_compat @@ -1134,11 +1222,13 @@ usr/lib/locale/locale-archive #usr/share/i18n/locales/translit_neutral #usr/share/i18n/locales/translit_small #usr/share/i18n/locales/translit_wide +#usr/share/i18n/locales/ts_ZA #usr/share/i18n/locales/tt_RU #usr/share/i18n/locales/uk_UA #usr/share/i18n/locales/ur_PK #usr/share/i18n/locales/uz_UZ #usr/share/i18n/locales/uz_UZ@cyrillic +#usr/share/i18n/locales/ve_ZA #usr/share/i18n/locales/vi_VN #usr/share/i18n/locales/wa_BE #usr/share/i18n/locales/wa_BE@euro @@ -1211,6 +1301,12 @@ usr/lib/locale/locale-archive #usr/share/locale/pt_BR #usr/share/locale/pt_BR/LC_MESSAGES #usr/share/locale/pt_BR/LC_MESSAGES/libc.mo +#usr/share/locale/ru +#usr/share/locale/ru/LC_MESSAGES +#usr/share/locale/ru/LC_MESSAGES/libc.mo +#usr/share/locale/rw +#usr/share/locale/rw/LC_MESSAGES +#usr/share/locale/rw/LC_MESSAGES/libc.mo #usr/share/locale/sk #usr/share/locale/sk/LC_MESSAGES #usr/share/locale/sk/LC_MESSAGES/libc.mo @@ -1350,7 +1446,9 @@ usr/lib/locale/locale-archive #usr/share/zoneinfo/America/Indiana/Indianapolis #usr/share/zoneinfo/America/Indiana/Knox #usr/share/zoneinfo/America/Indiana/Marengo +#usr/share/zoneinfo/America/Indiana/Petersburg #usr/share/zoneinfo/America/Indiana/Vevay +#usr/share/zoneinfo/America/Indiana/Vincennes #usr/share/zoneinfo/America/Indianapolis #usr/share/zoneinfo/America/Inuvik #usr/share/zoneinfo/America/Iqaluit @@ -1375,6 +1473,7 @@ usr/lib/locale/locale-archive #usr/share/zoneinfo/America/Merida #usr/share/zoneinfo/America/Mexico_City #usr/share/zoneinfo/America/Miquelon +#usr/share/zoneinfo/America/Moncton #usr/share/zoneinfo/America/Monterrey #usr/share/zoneinfo/America/Montevideo #usr/share/zoneinfo/America/Montreal @@ -1767,20 +1866,6 @@ usr/lib/locale/locale-archive #usr/share/zoneinfo/ROC #usr/share/zoneinfo/ROK #usr/share/zoneinfo/Singapore -#usr/share/zoneinfo/SystemV -#usr/share/zoneinfo/SystemV/AST4 -#usr/share/zoneinfo/SystemV/AST4ADT -#usr/share/zoneinfo/SystemV/CST6 -#usr/share/zoneinfo/SystemV/CST6CDT -#usr/share/zoneinfo/SystemV/EST5 -#usr/share/zoneinfo/SystemV/EST5EDT -#usr/share/zoneinfo/SystemV/HST10 -#usr/share/zoneinfo/SystemV/MST7 -#usr/share/zoneinfo/SystemV/MST7MDT -#usr/share/zoneinfo/SystemV/PST8 -#usr/share/zoneinfo/SystemV/PST8PDT -#usr/share/zoneinfo/SystemV/YST9 -#usr/share/zoneinfo/SystemV/YST9YDT #usr/share/zoneinfo/Turkey #usr/share/zoneinfo/UCT #usr/share/zoneinfo/US @@ -1927,7 +2012,9 @@ usr/share/zoneinfo/posix #usr/share/zoneinfo/posix/America/Indiana/Indianapolis #usr/share/zoneinfo/posix/America/Indiana/Knox #usr/share/zoneinfo/posix/America/Indiana/Marengo +#usr/share/zoneinfo/posix/America/Indiana/Petersburg #usr/share/zoneinfo/posix/America/Indiana/Vevay +#usr/share/zoneinfo/posix/America/Indiana/Vincennes #usr/share/zoneinfo/posix/America/Indianapolis #usr/share/zoneinfo/posix/America/Inuvik #usr/share/zoneinfo/posix/America/Iqaluit @@ -1952,6 +2039,7 @@ usr/share/zoneinfo/posix #usr/share/zoneinfo/posix/America/Merida #usr/share/zoneinfo/posix/America/Mexico_City #usr/share/zoneinfo/posix/America/Miquelon +#usr/share/zoneinfo/posix/America/Moncton #usr/share/zoneinfo/posix/America/Monterrey #usr/share/zoneinfo/posix/America/Montevideo #usr/share/zoneinfo/posix/America/Montreal @@ -2344,20 +2432,6 @@ usr/share/zoneinfo/posix #usr/share/zoneinfo/posix/ROC #usr/share/zoneinfo/posix/ROK #usr/share/zoneinfo/posix/Singapore -#usr/share/zoneinfo/posix/SystemV -#usr/share/zoneinfo/posix/SystemV/AST4 -#usr/share/zoneinfo/posix/SystemV/AST4ADT -#usr/share/zoneinfo/posix/SystemV/CST6 -#usr/share/zoneinfo/posix/SystemV/CST6CDT -#usr/share/zoneinfo/posix/SystemV/EST5 -#usr/share/zoneinfo/posix/SystemV/EST5EDT -#usr/share/zoneinfo/posix/SystemV/HST10 -#usr/share/zoneinfo/posix/SystemV/MST7 -#usr/share/zoneinfo/posix/SystemV/MST7MDT -#usr/share/zoneinfo/posix/SystemV/PST8 -#usr/share/zoneinfo/posix/SystemV/PST8PDT -#usr/share/zoneinfo/posix/SystemV/YST9 -#usr/share/zoneinfo/posix/SystemV/YST9YDT #usr/share/zoneinfo/posix/Turkey #usr/share/zoneinfo/posix/UCT #usr/share/zoneinfo/posix/US @@ -2504,7 +2578,9 @@ usr/share/zoneinfo/posix #usr/share/zoneinfo/right/America/Indiana/Indianapolis #usr/share/zoneinfo/right/America/Indiana/Knox #usr/share/zoneinfo/right/America/Indiana/Marengo +#usr/share/zoneinfo/right/America/Indiana/Petersburg #usr/share/zoneinfo/right/America/Indiana/Vevay +#usr/share/zoneinfo/right/America/Indiana/Vincennes #usr/share/zoneinfo/right/America/Indianapolis #usr/share/zoneinfo/right/America/Inuvik #usr/share/zoneinfo/right/America/Iqaluit @@ -2529,6 +2605,7 @@ usr/share/zoneinfo/posix #usr/share/zoneinfo/right/America/Merida #usr/share/zoneinfo/right/America/Mexico_City #usr/share/zoneinfo/right/America/Miquelon +#usr/share/zoneinfo/right/America/Moncton #usr/share/zoneinfo/right/America/Monterrey #usr/share/zoneinfo/right/America/Montevideo #usr/share/zoneinfo/right/America/Montreal @@ -2921,20 +2998,6 @@ usr/share/zoneinfo/posix #usr/share/zoneinfo/right/ROC #usr/share/zoneinfo/right/ROK #usr/share/zoneinfo/right/Singapore -#usr/share/zoneinfo/right/SystemV -#usr/share/zoneinfo/right/SystemV/AST4 -#usr/share/zoneinfo/right/SystemV/AST4ADT -#usr/share/zoneinfo/right/SystemV/CST6 -#usr/share/zoneinfo/right/SystemV/CST6CDT -#usr/share/zoneinfo/right/SystemV/EST5 -#usr/share/zoneinfo/right/SystemV/EST5EDT -#usr/share/zoneinfo/right/SystemV/HST10 -#usr/share/zoneinfo/right/SystemV/MST7 -#usr/share/zoneinfo/right/SystemV/MST7MDT -#usr/share/zoneinfo/right/SystemV/PST8 -#usr/share/zoneinfo/right/SystemV/PST8PDT -#usr/share/zoneinfo/right/SystemV/YST9 -#usr/share/zoneinfo/right/SystemV/YST9YDT #usr/share/zoneinfo/right/Turkey #usr/share/zoneinfo/right/UCT #usr/share/zoneinfo/right/US diff --git a/config/rootfiles/common/linux-libc-header b/config/rootfiles/common/linux-libc-header index 4fbe3e0..dac70a6 100644 --- a/config/rootfiles/common/linux-libc-header +++ b/config/rootfiles/common/linux-libc-header @@ -1,196 +1,122 @@ #usr/include/asm -#usr/include/asm/8253pit.h +#usr/include/asm-generic +#usr/include/asm-generic/auxvec.h +#usr/include/asm-generic/bitsperlong.h +#usr/include/asm-generic/errno-base.h +#usr/include/asm-generic/errno.h +#usr/include/asm-generic/fcntl.h +#usr/include/asm-generic/int-l64.h +#usr/include/asm-generic/int-ll64.h +#usr/include/asm-generic/ioctl.h +#usr/include/asm-generic/ioctls.h +#usr/include/asm-generic/ipcbuf.h +#usr/include/asm-generic/mman-common.h +#usr/include/asm-generic/mman.h +#usr/include/asm-generic/msgbuf.h +#usr/include/asm-generic/param.h +#usr/include/asm-generic/poll.h +#usr/include/asm-generic/posix_types.h +#usr/include/asm-generic/resource.h +#usr/include/asm-generic/sembuf.h +#usr/include/asm-generic/setup.h +#usr/include/asm-generic/shmbuf.h +#usr/include/asm-generic/shmparam.h +#usr/include/asm-generic/siginfo.h +#usr/include/asm-generic/signal-defs.h +#usr/include/asm-generic/signal.h +#usr/include/asm-generic/socket.h +#usr/include/asm-generic/sockios.h +#usr/include/asm-generic/stat.h +#usr/include/asm-generic/statfs.h +#usr/include/asm-generic/swab.h +#usr/include/asm-generic/termbits.h +#usr/include/asm-generic/termios.h +#usr/include/asm-generic/types.h +#usr/include/asm-generic/ucontext.h +#usr/include/asm-generic/unistd.h #usr/include/asm/a.out.h -#usr/include/asm/agp.h -#usr/include/asm/apic.h -#usr/include/asm/apicdef.h -#usr/include/asm/arch_hooks.h -#usr/include/asm/atomic.h -#usr/include/asm/bitops.h +#usr/include/asm/auxvec.h +#usr/include/asm/bitsperlong.h #usr/include/asm/boot.h +#usr/include/asm/bootparam.h #usr/include/asm/byteorder.h -#usr/include/asm/cache.h -#usr/include/asm/cacheflush.h -#usr/include/asm/checksum.h -#usr/include/asm/cpu.h -#usr/include/asm/cpufeature.h #usr/include/asm/debugreg.h -#usr/include/asm/desc.h -#usr/include/asm/dma.h #usr/include/asm/e820.h -#usr/include/asm/elf.h #usr/include/asm/errno.h #usr/include/asm/fcntl.h -#usr/include/asm/fixmap.h -#usr/include/asm/floppy.h -#usr/include/asm/genapic.h -#usr/include/asm/hardirq.h -#usr/include/asm/hdreg.h -#usr/include/asm/hw_irq.h -#usr/include/asm/i8259.h -#usr/include/asm/init.h -#usr/include/asm/io.h -#usr/include/asm/io_apic.h #usr/include/asm/ioctl.h #usr/include/asm/ioctls.h -#usr/include/asm/ipc.h #usr/include/asm/ipcbuf.h -#usr/include/asm/irq.h -#usr/include/asm/kdebug.h -#usr/include/asm/kprobes.h +#usr/include/asm/ist.h +#usr/include/asm/kvm.h +#usr/include/asm/kvm_para.h #usr/include/asm/ldt.h -#usr/include/asm/linkage.h -#usr/include/asm/mach-bigsmp -#usr/include/asm/mach-bigsmp/mach_apic.h -#usr/include/asm/mach-bigsmp/mach_apicdef.h -#usr/include/asm/mach-bigsmp/mach_ipi.h -#usr/include/asm/mach-bigsmp/mach_mpspec.h -#usr/include/asm/mach-default -#usr/include/asm/mach-default/apm.h -#usr/include/asm/mach-default/bios_ebda.h -#usr/include/asm/mach-default/do_timer.h -#usr/include/asm/mach-default/entry_arch.h -#usr/include/asm/mach-default/io_ports.h -#usr/include/asm/mach-default/irq_vectors.h -#usr/include/asm/mach-default/mach_apic.h -#usr/include/asm/mach-default/mach_apicdef.h -#usr/include/asm/mach-default/mach_ipi.h -#usr/include/asm/mach-default/mach_mpparse.h -#usr/include/asm/mach-default/mach_mpspec.h -#usr/include/asm/mach-default/mach_reboot.h -#usr/include/asm/mach-default/mach_time.h -#usr/include/asm/mach-default/mach_timer.h -#usr/include/asm/mach-default/mach_traps.h -#usr/include/asm/mach-default/mach_wakecpu.h -#usr/include/asm/mach-default/pci-functions.h -#usr/include/asm/mach-default/setup_arch_post.h -#usr/include/asm/mach-default/setup_arch_pre.h -#usr/include/asm/mach-default/smpboot_hooks.h -#usr/include/asm/mach-es7000 -#usr/include/asm/mach-es7000/mach_apic.h -#usr/include/asm/mach-es7000/mach_apicdef.h -#usr/include/asm/mach-es7000/mach_ipi.h -#usr/include/asm/mach-es7000/mach_mpparse.h -#usr/include/asm/mach-es7000/mach_mpspec.h -#usr/include/asm/mach-es7000/mach_wakecpu.h -#usr/include/asm/mach-generic -#usr/include/asm/mach-generic/mach_apic.h -#usr/include/asm/mach-generic/mach_apicdef.h -#usr/include/asm/mach-generic/mach_ipi.h -#usr/include/asm/mach-generic/mach_mpparse.h -#usr/include/asm/mach-generic/mach_mpspec.h -#usr/include/asm/mach-numaq -#usr/include/asm/mach-numaq/mach_apic.h -#usr/include/asm/mach-numaq/mach_apicdef.h -#usr/include/asm/mach-numaq/mach_ipi.h -#usr/include/asm/mach-numaq/mach_mpparse.h -#usr/include/asm/mach-numaq/mach_mpspec.h -#usr/include/asm/mach-numaq/mach_wakecpu.h -#usr/include/asm/mach-summit -#usr/include/asm/mach-summit/mach_apic.h -#usr/include/asm/mach-summit/mach_apicdef.h -#usr/include/asm/mach-summit/mach_ipi.h -#usr/include/asm/mach-summit/mach_mpparse.h -#usr/include/asm/mach-summit/mach_mpspec.h -#usr/include/asm/mach-visws -#usr/include/asm/mach-visws/cobalt.h -#usr/include/asm/mach-visws/do_timer.h -#usr/include/asm/mach-visws/entry_arch.h -#usr/include/asm/mach-visws/irq_vectors.h -#usr/include/asm/mach-visws/lithium.h -#usr/include/asm/mach-visws/mach_apic.h -#usr/include/asm/mach-visws/mach_apicdef.h -#usr/include/asm/mach-visws/piix4.h -#usr/include/asm/mach-visws/setup_arch_post.h -#usr/include/asm/mach-visws/setup_arch_pre.h -#usr/include/asm/mach-visws/smpboot_hooks.h -#usr/include/asm/mach-voyager -#usr/include/asm/mach-voyager/do_timer.h -#usr/include/asm/mach-voyager/entry_arch.h -#usr/include/asm/mach-voyager/irq_vectors.h -#usr/include/asm/mach-voyager/setup_arch_post.h -#usr/include/asm/mach-voyager/setup_arch_pre.h -#usr/include/asm/math_emu.h -#usr/include/asm/mca.h -#usr/include/asm/mca_dma.h +#usr/include/asm/mce.h #usr/include/asm/mman.h -#usr/include/asm/mmu.h -#usr/include/asm/mmu_context.h -#usr/include/asm/mmx.h -#usr/include/asm/module.h -#usr/include/asm/mpspec.h -#usr/include/asm/mpspec_def.h #usr/include/asm/msgbuf.h +#usr/include/asm/msr-index.h #usr/include/asm/msr.h #usr/include/asm/mtrr.h -#usr/include/asm/namei.h -#usr/include/asm/nmi.h -#usr/include/asm/node.h -#usr/include/asm/numaq.h -#usr/include/asm/numnodes.h -#usr/include/asm/page.h #usr/include/asm/param.h -#usr/include/asm/parport.h -#usr/include/asm/pgalloc.h #usr/include/asm/poll.h #usr/include/asm/posix_types.h -#usr/include/asm/processor.h +#usr/include/asm/posix_types_32.h +#usr/include/asm/posix_types_64.h +#usr/include/asm/prctl.h +#usr/include/asm/processor-flags.h +#usr/include/asm/ptrace-abi.h #usr/include/asm/ptrace.h -#usr/include/asm/rwlock.h -#usr/include/asm/segment.h -#usr/include/asm/semaphore.h +#usr/include/asm/resource.h #usr/include/asm/sembuf.h -#usr/include/asm/serial.h +#usr/include/asm/setup.h #usr/include/asm/shmbuf.h -#usr/include/asm/shmparam.h #usr/include/asm/sigcontext.h +#usr/include/asm/sigcontext32.h #usr/include/asm/siginfo.h +#usr/include/asm/signal.h #usr/include/asm/socket.h #usr/include/asm/sockios.h -#usr/include/asm/spinlock.h -#usr/include/asm/srat.h #usr/include/asm/stat.h -#usr/include/asm/suspend.h -#usr/include/asm/system.h +#usr/include/asm/statfs.h +#usr/include/asm/swab.h #usr/include/asm/termbits.h #usr/include/asm/termios.h -#usr/include/asm/timer.h -#usr/include/asm/timex.h -#usr/include/asm/tlbflush.h #usr/include/asm/types.h #usr/include/asm/ucontext.h -#usr/include/asm/unaligned.h #usr/include/asm/unistd.h -#usr/include/asm/user.h -#usr/include/asm/vga.h -#usr/include/asm/vic.h +#usr/include/asm/unistd_32.h +#usr/include/asm/unistd_64.h #usr/include/asm/vm86.h -#usr/include/asm/voyager.h +#usr/include/asm/vsyscall.h +#usr/include/drm +#usr/include/drm/drm.h +#usr/include/drm/drm_mode.h +#usr/include/drm/drm_sarea.h +#usr/include/drm/i810_drm.h +#usr/include/drm/i830_drm.h +#usr/include/drm/i915_drm.h +#usr/include/drm/mga_drm.h +#usr/include/drm/r128_drm.h +#usr/include/drm/radeon_drm.h +#usr/include/drm/savage_drm.h +#usr/include/drm/sis_drm.h +#usr/include/drm/via_drm.h #usr/include/linux -#usr/include/linux/8250_pci.h #usr/include/linux/a.out.h #usr/include/linux/acct.h -#usr/include/linux/acpi.h #usr/include/linux/adb.h #usr/include/linux/adfs_fs.h -#usr/include/linux/adfs_fs_sb.h -#usr/include/linux/affs_fs.h #usr/include/linux/affs_hardblocks.h #usr/include/linux/agpgart.h -#usr/include/linux/aio.h #usr/include/linux/aio_abi.h -#usr/include/linux/amifd.h -#usr/include/linux/amifdreg.h -#usr/include/linux/amigaffs.h #usr/include/linux/apm_bios.h -#usr/include/linux/ata.h +#usr/include/linux/arcfb.h #usr/include/linux/atalk.h #usr/include/linux/atm.h #usr/include/linux/atm_eni.h #usr/include/linux/atm_he.h #usr/include/linux/atm_idt77105.h #usr/include/linux/atm_nicstar.h -#usr/include/linux/atm_suni.h #usr/include/linux/atm_tcp.h #usr/include/linux/atm_zatm.h #usr/include/linux/atmapi.h @@ -207,77 +133,55 @@ #usr/include/linux/audit.h #usr/include/linux/auto_fs.h #usr/include/linux/auto_fs4.h -#usr/include/linux/autoconf.h -#usr/include/linux/awe_voice.h +#usr/include/linux/auxvec.h #usr/include/linux/ax25.h #usr/include/linux/b1lli.h -#usr/include/linux/backing-dev.h -#usr/include/linux/backlight.h #usr/include/linux/baycom.h -#usr/include/linux/bcd.h #usr/include/linux/bfs_fs.h #usr/include/linux/binfmts.h -#usr/include/linux/bitmap.h -#usr/include/linux/bitops.h #usr/include/linux/blkpg.h -#usr/include/linux/blockgroup_lock.h -#usr/include/linux/bootmem.h +#usr/include/linux/blktrace_api.h #usr/include/linux/bpqether.h +#usr/include/linux/bsg.h #usr/include/linux/byteorder #usr/include/linux/byteorder/big_endian.h -#usr/include/linux/byteorder/generic.h #usr/include/linux/byteorder/little_endian.h -#usr/include/linux/byteorder/pdp_endian.h -#usr/include/linux/byteorder/swab.h -#usr/include/linux/byteorder/swabb.h -#usr/include/linux/cache.h +#usr/include/linux/can +#usr/include/linux/can.h +#usr/include/linux/can/bcm.h +#usr/include/linux/can/error.h +#usr/include/linux/can/netlink.h +#usr/include/linux/can/raw.h #usr/include/linux/capability.h #usr/include/linux/capi.h #usr/include/linux/cciss_ioctl.h -#usr/include/linux/cd1400.h #usr/include/linux/cdk.h #usr/include/linux/cdrom.h -#usr/include/linux/circ_buf.h -#usr/include/linux/cobalt-nvram.h +#usr/include/linux/cgroupstats.h +#usr/include/linux/chio.h +#usr/include/linux/cm4000_cs.h +#usr/include/linux/cn_proc.h #usr/include/linux/coda.h -#usr/include/linux/coda_proc.h #usr/include/linux/coda_psdev.h #usr/include/linux/coff.h -#usr/include/linux/com20020.h -#usr/include/linux/compat.h -#usr/include/linux/compat_ioctl.h -#usr/include/linux/compiler.h #usr/include/linux/comstats.h -#usr/include/linux/config.h -#usr/include/linux/console.h -#usr/include/linux/console_struct.h -#usr/include/linux/consolemap.h -#usr/include/linux/cpu.h -#usr/include/linux/cpufreq.h +#usr/include/linux/connector.h +#usr/include/linux/const.h #usr/include/linux/cramfs_fs.h -#usr/include/linux/cramfs_fs_sb.h -#usr/include/linux/crc32.h -#usr/include/linux/crypto.h -#usr/include/linux/ctype.h #usr/include/linux/cuda.h #usr/include/linux/cyclades.h #usr/include/linux/cycx_cfm.h -#usr/include/linux/cycx_drv.h -#usr/include/linux/cycx_x25.h -#usr/include/linux/devfs_fs.h -#usr/include/linux/devfs_fs_kernel.h -#usr/include/linux/device-mapper.h -#usr/include/linux/device.h -#usr/include/linux/devpts_fs.h -#usr/include/linux/dirent.h -#usr/include/linux/divert.h +#usr/include/linux/dcbnl.h +#usr/include/linux/dccp.h +#usr/include/linux/dlm.h +#usr/include/linux/dlm_device.h +#usr/include/linux/dlm_netlink.h +#usr/include/linux/dlm_plock.h +#usr/include/linux/dlmconstants.h #usr/include/linux/dm-ioctl.h +#usr/include/linux/dm-log-userspace.h #usr/include/linux/dn.h -#usr/include/linux/dnotify.h -#usr/include/linux/dqblk_v1.h -#usr/include/linux/dqblk_v2.h #usr/include/linux/dqblk_xfs.h -#usr/include/linux/dtlk.h #usr/include/linux/dvb #usr/include/linux/dvb/audio.h #usr/include/linux/dvb/ca.h @@ -287,79 +191,58 @@ #usr/include/linux/dvb/osd.h #usr/include/linux/dvb/version.h #usr/include/linux/dvb/video.h -#usr/include/linux/eeprom.h -#usr/include/linux/efi.h -#usr/include/linux/efs_dir.h -#usr/include/linux/efs_fs.h -#usr/include/linux/efs_fs_i.h +#usr/include/linux/edd.h #usr/include/linux/efs_fs_sb.h -#usr/include/linux/efs_vh.h -#usr/include/linux/eisa.h -#usr/include/linux/elevator.h +#usr/include/linux/elf-em.h #usr/include/linux/elf-fdpic.h #usr/include/linux/elf.h #usr/include/linux/elfcore.h -#usr/include/linux/err.h -#usr/include/linux/err_kernel_only.h #usr/include/linux/errno.h #usr/include/linux/errqueue.h #usr/include/linux/ethtool.h #usr/include/linux/eventpoll.h #usr/include/linux/ext2_fs.h -#usr/include/linux/ext3_fs.h -#usr/include/linux/ext3_jbd.h #usr/include/linux/fadvise.h +#usr/include/linux/falloc.h #usr/include/linux/fb.h #usr/include/linux/fcntl.h #usr/include/linux/fd.h -#usr/include/linux/fd1772.h #usr/include/linux/fdreg.h -#usr/include/linux/file.h +#usr/include/linux/fib_rules.h +#usr/include/linux/fiemap.h #usr/include/linux/filter.h -#usr/include/linux/firmware.h +#usr/include/linux/firewire-cdev.h +#usr/include/linux/firewire-constants.h #usr/include/linux/flat.h -#usr/include/linux/font.h #usr/include/linux/fs.h -#usr/include/linux/fs_struct.h -#usr/include/linux/ftape-header-segment.h -#usr/include/linux/ftape-vendors.h -#usr/include/linux/ftape.h +#usr/include/linux/fuse.h #usr/include/linux/futex.h #usr/include/linux/gameport.h #usr/include/linux/gen_stats.h #usr/include/linux/generic_serial.h -#usr/include/linux/genhd.h -#usr/include/linux/gfp.h -#usr/include/linux/hash.h +#usr/include/linux/genetlink.h +#usr/include/linux/gfs2_ondisk.h +#usr/include/linux/gigaset_dev.h #usr/include/linux/hayesesp.h #usr/include/linux/hdlc #usr/include/linux/hdlc.h #usr/include/linux/hdlc/ioctl.h #usr/include/linux/hdlcdrv.h #usr/include/linux/hdreg.h -#usr/include/linux/hdsmart.h +#usr/include/linux/hid.h #usr/include/linux/hiddev.h -#usr/include/linux/highuid.h -#usr/include/linux/hpfs_fs.h +#usr/include/linux/hidraw.h +#usr/include/linux/hpet.h #usr/include/linux/hysdn_if.h -#usr/include/linux/i2c-algo-bit.h -#usr/include/linux/i2c-algo-ite.h -#usr/include/linux/i2c-algo-pcf.h -#usr/include/linux/i2c-algo-sgi.h -#usr/include/linux/i2c-algo-sibyte.h #usr/include/linux/i2c-dev.h -#usr/include/linux/i2c-id.h -#usr/include/linux/i2c-sensor.h -#usr/include/linux/i2c-vid.h #usr/include/linux/i2c.h #usr/include/linux/i2o-dev.h #usr/include/linux/i8k.h -#usr/include/linux/ibmtr.h #usr/include/linux/icmp.h #usr/include/linux/icmpv6.h -#usr/include/linux/ide.h -#usr/include/linux/idr.h #usr/include/linux/if.h +#usr/include/linux/if_addr.h +#usr/include/linux/if_addrlabel.h #usr/include/linux/if_arcnet.h #usr/include/linux/if_arp.h #usr/include/linux/if_bonding.h @@ -373,154 +256,150 @@ #usr/include/linux/if_frad.h #usr/include/linux/if_hippi.h #usr/include/linux/if_infiniband.h +#usr/include/linux/if_link.h #usr/include/linux/if_ltalk.h #usr/include/linux/if_packet.h +#usr/include/linux/if_phonet.h #usr/include/linux/if_plip.h #usr/include/linux/if_ppp.h +#usr/include/linux/if_pppol2tp.h #usr/include/linux/if_pppox.h -#usr/include/linux/if_shaper.h #usr/include/linux/if_slip.h #usr/include/linux/if_strip.h #usr/include/linux/if_tr.h #usr/include/linux/if_tun.h #usr/include/linux/if_tunnel.h #usr/include/linux/if_vlan.h -#usr/include/linux/if_wanpipe.h -#usr/include/linux/if_wanpipe_common.h #usr/include/linux/igmp.h #usr/include/linux/in.h #usr/include/linux/in6.h #usr/include/linux/in_route.h -#usr/include/linux/inetdevice.h -#usr/include/linux/init.h -#usr/include/linux/init_task.h -#usr/include/linux/initrd.h +#usr/include/linux/inet_diag.h #usr/include/linux/inotify.h #usr/include/linux/input.h -#usr/include/linux/interrupt.h #usr/include/linux/ioctl.h -#usr/include/linux/ioctl32.h -#usr/include/linux/ioport.h #usr/include/linux/ip.h #usr/include/linux/ip6_tunnel.h -#usr/include/linux/ip_mp_alg.h +#usr/include/linux/ip_vs.h #usr/include/linux/ipc.h #usr/include/linux/ipmi.h #usr/include/linux/ipmi_msgdefs.h -#usr/include/linux/ipmi_smi.h #usr/include/linux/ipsec.h #usr/include/linux/ipv6.h #usr/include/linux/ipv6_route.h #usr/include/linux/ipx.h #usr/include/linux/irda.h -#usr/include/linux/irq.h -#usr/include/linux/irq_cpustat.h -#usr/include/linux/isapnp.h +#usr/include/linux/irqnr.h #usr/include/linux/isdn #usr/include/linux/isdn.h #usr/include/linux/isdn/capicmd.h -#usr/include/linux/isdn/capilli.h -#usr/include/linux/isdn/capiutil.h -#usr/include/linux/isdn/tpam.h #usr/include/linux/isdn_divertif.h #usr/include/linux/isdn_ppp.h #usr/include/linux/isdnif.h -#usr/include/linux/isicom.h #usr/include/linux/iso_fs.h -#usr/include/linux/istallion.h -#usr/include/linux/ite_gpio.h +#usr/include/linux/ivtv.h +#usr/include/linux/ivtvfb.h #usr/include/linux/ixjuser.h -#usr/include/linux/jbd.h -#usr/include/linux/jffs.h #usr/include/linux/jffs2.h -#usr/include/linux/jffs2_fs_sb.h -#usr/include/linux/jhash.h -#usr/include/linux/jiffies.h -#usr/include/linux/journal-head.h #usr/include/linux/joystick.h -#usr/include/linux/kallsyms.h -#usr/include/linux/kbd_diacr.h -#usr/include/linux/kbd_kern.h #usr/include/linux/kd.h #usr/include/linux/kdev_t.h #usr/include/linux/kernel.h -#usr/include/linux/kernel_stat.h #usr/include/linux/kernelcapi.h #usr/include/linux/keyboard.h #usr/include/linux/keyctl.h -#usr/include/linux/kmalloc_sizes.h -#usr/include/linux/kmod.h -#usr/include/linux/kprobes.h -#usr/include/linux/lapb.h -#usr/include/linux/lcd.h -#usr/include/linux/libata.h -#usr/include/linux/libps2.h +#usr/include/linux/kvm.h +#usr/include/linux/kvm_para.h #usr/include/linux/limits.h -#usr/include/linux/linkage.h -#usr/include/linux/linux_logo.h -#usr/include/linux/list.h #usr/include/linux/llc.h -#usr/include/linux/lockd -#usr/include/linux/lockd/bind.h -#usr/include/linux/lockd/debug.h -#usr/include/linux/lockd/nlm.h -#usr/include/linux/lockd/share.h -#usr/include/linux/lockd/sm_inter.h -#usr/include/linux/lockd/xdr.h -#usr/include/linux/lockd/xdr4.h #usr/include/linux/loop.h #usr/include/linux/lp.h +#usr/include/linux/magic.h #usr/include/linux/major.h +#usr/include/linux/map_to_7segment.h #usr/include/linux/matroxfb.h -#usr/include/linux/mbcache.h -#usr/include/linux/mc6821.h -#usr/include/linux/mca-legacy.h -#usr/include/linux/mca.h -#usr/include/linux/mempool.h +#usr/include/linux/mempolicy.h #usr/include/linux/meye.h #usr/include/linux/mii.h #usr/include/linux/minix_fs.h -#usr/include/linux/miscdevice.h -#usr/include/linux/mm.h -#usr/include/linux/mm_inline.h #usr/include/linux/mman.h -#usr/include/linux/mod_devicetable.h -#usr/include/linux/module.h -#usr/include/linux/moduleloader.h -#usr/include/linux/moduleparam.h -#usr/include/linux/mount.h +#usr/include/linux/mmtimer.h +#usr/include/linux/mqueue.h #usr/include/linux/mroute.h +#usr/include/linux/mroute6.h #usr/include/linux/msdos_fs.h #usr/include/linux/msg.h -#usr/include/linux/mtd -#usr/include/linux/mtd/blktrans.h -#usr/include/linux/mtd/cfi.h -#usr/include/linux/mtd/cfi_endian.h -#usr/include/linux/mtd/compatmac.h -#usr/include/linux/mtd/concat.h -#usr/include/linux/mtd/doc2000.h -#usr/include/linux/mtd/flashchip.h -#usr/include/linux/mtd/ftl.h -#usr/include/linux/mtd/gen_probe.h -#usr/include/linux/mtd/iflash.h -#usr/include/linux/mtd/jedec.h -#usr/include/linux/mtd/map.h -#usr/include/linux/mtd/nand.h -#usr/include/linux/mtd/nand_ecc.h -#usr/include/linux/mtd/nftl.h -#usr/include/linux/mtd/partitions.h -#usr/include/linux/mtd/pmc551.h #usr/include/linux/mtio.h #usr/include/linux/n_r3964.h -#usr/include/linux/namei.h #usr/include/linux/nbd.h #usr/include/linux/ncp.h #usr/include/linux/ncp_fs.h #usr/include/linux/ncp_mount.h #usr/include/linux/ncp_no.h +#usr/include/linux/neighbour.h #usr/include/linux/net.h +#usr/include/linux/net_dropmon.h #usr/include/linux/netdevice.h +#usr/include/linux/netfilter #usr/include/linux/netfilter.h +#usr/include/linux/netfilter/nf_conntrack_common.h +#usr/include/linux/netfilter/nf_conntrack_ftp.h +#usr/include/linux/netfilter/nf_conntrack_sctp.h +#usr/include/linux/netfilter/nf_conntrack_tcp.h +#usr/include/linux/netfilter/nf_conntrack_tuple_common.h +#usr/include/linux/netfilter/nfnetlink.h +#usr/include/linux/netfilter/nfnetlink_compat.h +#usr/include/linux/netfilter/nfnetlink_conntrack.h +#usr/include/linux/netfilter/nfnetlink_log.h +#usr/include/linux/netfilter/nfnetlink_queue.h +#usr/include/linux/netfilter/x_tables.h +#usr/include/linux/netfilter/xt_CLASSIFY.h +#usr/include/linux/netfilter/xt_CONNMARK.h +#usr/include/linux/netfilter/xt_CONNSECMARK.h +#usr/include/linux/netfilter/xt_DSCP.h +#usr/include/linux/netfilter/xt_LED.h +#usr/include/linux/netfilter/xt_MARK.h +#usr/include/linux/netfilter/xt_NFLOG.h +#usr/include/linux/netfilter/xt_NFQUEUE.h +#usr/include/linux/netfilter/xt_RATEEST.h +#usr/include/linux/netfilter/xt_SECMARK.h +#usr/include/linux/netfilter/xt_TCPMSS.h +#usr/include/linux/netfilter/xt_TCPOPTSTRIP.h +#usr/include/linux/netfilter/xt_TPROXY.h +#usr/include/linux/netfilter/xt_cluster.h +#usr/include/linux/netfilter/xt_comment.h +#usr/include/linux/netfilter/xt_connbytes.h +#usr/include/linux/netfilter/xt_connlimit.h +#usr/include/linux/netfilter/xt_connmark.h +#usr/include/linux/netfilter/xt_conntrack.h +#usr/include/linux/netfilter/xt_dccp.h +#usr/include/linux/netfilter/xt_dscp.h +#usr/include/linux/netfilter/xt_esp.h +#usr/include/linux/netfilter/xt_hashlimit.h +#usr/include/linux/netfilter/xt_helper.h +#usr/include/linux/netfilter/xt_iprange.h +#usr/include/linux/netfilter/xt_length.h +#usr/include/linux/netfilter/xt_limit.h +#usr/include/linux/netfilter/xt_mac.h +#usr/include/linux/netfilter/xt_mark.h +#usr/include/linux/netfilter/xt_multiport.h +#usr/include/linux/netfilter/xt_osf.h +#usr/include/linux/netfilter/xt_owner.h +#usr/include/linux/netfilter/xt_physdev.h +#usr/include/linux/netfilter/xt_pkttype.h +#usr/include/linux/netfilter/xt_policy.h +#usr/include/linux/netfilter/xt_quota.h +#usr/include/linux/netfilter/xt_rateest.h +#usr/include/linux/netfilter/xt_realm.h +#usr/include/linux/netfilter/xt_recent.h +#usr/include/linux/netfilter/xt_sctp.h +#usr/include/linux/netfilter/xt_state.h +#usr/include/linux/netfilter/xt_statistic.h +#usr/include/linux/netfilter/xt_string.h +#usr/include/linux/netfilter/xt_tcpmss.h +#usr/include/linux/netfilter/xt_tcpudp.h +#usr/include/linux/netfilter/xt_time.h +#usr/include/linux/netfilter/xt_u32.h #usr/include/linux/netfilter_arp #usr/include/linux/netfilter_arp.h #usr/include/linux/netfilter_arp/arp_tables.h @@ -546,83 +425,32 @@ #usr/include/linux/netfilter_decnet.h #usr/include/linux/netfilter_ipv4 #usr/include/linux/netfilter_ipv4.h -#usr/include/linux/netfilter_ipv4/ip_conntrack.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_amanda.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_core.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_ftp.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_helper.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_icmp.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_irc.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_protocol.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_sctp.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_tcp.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_tftp.h -#usr/include/linux/netfilter_ipv4/ip_conntrack_tuple.h -#usr/include/linux/netfilter_ipv4/ip_nat.h -#usr/include/linux/netfilter_ipv4/ip_nat_core.h -#usr/include/linux/netfilter_ipv4/ip_nat_helper.h -#usr/include/linux/netfilter_ipv4/ip_nat_protocol.h -#usr/include/linux/netfilter_ipv4/ip_nat_rule.h #usr/include/linux/netfilter_ipv4/ip_queue.h #usr/include/linux/netfilter_ipv4/ip_tables.h -#usr/include/linux/netfilter_ipv4/ipt_CLASSIFY.h #usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h -#usr/include/linux/netfilter_ipv4/ipt_CONNMARK.h -#usr/include/linux/netfilter_ipv4/ipt_DSCP.h #usr/include/linux/netfilter_ipv4/ipt_ECN.h #usr/include/linux/netfilter_ipv4/ipt_LOG.h -#usr/include/linux/netfilter_ipv4/ipt_MARK.h #usr/include/linux/netfilter_ipv4/ipt_REJECT.h #usr/include/linux/netfilter_ipv4/ipt_SAME.h -#usr/include/linux/netfilter_ipv4/ipt_TCPMSS.h -#usr/include/linux/netfilter_ipv4/ipt_TOS.h +#usr/include/linux/netfilter_ipv4/ipt_TTL.h #usr/include/linux/netfilter_ipv4/ipt_ULOG.h #usr/include/linux/netfilter_ipv4/ipt_addrtype.h #usr/include/linux/netfilter_ipv4/ipt_ah.h -#usr/include/linux/netfilter_ipv4/ipt_comment.h -#usr/include/linux/netfilter_ipv4/ipt_connmark.h -#usr/include/linux/netfilter_ipv4/ipt_conntrack.h -#usr/include/linux/netfilter_ipv4/ipt_dscp.h #usr/include/linux/netfilter_ipv4/ipt_ecn.h -#usr/include/linux/netfilter_ipv4/ipt_esp.h -#usr/include/linux/netfilter_ipv4/ipt_hashlimit.h -#usr/include/linux/netfilter_ipv4/ipt_helper.h -#usr/include/linux/netfilter_ipv4/ipt_iprange.h -#usr/include/linux/netfilter_ipv4/ipt_length.h -#usr/include/linux/netfilter_ipv4/ipt_limit.h -#usr/include/linux/netfilter_ipv4/ipt_mac.h -#usr/include/linux/netfilter_ipv4/ipt_mark.h -#usr/include/linux/netfilter_ipv4/ipt_multiport.h -#usr/include/linux/netfilter_ipv4/ipt_owner.h -#usr/include/linux/netfilter_ipv4/ipt_physdev.h -#usr/include/linux/netfilter_ipv4/ipt_pkttype.h #usr/include/linux/netfilter_ipv4/ipt_realm.h -#usr/include/linux/netfilter_ipv4/ipt_recent.h -#usr/include/linux/netfilter_ipv4/ipt_sctp.h -#usr/include/linux/netfilter_ipv4/ipt_state.h -#usr/include/linux/netfilter_ipv4/ipt_tcpmss.h -#usr/include/linux/netfilter_ipv4/ipt_tos.h #usr/include/linux/netfilter_ipv4/ipt_ttl.h -#usr/include/linux/netfilter_ipv4/listhelp.h -#usr/include/linux/netfilter_ipv4/lockhelp.h #usr/include/linux/netfilter_ipv6 #usr/include/linux/netfilter_ipv6.h #usr/include/linux/netfilter_ipv6/ip6_tables.h +#usr/include/linux/netfilter_ipv6/ip6t_HL.h #usr/include/linux/netfilter_ipv6/ip6t_LOG.h -#usr/include/linux/netfilter_ipv6/ip6t_MARK.h +#usr/include/linux/netfilter_ipv6/ip6t_REJECT.h #usr/include/linux/netfilter_ipv6/ip6t_ah.h -#usr/include/linux/netfilter_ipv6/ip6t_esp.h #usr/include/linux/netfilter_ipv6/ip6t_frag.h #usr/include/linux/netfilter_ipv6/ip6t_hl.h #usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h -#usr/include/linux/netfilter_ipv6/ip6t_length.h -#usr/include/linux/netfilter_ipv6/ip6t_limit.h -#usr/include/linux/netfilter_ipv6/ip6t_mac.h -#usr/include/linux/netfilter_ipv6/ip6t_mark.h -#usr/include/linux/netfilter_ipv6/ip6t_multiport.h +#usr/include/linux/netfilter_ipv6/ip6t_mh.h #usr/include/linux/netfilter_ipv6/ip6t_opts.h -#usr/include/linux/netfilter_ipv6/ip6t_owner.h -#usr/include/linux/netfilter_ipv6/ip6t_physdev.h #usr/include/linux/netfilter_ipv6/ip6t_rt.h #usr/include/linux/netlink.h #usr/include/linux/netrom.h @@ -632,137 +460,79 @@ #usr/include/linux/nfs4.h #usr/include/linux/nfs4_mount.h #usr/include/linux/nfs_fs.h -#usr/include/linux/nfs_fs_i.h -#usr/include/linux/nfs_fs_sb.h #usr/include/linux/nfs_idmap.h #usr/include/linux/nfs_mount.h -#usr/include/linux/nfs_xdr.h +#usr/include/linux/nfsacl.h #usr/include/linux/nfsd #usr/include/linux/nfsd/const.h #usr/include/linux/nfsd/debug.h #usr/include/linux/nfsd/export.h -#usr/include/linux/nfsd/interface.h -#usr/include/linux/nfsd/nfsd.h #usr/include/linux/nfsd/nfsfh.h -#usr/include/linux/nfsd/state.h #usr/include/linux/nfsd/stats.h #usr/include/linux/nfsd/syscall.h -#usr/include/linux/nfsd/xdr.h -#usr/include/linux/nfsd/xdr3.h -#usr/include/linux/nfsd/xdr4.h -#usr/include/linux/nls.h -#usr/include/linux/nmi.h -#usr/include/linux/node.h -#usr/include/linux/notifier.h +#usr/include/linux/nl80211.h #usr/include/linux/nubus.h -#usr/include/linux/numa.h #usr/include/linux/nvram.h -#usr/include/linux/openprom_fs.h -#usr/include/linux/oprofile.h -#usr/include/linux/pagemap.h -#usr/include/linux/pagevec.h +#usr/include/linux/oom.h #usr/include/linux/param.h #usr/include/linux/parport.h -#usr/include/linux/parport_pc.h -#usr/include/linux/parser.h #usr/include/linux/patchkey.h -#usr/include/linux/pci-dynids.h #usr/include/linux/pci.h -#usr/include/linux/pci_ids.h -#usr/include/linux/pcieport_if.h -#usr/include/linux/percpu.h -#usr/include/linux/percpu_counter.h +#usr/include/linux/pci_regs.h +#usr/include/linux/perf_event.h #usr/include/linux/personality.h #usr/include/linux/pfkeyv2.h #usr/include/linux/pg.h -#usr/include/linux/pipe_fs_i.h +#usr/include/linux/phantom.h +#usr/include/linux/phonet.h #usr/include/linux/pkt_cls.h #usr/include/linux/pkt_sched.h #usr/include/linux/pktcdvd.h #usr/include/linux/pmu.h #usr/include/linux/poll.h -#usr/include/linux/posix-timers.h -#usr/include/linux/posix_acl.h -#usr/include/linux/posix_acl_xattr.h #usr/include/linux/posix_types.h #usr/include/linux/ppdev.h #usr/include/linux/ppp-comp.h -#usr/include/linux/ppp_channel.h #usr/include/linux/ppp_defs.h +#usr/include/linux/pps.h #usr/include/linux/prctl.h -#usr/include/linux/preempt.h -#usr/include/linux/prefetch.h -#usr/include/linux/proc_fs.h -#usr/include/linux/ps2esdi.h #usr/include/linux/ptrace.h -#usr/include/linux/qic117.h #usr/include/linux/qnx4_fs.h #usr/include/linux/qnxtypes.h #usr/include/linux/quota.h -#usr/include/linux/quotaio_v1.h -#usr/include/linux/quotaio_v2.h #usr/include/linux/radeonfb.h #usr/include/linux/raid -#usr/include/linux/raid/linear.h -#usr/include/linux/raid/md.h #usr/include/linux/raid/md_p.h #usr/include/linux/raid/md_u.h -#usr/include/linux/raid/multipath.h -#usr/include/linux/raid/raid0.h -#usr/include/linux/raid/raid1.h -#usr/include/linux/raid/raid5.h -#usr/include/linux/raid/xor.h #usr/include/linux/random.h #usr/include/linux/raw.h -#usr/include/linux/rbtree.h #usr/include/linux/reboot.h -#usr/include/linux/reiserfs_acl.h #usr/include/linux/reiserfs_fs.h #usr/include/linux/reiserfs_xattr.h #usr/include/linux/resource.h +#usr/include/linux/rfkill.h #usr/include/linux/romfs_fs.h -#usr/include/linux/root_dev.h #usr/include/linux/rose.h #usr/include/linux/route.h #usr/include/linux/rtc.h #usr/include/linux/rtnetlink.h -#usr/include/linux/sc26198.h #usr/include/linux/scc.h #usr/include/linux/sched.h -#usr/include/linux/sctp.h -#usr/include/linux/scx200.h -#usr/include/linux/scx200_gpio.h +#usr/include/linux/screen_info.h #usr/include/linux/sdla.h -#usr/include/linux/sdla_asy.h -#usr/include/linux/sdla_chdlc.h -#usr/include/linux/sdla_fr.h -#usr/include/linux/sdla_ppp.h -#usr/include/linux/sdla_x25.h -#usr/include/linux/sdladrv.h -#usr/include/linux/sdlapci.h -#usr/include/linux/sdlasfm.h -#usr/include/linux/securebits.h -#usr/include/linux/security.h -#usr/include/linux/selection.h #usr/include/linux/selinux_netlink.h #usr/include/linux/sem.h -#usr/include/linux/seqlock.h #usr/include/linux/serial.h -#usr/include/linux/serial167.h -#usr/include/linux/serialP.h -#usr/include/linux/serial_8250.h #usr/include/linux/serial_core.h #usr/include/linux/serial_reg.h #usr/include/linux/serio.h #usr/include/linux/shm.h -#usr/include/linux/siginfo.h #usr/include/linux/signal.h -#usr/include/linux/skbuff.h +#usr/include/linux/signalfd.h #usr/include/linux/smb.h #usr/include/linux/smb_fs.h #usr/include/linux/smb_mount.h #usr/include/linux/smbno.h -#usr/include/linux/smp_lock.h #usr/include/linux/snmp.h #usr/include/linux/socket.h #usr/include/linux/sockios.h @@ -771,975 +541,113 @@ #usr/include/linux/sonypi.h #usr/include/linux/sound.h #usr/include/linux/soundcard.h -#usr/include/linux/spinlock.h -#usr/include/linux/stallion.h +#usr/include/linux/spi +#usr/include/linux/spi/spidev.h +#usr/include/linux/stat.h #usr/include/linux/stddef.h -#usr/include/linux/stringify.h +#usr/include/linux/string.h #usr/include/linux/sunrpc -#usr/include/linux/sunrpc/cache.h -#usr/include/linux/sunrpc/clnt.h #usr/include/linux/sunrpc/debug.h -#usr/include/linux/sunrpc/gss_asn1.h -#usr/include/linux/sunrpc/gss_krb5.h -#usr/include/linux/sunrpc/gss_spkm3.h -#usr/include/linux/sunrpc/sched.h -#usr/include/linux/sunrpc/stats.h -#usr/include/linux/sunrpc/svc.h -#usr/include/linux/sunrpc/svcsock.h -#usr/include/linux/sunrpc/timer.h -#usr/include/linux/sunrpc/types.h -#usr/include/linux/sunrpc/xprt.h -#usr/include/linux/superhyway.h -#usr/include/linux/suspend.h -#usr/include/linux/swap.h -#usr/include/linux/swapops.h +#usr/include/linux/suspend_ioctls.h +#usr/include/linux/swab.h #usr/include/linux/synclink.h -#usr/include/linux/sys.h -#usr/include/linux/syscalls.h #usr/include/linux/sysctl.h -#usr/include/linux/sysdev.h -#usr/include/linux/sysfs.h -#usr/include/linux/sysrq.h -#usr/include/linux/sysv_fs.h +#usr/include/linux/taskstats.h #usr/include/linux/tc_act -#usr/include/linux/tc_act/tc_defact.h #usr/include/linux/tc_act/tc_gact.h #usr/include/linux/tc_act/tc_ipt.h #usr/include/linux/tc_act/tc_mirred.h +#usr/include/linux/tc_act/tc_nat.h #usr/include/linux/tc_act/tc_pedit.h +#usr/include/linux/tc_act/tc_skbedit.h #usr/include/linux/tc_ematch #usr/include/linux/tc_ematch/tc_em_cmp.h #usr/include/linux/tc_ematch/tc_em_meta.h #usr/include/linux/tc_ematch/tc_em_nbyte.h +#usr/include/linux/tc_ematch/tc_em_text.h #usr/include/linux/tcp.h -#usr/include/linux/tcp_diag.h #usr/include/linux/telephony.h #usr/include/linux/termios.h -#usr/include/linux/threads.h -#usr/include/linux/ticable.h #usr/include/linux/time.h #usr/include/linux/times.h #usr/include/linux/timex.h #usr/include/linux/tiocl.h +#usr/include/linux/tipc.h +#usr/include/linux/tipc_config.h #usr/include/linux/toshiba.h #usr/include/linux/tty.h #usr/include/linux/types.h -#usr/include/linux/udf_fs.h #usr/include/linux/udf_fs_i.h -#usr/include/linux/udf_fs_sb.h #usr/include/linux/udp.h -#usr/include/linux/ufs_fs.h #usr/include/linux/uinput.h #usr/include/linux/uio.h #usr/include/linux/ultrasound.h -#usr/include/linux/umem.h #usr/include/linux/un.h #usr/include/linux/unistd.h -#usr/include/linux/usb.h -#usr/include/linux/usb_cdc.h -#usr/include/linux/usb_ch9.h -#usr/include/linux/usb_gadgetfs.h +#usr/include/linux/usb +#usr/include/linux/usb/audio.h +#usr/include/linux/usb/cdc.h +#usr/include/linux/usb/ch9.h +#usr/include/linux/usb/g_printer.h +#usr/include/linux/usb/gadgetfs.h +#usr/include/linux/usb/midi.h +#usr/include/linux/usb/tmc.h +#usr/include/linux/usb/vstusb.h #usr/include/linux/usbdevice_fs.h -#usr/include/linux/user.h #usr/include/linux/utime.h -#usr/include/linux/uts.h #usr/include/linux/utsname.h #usr/include/linux/version.h -#usr/include/linux/video_decoder.h -#usr/include/linux/video_encoder.h +#usr/include/linux/veth.h #usr/include/linux/videodev.h #usr/include/linux/videodev2.h #usr/include/linux/videotext.h -#usr/include/linux/vmalloc.h +#usr/include/linux/virtio_9p.h +#usr/include/linux/virtio_balloon.h +#usr/include/linux/virtio_blk.h +#usr/include/linux/virtio_config.h +#usr/include/linux/virtio_console.h +#usr/include/linux/virtio_ids.h +#usr/include/linux/virtio_net.h +#usr/include/linux/virtio_pci.h +#usr/include/linux/virtio_ring.h +#usr/include/linux/virtio_rng.h #usr/include/linux/vt.h -#usr/include/linux/vt_buffer.h -#usr/include/linux/vt_kern.h #usr/include/linux/wait.h -#usr/include/linux/wanpipe.h #usr/include/linux/wanrouter.h #usr/include/linux/watchdog.h -#usr/include/linux/wavefront.h +#usr/include/linux/wimax +#usr/include/linux/wimax.h +#usr/include/linux/wimax/i2400m.h #usr/include/linux/wireless.h -#usr/include/linux/workqueue.h #usr/include/linux/x25.h #usr/include/linux/xattr.h -#usr/include/linux/xattr_acl.h #usr/include/linux/xfrm.h -#usr/include/linux/yam.h -#usr/include/linux/zftape.h -#usr/include/linux/zorro.h -#usr/include/linux/zorro_ids.h -#opt/MACHINE-uClibc -#opt/MACHINE-uClibc/usr -#opt/MACHINE-uClibc/usr/include -#opt/MACHINE-uClibc/usr/include/asm -#opt/MACHINE-uClibc/usr/include/asm/8253pit.h -#opt/MACHINE-uClibc/usr/include/asm/a.out.h -#opt/MACHINE-uClibc/usr/include/asm/agp.h -#opt/MACHINE-uClibc/usr/include/asm/apic.h -#opt/MACHINE-uClibc/usr/include/asm/apicdef.h -#opt/MACHINE-uClibc/usr/include/asm/arch_hooks.h -#opt/MACHINE-uClibc/usr/include/asm/atomic.h -#opt/MACHINE-uClibc/usr/include/asm/bitops.h -#opt/MACHINE-uClibc/usr/include/asm/boot.h -#opt/MACHINE-uClibc/usr/include/asm/byteorder.h -#opt/MACHINE-uClibc/usr/include/asm/cache.h -#opt/MACHINE-uClibc/usr/include/asm/cacheflush.h -#opt/MACHINE-uClibc/usr/include/asm/checksum.h -#opt/MACHINE-uClibc/usr/include/asm/cpu.h -#opt/MACHINE-uClibc/usr/include/asm/cpufeature.h -#opt/MACHINE-uClibc/usr/include/asm/debugreg.h -#opt/MACHINE-uClibc/usr/include/asm/desc.h -#opt/MACHINE-uClibc/usr/include/asm/dma.h -#opt/MACHINE-uClibc/usr/include/asm/e820.h -#opt/MACHINE-uClibc/usr/include/asm/elf.h -#opt/MACHINE-uClibc/usr/include/asm/errno.h -#opt/MACHINE-uClibc/usr/include/asm/fcntl.h -#opt/MACHINE-uClibc/usr/include/asm/fixmap.h -#opt/MACHINE-uClibc/usr/include/asm/floppy.h -#opt/MACHINE-uClibc/usr/include/asm/genapic.h -#opt/MACHINE-uClibc/usr/include/asm/hardirq.h -#opt/MACHINE-uClibc/usr/include/asm/hdreg.h -#opt/MACHINE-uClibc/usr/include/asm/hw_irq.h -#opt/MACHINE-uClibc/usr/include/asm/i8259.h -#opt/MACHINE-uClibc/usr/include/asm/init.h -#opt/MACHINE-uClibc/usr/include/asm/io.h -#opt/MACHINE-uClibc/usr/include/asm/io_apic.h -#opt/MACHINE-uClibc/usr/include/asm/ioctl.h -#opt/MACHINE-uClibc/usr/include/asm/ioctls.h -#opt/MACHINE-uClibc/usr/include/asm/ipc.h -#opt/MACHINE-uClibc/usr/include/asm/ipcbuf.h -#opt/MACHINE-uClibc/usr/include/asm/irq.h -#opt/MACHINE-uClibc/usr/include/asm/kdebug.h -#opt/MACHINE-uClibc/usr/include/asm/kprobes.h -#opt/MACHINE-uClibc/usr/include/asm/ldt.h -#opt/MACHINE-uClibc/usr/include/asm/linkage.h -#opt/MACHINE-uClibc/usr/include/asm/mach-bigsmp -#opt/MACHINE-uClibc/usr/include/asm/mach-bigsmp/mach_apic.h -#opt/MACHINE-uClibc/usr/include/asm/mach-bigsmp/mach_apicdef.h -#opt/MACHINE-uClibc/usr/include/asm/mach-bigsmp/mach_ipi.h -#opt/MACHINE-uClibc/usr/include/asm/mach-bigsmp/mach_mpspec.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default -#opt/MACHINE-uClibc/usr/include/asm/mach-default/apm.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/bios_ebda.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/do_timer.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/entry_arch.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/io_ports.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/irq_vectors.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_apic.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_apicdef.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_ipi.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_mpparse.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_mpspec.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_reboot.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_time.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_timer.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_traps.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/mach_wakecpu.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/pci-functions.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/setup_arch_post.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/setup_arch_pre.h -#opt/MACHINE-uClibc/usr/include/asm/mach-default/smpboot_hooks.h -#opt/MACHINE-uClibc/usr/include/asm/mach-es7000 -#opt/MACHINE-uClibc/usr/include/asm/mach-es7000/mach_apic.h -#opt/MACHINE-uClibc/usr/include/asm/mach-es7000/mach_apicdef.h -#opt/MACHINE-uClibc/usr/include/asm/mach-es7000/mach_ipi.h -#opt/MACHINE-uClibc/usr/include/asm/mach-es7000/mach_mpparse.h -#opt/MACHINE-uClibc/usr/include/asm/mach-es7000/mach_mpspec.h -#opt/MACHINE-uClibc/usr/include/asm/mach-es7000/mach_wakecpu.h -#opt/MACHINE-uClibc/usr/include/asm/mach-generic -#opt/MACHINE-uClibc/usr/include/asm/mach-generic/mach_apic.h -#opt/MACHINE-uClibc/usr/include/asm/mach-generic/mach_apicdef.h -#opt/MACHINE-uClibc/usr/include/asm/mach-generic/mach_ipi.h -#opt/MACHINE-uClibc/usr/include/asm/mach-generic/mach_mpparse.h -#opt/MACHINE-uClibc/usr/include/asm/mach-generic/mach_mpspec.h -#opt/MACHINE-uClibc/usr/include/asm/mach-numaq -#opt/MACHINE-uClibc/usr/include/asm/mach-numaq/mach_apic.h -#opt/MACHINE-uClibc/usr/include/asm/mach-numaq/mach_apicdef.h -#opt/MACHINE-uClibc/usr/include/asm/mach-numaq/mach_ipi.h -#opt/MACHINE-uClibc/usr/include/asm/mach-numaq/mach_mpparse.h -#opt/MACHINE-uClibc/usr/include/asm/mach-numaq/mach_mpspec.h -#opt/MACHINE-uClibc/usr/include/asm/mach-numaq/mach_wakecpu.h -#opt/MACHINE-uClibc/usr/include/asm/mach-summit -#opt/MACHINE-uClibc/usr/include/asm/mach-summit/mach_apic.h -#opt/MACHINE-uClibc/usr/include/asm/mach-summit/mach_apicdef.h -#opt/MACHINE-uClibc/usr/include/asm/mach-summit/mach_ipi.h -#opt/MACHINE-uClibc/usr/include/asm/mach-summit/mach_mpparse.h -#opt/MACHINE-uClibc/usr/include/asm/mach-summit/mach_mpspec.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/cobalt.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/do_timer.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/entry_arch.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/irq_vectors.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/lithium.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/mach_apic.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/mach_apicdef.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/piix4.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/setup_arch_post.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/setup_arch_pre.h -#opt/MACHINE-uClibc/usr/include/asm/mach-visws/smpboot_hooks.h -#opt/MACHINE-uClibc/usr/include/asm/mach-voyager -#opt/MACHINE-uClibc/usr/include/asm/mach-voyager/do_timer.h -#opt/MACHINE-uClibc/usr/include/asm/mach-voyager/entry_arch.h -#opt/MACHINE-uClibc/usr/include/asm/mach-voyager/irq_vectors.h -#opt/MACHINE-uClibc/usr/include/asm/mach-voyager/setup_arch_post.h -#opt/MACHINE-uClibc/usr/include/asm/mach-voyager/setup_arch_pre.h -#opt/MACHINE-uClibc/usr/include/asm/math_emu.h -#opt/MACHINE-uClibc/usr/include/asm/mca.h -#opt/MACHINE-uClibc/usr/include/asm/mca_dma.h -#opt/MACHINE-uClibc/usr/include/asm/mman.h -#opt/MACHINE-uClibc/usr/include/asm/mmu.h -#opt/MACHINE-uClibc/usr/include/asm/mmu_context.h -#opt/MACHINE-uClibc/usr/include/asm/mmx.h -#opt/MACHINE-uClibc/usr/include/asm/module.h -#opt/MACHINE-uClibc/usr/include/asm/mpspec.h -#opt/MACHINE-uClibc/usr/include/asm/mpspec_def.h -#opt/MACHINE-uClibc/usr/include/asm/msgbuf.h -#opt/MACHINE-uClibc/usr/include/asm/msr.h -#opt/MACHINE-uClibc/usr/include/asm/mtrr.h -#opt/MACHINE-uClibc/usr/include/asm/namei.h -#opt/MACHINE-uClibc/usr/include/asm/nmi.h -#opt/MACHINE-uClibc/usr/include/asm/node.h -#opt/MACHINE-uClibc/usr/include/asm/numaq.h -#opt/MACHINE-uClibc/usr/include/asm/numnodes.h -#opt/MACHINE-uClibc/usr/include/asm/page.h -#opt/MACHINE-uClibc/usr/include/asm/param.h -#opt/MACHINE-uClibc/usr/include/asm/parport.h -#opt/MACHINE-uClibc/usr/include/asm/pgalloc.h -#opt/MACHINE-uClibc/usr/include/asm/poll.h -#opt/MACHINE-uClibc/usr/include/asm/posix_types.h -#opt/MACHINE-uClibc/usr/include/asm/processor.h -#opt/MACHINE-uClibc/usr/include/asm/ptrace.h -#opt/MACHINE-uClibc/usr/include/asm/rwlock.h -#opt/MACHINE-uClibc/usr/include/asm/segment.h -#opt/MACHINE-uClibc/usr/include/asm/semaphore.h -#opt/MACHINE-uClibc/usr/include/asm/sembuf.h -#opt/MACHINE-uClibc/usr/include/asm/serial.h -#opt/MACHINE-uClibc/usr/include/asm/shmbuf.h -#opt/MACHINE-uClibc/usr/include/asm/shmparam.h -#opt/MACHINE-uClibc/usr/include/asm/sigcontext.h -#opt/MACHINE-uClibc/usr/include/asm/siginfo.h -#opt/MACHINE-uClibc/usr/include/asm/socket.h -#opt/MACHINE-uClibc/usr/include/asm/sockios.h -#opt/MACHINE-uClibc/usr/include/asm/spinlock.h -#opt/MACHINE-uClibc/usr/include/asm/srat.h -#opt/MACHINE-uClibc/usr/include/asm/stat.h -#opt/MACHINE-uClibc/usr/include/asm/suspend.h -#opt/MACHINE-uClibc/usr/include/asm/system.h -#opt/MACHINE-uClibc/usr/include/asm/termbits.h -#opt/MACHINE-uClibc/usr/include/asm/termios.h -#opt/MACHINE-uClibc/usr/include/asm/timer.h -#opt/MACHINE-uClibc/usr/include/asm/timex.h -#opt/MACHINE-uClibc/usr/include/asm/tlbflush.h -#opt/MACHINE-uClibc/usr/include/asm/types.h -#opt/MACHINE-uClibc/usr/include/asm/ucontext.h -#opt/MACHINE-uClibc/usr/include/asm/unaligned.h -#opt/MACHINE-uClibc/usr/include/asm/unistd.h -#opt/MACHINE-uClibc/usr/include/asm/user.h -#opt/MACHINE-uClibc/usr/include/asm/vga.h -#opt/MACHINE-uClibc/usr/include/asm/vic.h -#opt/MACHINE-uClibc/usr/include/asm/vm86.h -#opt/MACHINE-uClibc/usr/include/asm/voyager.h -#opt/MACHINE-uClibc/usr/include/linux -#opt/MACHINE-uClibc/usr/include/linux/8250_pci.h -#opt/MACHINE-uClibc/usr/include/linux/a.out.h -#opt/MACHINE-uClibc/usr/include/linux/acct.h -#opt/MACHINE-uClibc/usr/include/linux/acpi.h -#opt/MACHINE-uClibc/usr/include/linux/adb.h -#opt/MACHINE-uClibc/usr/include/linux/adfs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/adfs_fs_sb.h -#opt/MACHINE-uClibc/usr/include/linux/affs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/affs_hardblocks.h -#opt/MACHINE-uClibc/usr/include/linux/agpgart.h -#opt/MACHINE-uClibc/usr/include/linux/aio.h -#opt/MACHINE-uClibc/usr/include/linux/aio_abi.h -#opt/MACHINE-uClibc/usr/include/linux/amifd.h -#opt/MACHINE-uClibc/usr/include/linux/amifdreg.h -#opt/MACHINE-uClibc/usr/include/linux/amigaffs.h -#opt/MACHINE-uClibc/usr/include/linux/apm_bios.h -#opt/MACHINE-uClibc/usr/include/linux/ata.h -#opt/MACHINE-uClibc/usr/include/linux/atalk.h -#opt/MACHINE-uClibc/usr/include/linux/atm.h -#opt/MACHINE-uClibc/usr/include/linux/atm_eni.h -#opt/MACHINE-uClibc/usr/include/linux/atm_he.h -#opt/MACHINE-uClibc/usr/include/linux/atm_idt77105.h -#opt/MACHINE-uClibc/usr/include/linux/atm_nicstar.h -#opt/MACHINE-uClibc/usr/include/linux/atm_suni.h -#opt/MACHINE-uClibc/usr/include/linux/atm_tcp.h -#opt/MACHINE-uClibc/usr/include/linux/atm_zatm.h -#opt/MACHINE-uClibc/usr/include/linux/atmapi.h -#opt/MACHINE-uClibc/usr/include/linux/atmarp.h -#opt/MACHINE-uClibc/usr/include/linux/atmbr2684.h -#opt/MACHINE-uClibc/usr/include/linux/atmclip.h -#opt/MACHINE-uClibc/usr/include/linux/atmdev.h -#opt/MACHINE-uClibc/usr/include/linux/atmioc.h -#opt/MACHINE-uClibc/usr/include/linux/atmlec.h -#opt/MACHINE-uClibc/usr/include/linux/atmmpc.h -#opt/MACHINE-uClibc/usr/include/linux/atmppp.h -#opt/MACHINE-uClibc/usr/include/linux/atmsap.h -#opt/MACHINE-uClibc/usr/include/linux/atmsvc.h -#opt/MACHINE-uClibc/usr/include/linux/audit.h -#opt/MACHINE-uClibc/usr/include/linux/auto_fs.h -#opt/MACHINE-uClibc/usr/include/linux/auto_fs4.h -#opt/MACHINE-uClibc/usr/include/linux/autoconf.h -#opt/MACHINE-uClibc/usr/include/linux/awe_voice.h -#opt/MACHINE-uClibc/usr/include/linux/ax25.h -#opt/MACHINE-uClibc/usr/include/linux/b1lli.h -#opt/MACHINE-uClibc/usr/include/linux/backing-dev.h -#opt/MACHINE-uClibc/usr/include/linux/backlight.h -#opt/MACHINE-uClibc/usr/include/linux/baycom.h -#opt/MACHINE-uClibc/usr/include/linux/bcd.h -#opt/MACHINE-uClibc/usr/include/linux/bfs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/binfmts.h -#opt/MACHINE-uClibc/usr/include/linux/bitmap.h -#opt/MACHINE-uClibc/usr/include/linux/bitops.h -#opt/MACHINE-uClibc/usr/include/linux/blkpg.h -#opt/MACHINE-uClibc/usr/include/linux/blockgroup_lock.h -#opt/MACHINE-uClibc/usr/include/linux/bootmem.h -#opt/MACHINE-uClibc/usr/include/linux/bpqether.h -#opt/MACHINE-uClibc/usr/include/linux/byteorder -#opt/MACHINE-uClibc/usr/include/linux/byteorder/big_endian.h -#opt/MACHINE-uClibc/usr/include/linux/byteorder/generic.h -#opt/MACHINE-uClibc/usr/include/linux/byteorder/little_endian.h -#opt/MACHINE-uClibc/usr/include/linux/byteorder/pdp_endian.h -#opt/MACHINE-uClibc/usr/include/linux/byteorder/swab.h -#opt/MACHINE-uClibc/usr/include/linux/byteorder/swabb.h -#opt/MACHINE-uClibc/usr/include/linux/cache.h -#opt/MACHINE-uClibc/usr/include/linux/capability.h -#opt/MACHINE-uClibc/usr/include/linux/capi.h -#opt/MACHINE-uClibc/usr/include/linux/cciss_ioctl.h -#opt/MACHINE-uClibc/usr/include/linux/cd1400.h -#opt/MACHINE-uClibc/usr/include/linux/cdk.h -#opt/MACHINE-uClibc/usr/include/linux/cdrom.h -#opt/MACHINE-uClibc/usr/include/linux/circ_buf.h -#opt/MACHINE-uClibc/usr/include/linux/cobalt-nvram.h -#opt/MACHINE-uClibc/usr/include/linux/coda.h -#opt/MACHINE-uClibc/usr/include/linux/coda_proc.h -#opt/MACHINE-uClibc/usr/include/linux/coda_psdev.h -#opt/MACHINE-uClibc/usr/include/linux/coff.h -#opt/MACHINE-uClibc/usr/include/linux/com20020.h -#opt/MACHINE-uClibc/usr/include/linux/compat.h -#opt/MACHINE-uClibc/usr/include/linux/compat_ioctl.h -#opt/MACHINE-uClibc/usr/include/linux/compiler.h -#opt/MACHINE-uClibc/usr/include/linux/comstats.h -#opt/MACHINE-uClibc/usr/include/linux/config.h -#opt/MACHINE-uClibc/usr/include/linux/console.h -#opt/MACHINE-uClibc/usr/include/linux/console_struct.h -#opt/MACHINE-uClibc/usr/include/linux/consolemap.h -#opt/MACHINE-uClibc/usr/include/linux/cpu.h -#opt/MACHINE-uClibc/usr/include/linux/cpufreq.h -#opt/MACHINE-uClibc/usr/include/linux/cramfs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/cramfs_fs_sb.h -#opt/MACHINE-uClibc/usr/include/linux/crc32.h -#opt/MACHINE-uClibc/usr/include/linux/crypto.h -#opt/MACHINE-uClibc/usr/include/linux/ctype.h -#opt/MACHINE-uClibc/usr/include/linux/cuda.h -#opt/MACHINE-uClibc/usr/include/linux/cyclades.h -#opt/MACHINE-uClibc/usr/include/linux/cycx_cfm.h -#opt/MACHINE-uClibc/usr/include/linux/cycx_drv.h -#opt/MACHINE-uClibc/usr/include/linux/cycx_x25.h -#opt/MACHINE-uClibc/usr/include/linux/devfs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/devfs_fs_kernel.h -#opt/MACHINE-uClibc/usr/include/linux/device-mapper.h -#opt/MACHINE-uClibc/usr/include/linux/device.h -#opt/MACHINE-uClibc/usr/include/linux/devpts_fs.h -#opt/MACHINE-uClibc/usr/include/linux/dirent.h -#opt/MACHINE-uClibc/usr/include/linux/divert.h -#opt/MACHINE-uClibc/usr/include/linux/dm-ioctl.h -#opt/MACHINE-uClibc/usr/include/linux/dn.h -#opt/MACHINE-uClibc/usr/include/linux/dnotify.h -#opt/MACHINE-uClibc/usr/include/linux/dqblk_v1.h -#opt/MACHINE-uClibc/usr/include/linux/dqblk_v2.h -#opt/MACHINE-uClibc/usr/include/linux/dqblk_xfs.h -#opt/MACHINE-uClibc/usr/include/linux/dtlk.h -#opt/MACHINE-uClibc/usr/include/linux/dvb -#opt/MACHINE-uClibc/usr/include/linux/dvb/audio.h -#opt/MACHINE-uClibc/usr/include/linux/dvb/ca.h -#opt/MACHINE-uClibc/usr/include/linux/dvb/dmx.h -#opt/MACHINE-uClibc/usr/include/linux/dvb/frontend.h -#opt/MACHINE-uClibc/usr/include/linux/dvb/net.h -#opt/MACHINE-uClibc/usr/include/linux/dvb/osd.h -#opt/MACHINE-uClibc/usr/include/linux/dvb/version.h -#opt/MACHINE-uClibc/usr/include/linux/dvb/video.h -#opt/MACHINE-uClibc/usr/include/linux/eeprom.h -#opt/MACHINE-uClibc/usr/include/linux/efi.h -#opt/MACHINE-uClibc/usr/include/linux/efs_dir.h -#opt/MACHINE-uClibc/usr/include/linux/efs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/efs_fs_i.h -#opt/MACHINE-uClibc/usr/include/linux/efs_fs_sb.h -#opt/MACHINE-uClibc/usr/include/linux/efs_vh.h -#opt/MACHINE-uClibc/usr/include/linux/eisa.h -#opt/MACHINE-uClibc/usr/include/linux/elevator.h -#opt/MACHINE-uClibc/usr/include/linux/elf-fdpic.h -#opt/MACHINE-uClibc/usr/include/linux/elf.h -#opt/MACHINE-uClibc/usr/include/linux/elfcore.h -#opt/MACHINE-uClibc/usr/include/linux/err.h -#opt/MACHINE-uClibc/usr/include/linux/err_kernel_only.h -#opt/MACHINE-uClibc/usr/include/linux/errno.h -#opt/MACHINE-uClibc/usr/include/linux/errqueue.h -#opt/MACHINE-uClibc/usr/include/linux/ethtool.h -#opt/MACHINE-uClibc/usr/include/linux/eventpoll.h -#opt/MACHINE-uClibc/usr/include/linux/ext2_fs.h -#opt/MACHINE-uClibc/usr/include/linux/ext3_fs.h -#opt/MACHINE-uClibc/usr/include/linux/ext3_jbd.h -#opt/MACHINE-uClibc/usr/include/linux/fadvise.h -#opt/MACHINE-uClibc/usr/include/linux/fb.h -#opt/MACHINE-uClibc/usr/include/linux/fcntl.h -#opt/MACHINE-uClibc/usr/include/linux/fd.h -#opt/MACHINE-uClibc/usr/include/linux/fd1772.h -#opt/MACHINE-uClibc/usr/include/linux/fdreg.h -#opt/MACHINE-uClibc/usr/include/linux/file.h -#opt/MACHINE-uClibc/usr/include/linux/filter.h -#opt/MACHINE-uClibc/usr/include/linux/firmware.h -#opt/MACHINE-uClibc/usr/include/linux/flat.h -#opt/MACHINE-uClibc/usr/include/linux/font.h -#opt/MACHINE-uClibc/usr/include/linux/fs.h -#opt/MACHINE-uClibc/usr/include/linux/fs_struct.h -#opt/MACHINE-uClibc/usr/include/linux/ftape-header-segment.h -#opt/MACHINE-uClibc/usr/include/linux/ftape-vendors.h -#opt/MACHINE-uClibc/usr/include/linux/ftape.h -#opt/MACHINE-uClibc/usr/include/linux/futex.h -#opt/MACHINE-uClibc/usr/include/linux/gameport.h -#opt/MACHINE-uClibc/usr/include/linux/gen_stats.h -#opt/MACHINE-uClibc/usr/include/linux/generic_serial.h -#opt/MACHINE-uClibc/usr/include/linux/genhd.h -#opt/MACHINE-uClibc/usr/include/linux/gfp.h -#opt/MACHINE-uClibc/usr/include/linux/hash.h -#opt/MACHINE-uClibc/usr/include/linux/hayesesp.h -#opt/MACHINE-uClibc/usr/include/linux/hdlc -#opt/MACHINE-uClibc/usr/include/linux/hdlc.h -#opt/MACHINE-uClibc/usr/include/linux/hdlc/ioctl.h -#opt/MACHINE-uClibc/usr/include/linux/hdlcdrv.h -#opt/MACHINE-uClibc/usr/include/linux/hdreg.h -#opt/MACHINE-uClibc/usr/include/linux/hdsmart.h -#opt/MACHINE-uClibc/usr/include/linux/hiddev.h -#opt/MACHINE-uClibc/usr/include/linux/highuid.h -#opt/MACHINE-uClibc/usr/include/linux/hpfs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/hysdn_if.h -#opt/MACHINE-uClibc/usr/include/linux/i2c-algo-bit.h -#opt/MACHINE-uClibc/usr/include/linux/i2c-algo-ite.h -#opt/MACHINE-uClibc/usr/include/linux/i2c-algo-pcf.h -#opt/MACHINE-uClibc/usr/include/linux/i2c-algo-sgi.h -#opt/MACHINE-uClibc/usr/include/linux/i2c-algo-sibyte.h -#opt/MACHINE-uClibc/usr/include/linux/i2c-dev.h -#opt/MACHINE-uClibc/usr/include/linux/i2c-id.h -#opt/MACHINE-uClibc/usr/include/linux/i2c-sensor.h -#opt/MACHINE-uClibc/usr/include/linux/i2c-vid.h -#opt/MACHINE-uClibc/usr/include/linux/i2c.h -#opt/MACHINE-uClibc/usr/include/linux/i2o-dev.h -#opt/MACHINE-uClibc/usr/include/linux/i8k.h -#opt/MACHINE-uClibc/usr/include/linux/ibmtr.h -#opt/MACHINE-uClibc/usr/include/linux/icmp.h -#opt/MACHINE-uClibc/usr/include/linux/icmpv6.h -#opt/MACHINE-uClibc/usr/include/linux/ide.h -#opt/MACHINE-uClibc/usr/include/linux/idr.h -#opt/MACHINE-uClibc/usr/include/linux/if.h -#opt/MACHINE-uClibc/usr/include/linux/if_arcnet.h -#opt/MACHINE-uClibc/usr/include/linux/if_arp.h -#opt/MACHINE-uClibc/usr/include/linux/if_bonding.h -#opt/MACHINE-uClibc/usr/include/linux/if_bridge.h -#opt/MACHINE-uClibc/usr/include/linux/if_cablemodem.h -#opt/MACHINE-uClibc/usr/include/linux/if_ec.h -#opt/MACHINE-uClibc/usr/include/linux/if_eql.h -#opt/MACHINE-uClibc/usr/include/linux/if_ether.h -#opt/MACHINE-uClibc/usr/include/linux/if_fc.h -#opt/MACHINE-uClibc/usr/include/linux/if_fddi.h -#opt/MACHINE-uClibc/usr/include/linux/if_frad.h -#opt/MACHINE-uClibc/usr/include/linux/if_hippi.h -#opt/MACHINE-uClibc/usr/include/linux/if_infiniband.h -#opt/MACHINE-uClibc/usr/include/linux/if_ltalk.h -#opt/MACHINE-uClibc/usr/include/linux/if_packet.h -#opt/MACHINE-uClibc/usr/include/linux/if_plip.h -#opt/MACHINE-uClibc/usr/include/linux/if_ppp.h -#opt/MACHINE-uClibc/usr/include/linux/if_pppox.h -#opt/MACHINE-uClibc/usr/include/linux/if_shaper.h -#opt/MACHINE-uClibc/usr/include/linux/if_slip.h -#opt/MACHINE-uClibc/usr/include/linux/if_strip.h -#opt/MACHINE-uClibc/usr/include/linux/if_tr.h -#opt/MACHINE-uClibc/usr/include/linux/if_tun.h -#opt/MACHINE-uClibc/usr/include/linux/if_tunnel.h -#opt/MACHINE-uClibc/usr/include/linux/if_vlan.h -#opt/MACHINE-uClibc/usr/include/linux/if_wanpipe.h -#opt/MACHINE-uClibc/usr/include/linux/if_wanpipe_common.h -#opt/MACHINE-uClibc/usr/include/linux/igmp.h -#opt/MACHINE-uClibc/usr/include/linux/in.h -#opt/MACHINE-uClibc/usr/include/linux/in6.h -#opt/MACHINE-uClibc/usr/include/linux/in_route.h -#opt/MACHINE-uClibc/usr/include/linux/inetdevice.h -#opt/MACHINE-uClibc/usr/include/linux/init.h -#opt/MACHINE-uClibc/usr/include/linux/init_task.h -#opt/MACHINE-uClibc/usr/include/linux/initrd.h -#opt/MACHINE-uClibc/usr/include/linux/inotify.h -#opt/MACHINE-uClibc/usr/include/linux/input.h -#opt/MACHINE-uClibc/usr/include/linux/interrupt.h -#opt/MACHINE-uClibc/usr/include/linux/ioctl.h -#opt/MACHINE-uClibc/usr/include/linux/ioctl32.h -#opt/MACHINE-uClibc/usr/include/linux/ioport.h -#opt/MACHINE-uClibc/usr/include/linux/ip.h -#opt/MACHINE-uClibc/usr/include/linux/ip6_tunnel.h -#opt/MACHINE-uClibc/usr/include/linux/ip_mp_alg.h -#opt/MACHINE-uClibc/usr/include/linux/ipc.h -#opt/MACHINE-uClibc/usr/include/linux/ipmi.h -#opt/MACHINE-uClibc/usr/include/linux/ipmi_msgdefs.h -#opt/MACHINE-uClibc/usr/include/linux/ipmi_smi.h -#opt/MACHINE-uClibc/usr/include/linux/ipsec.h -#opt/MACHINE-uClibc/usr/include/linux/ipv6.h -#opt/MACHINE-uClibc/usr/include/linux/ipv6_route.h -#opt/MACHINE-uClibc/usr/include/linux/ipx.h -#opt/MACHINE-uClibc/usr/include/linux/irda.h -#opt/MACHINE-uClibc/usr/include/linux/irq.h -#opt/MACHINE-uClibc/usr/include/linux/irq_cpustat.h -#opt/MACHINE-uClibc/usr/include/linux/isapnp.h -#opt/MACHINE-uClibc/usr/include/linux/isdn -#opt/MACHINE-uClibc/usr/include/linux/isdn.h -#opt/MACHINE-uClibc/usr/include/linux/isdn/capicmd.h -#opt/MACHINE-uClibc/usr/include/linux/isdn/capilli.h -#opt/MACHINE-uClibc/usr/include/linux/isdn/capiutil.h -#opt/MACHINE-uClibc/usr/include/linux/isdn/tpam.h -#opt/MACHINE-uClibc/usr/include/linux/isdn_divertif.h -#opt/MACHINE-uClibc/usr/include/linux/isdn_ppp.h -#opt/MACHINE-uClibc/usr/include/linux/isdnif.h -#opt/MACHINE-uClibc/usr/include/linux/isicom.h -#opt/MACHINE-uClibc/usr/include/linux/iso_fs.h -#opt/MACHINE-uClibc/usr/include/linux/istallion.h -#opt/MACHINE-uClibc/usr/include/linux/ite_gpio.h -#opt/MACHINE-uClibc/usr/include/linux/ixjuser.h -#opt/MACHINE-uClibc/usr/include/linux/jbd.h -#opt/MACHINE-uClibc/usr/include/linux/jffs.h -#opt/MACHINE-uClibc/usr/include/linux/jffs2.h -#opt/MACHINE-uClibc/usr/include/linux/jffs2_fs_sb.h -#opt/MACHINE-uClibc/usr/include/linux/jhash.h -#opt/MACHINE-uClibc/usr/include/linux/jiffies.h -#opt/MACHINE-uClibc/usr/include/linux/journal-head.h -#opt/MACHINE-uClibc/usr/include/linux/joystick.h -#opt/MACHINE-uClibc/usr/include/linux/kallsyms.h -#opt/MACHINE-uClibc/usr/include/linux/kbd_diacr.h -#opt/MACHINE-uClibc/usr/include/linux/kbd_kern.h -#opt/MACHINE-uClibc/usr/include/linux/kd.h -#opt/MACHINE-uClibc/usr/include/linux/kdev_t.h -#opt/MACHINE-uClibc/usr/include/linux/kernel.h -#opt/MACHINE-uClibc/usr/include/linux/kernel_stat.h -#opt/MACHINE-uClibc/usr/include/linux/kernelcapi.h -#opt/MACHINE-uClibc/usr/include/linux/keyboard.h -#opt/MACHINE-uClibc/usr/include/linux/keyctl.h -#opt/MACHINE-uClibc/usr/include/linux/kmalloc_sizes.h -#opt/MACHINE-uClibc/usr/include/linux/kmod.h -#opt/MACHINE-uClibc/usr/include/linux/kprobes.h -#opt/MACHINE-uClibc/usr/include/linux/lapb.h -#opt/MACHINE-uClibc/usr/include/linux/lcd.h -#opt/MACHINE-uClibc/usr/include/linux/libata.h -#opt/MACHINE-uClibc/usr/include/linux/libps2.h -#opt/MACHINE-uClibc/usr/include/linux/limits.h -#opt/MACHINE-uClibc/usr/include/linux/linkage.h -#opt/MACHINE-uClibc/usr/include/linux/linux_logo.h -#opt/MACHINE-uClibc/usr/include/linux/list.h -#opt/MACHINE-uClibc/usr/include/linux/llc.h -#opt/MACHINE-uClibc/usr/include/linux/lockd -#opt/MACHINE-uClibc/usr/include/linux/lockd/bind.h -#opt/MACHINE-uClibc/usr/include/linux/lockd/debug.h -#opt/MACHINE-uClibc/usr/include/linux/lockd/nlm.h -#opt/MACHINE-uClibc/usr/include/linux/lockd/share.h -#opt/MACHINE-uClibc/usr/include/linux/lockd/sm_inter.h -#opt/MACHINE-uClibc/usr/include/linux/lockd/xdr.h -#opt/MACHINE-uClibc/usr/include/linux/lockd/xdr4.h -#opt/MACHINE-uClibc/usr/include/linux/loop.h -#opt/MACHINE-uClibc/usr/include/linux/lp.h -#opt/MACHINE-uClibc/usr/include/linux/major.h -#opt/MACHINE-uClibc/usr/include/linux/matroxfb.h -#opt/MACHINE-uClibc/usr/include/linux/mbcache.h -#opt/MACHINE-uClibc/usr/include/linux/mc6821.h -#opt/MACHINE-uClibc/usr/include/linux/mca-legacy.h -#opt/MACHINE-uClibc/usr/include/linux/mca.h -#opt/MACHINE-uClibc/usr/include/linux/mempool.h -#opt/MACHINE-uClibc/usr/include/linux/meye.h -#opt/MACHINE-uClibc/usr/include/linux/mii.h -#opt/MACHINE-uClibc/usr/include/linux/minix_fs.h -#opt/MACHINE-uClibc/usr/include/linux/miscdevice.h -#opt/MACHINE-uClibc/usr/include/linux/mm.h -#opt/MACHINE-uClibc/usr/include/linux/mm_inline.h -#opt/MACHINE-uClibc/usr/include/linux/mman.h -#opt/MACHINE-uClibc/usr/include/linux/mod_devicetable.h -#opt/MACHINE-uClibc/usr/include/linux/module.h -#opt/MACHINE-uClibc/usr/include/linux/moduleloader.h -#opt/MACHINE-uClibc/usr/include/linux/moduleparam.h -#opt/MACHINE-uClibc/usr/include/linux/mount.h -#opt/MACHINE-uClibc/usr/include/linux/mroute.h -#opt/MACHINE-uClibc/usr/include/linux/msdos_fs.h -#opt/MACHINE-uClibc/usr/include/linux/msg.h -#opt/MACHINE-uClibc/usr/include/linux/mtd -#opt/MACHINE-uClibc/usr/include/linux/mtd/blktrans.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/cfi.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/cfi_endian.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/compatmac.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/concat.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/doc2000.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/flashchip.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/ftl.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/gen_probe.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/iflash.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/jedec.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/map.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/nand.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/nand_ecc.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/nftl.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/partitions.h -#opt/MACHINE-uClibc/usr/include/linux/mtd/pmc551.h -#opt/MACHINE-uClibc/usr/include/linux/mtio.h -#opt/MACHINE-uClibc/usr/include/linux/n_r3964.h -#opt/MACHINE-uClibc/usr/include/linux/namei.h -#opt/MACHINE-uClibc/usr/include/linux/nbd.h -#opt/MACHINE-uClibc/usr/include/linux/ncp.h -#opt/MACHINE-uClibc/usr/include/linux/ncp_fs.h -#opt/MACHINE-uClibc/usr/include/linux/ncp_mount.h -#opt/MACHINE-uClibc/usr/include/linux/ncp_no.h -#opt/MACHINE-uClibc/usr/include/linux/net.h -#opt/MACHINE-uClibc/usr/include/linux/netdevice.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_arp -#opt/MACHINE-uClibc/usr/include/linux/netfilter_arp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_arp/arp_tables.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_arp/arpt_mangle.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_802_3.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_among.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_arp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_arpreply.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_ip.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_limit.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_log.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_mark_m.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_mark_t.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_nat.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_pkttype.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_redirect.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_stp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_ulog.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebt_vlan.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_bridge/ebtables.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_decnet.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4 -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_amanda.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_core.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_ftp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_helper.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_icmp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_irc.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_protocol.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_sctp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_tcp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_tftp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_conntrack_tuple.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_nat.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_nat_core.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_nat_helper.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_nat_protocol.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_nat_rule.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_queue.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ip_tables.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_CLASSIFY.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_CLUSTERIP.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_CONNMARK.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_DSCP.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_ECN.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_LOG.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_MARK.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_REJECT.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_SAME.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_TCPMSS.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_TOS.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_ULOG.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_addrtype.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_ah.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_comment.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_connmark.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_conntrack.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_dscp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_ecn.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_esp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_hashlimit.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_helper.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_iprange.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_length.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_limit.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_mac.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_mark.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_multiport.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_owner.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_physdev.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_pkttype.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_realm.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_recent.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_sctp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_state.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_tcpmss.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_tos.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/ipt_ttl.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/listhelp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv4/lockhelp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6 -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6_tables.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_LOG.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_MARK.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_ah.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_esp.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_frag.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_hl.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_ipv6header.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_length.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_limit.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_mac.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_mark.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_multiport.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_opts.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_owner.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_physdev.h -#opt/MACHINE-uClibc/usr/include/linux/netfilter_ipv6/ip6t_rt.h -#opt/MACHINE-uClibc/usr/include/linux/netlink.h -#opt/MACHINE-uClibc/usr/include/linux/netrom.h -#opt/MACHINE-uClibc/usr/include/linux/nfs.h -#opt/MACHINE-uClibc/usr/include/linux/nfs2.h -#opt/MACHINE-uClibc/usr/include/linux/nfs3.h -#opt/MACHINE-uClibc/usr/include/linux/nfs4.h -#opt/MACHINE-uClibc/usr/include/linux/nfs4_mount.h -#opt/MACHINE-uClibc/usr/include/linux/nfs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/nfs_fs_i.h -#opt/MACHINE-uClibc/usr/include/linux/nfs_fs_sb.h -#opt/MACHINE-uClibc/usr/include/linux/nfs_idmap.h -#opt/MACHINE-uClibc/usr/include/linux/nfs_mount.h -#opt/MACHINE-uClibc/usr/include/linux/nfs_xdr.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd -#opt/MACHINE-uClibc/usr/include/linux/nfsd/const.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/debug.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/export.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/interface.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/nfsd.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/nfsfh.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/state.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/stats.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/syscall.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/xdr.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/xdr3.h -#opt/MACHINE-uClibc/usr/include/linux/nfsd/xdr4.h -#opt/MACHINE-uClibc/usr/include/linux/nls.h -#opt/MACHINE-uClibc/usr/include/linux/nmi.h -#opt/MACHINE-uClibc/usr/include/linux/node.h -#opt/MACHINE-uClibc/usr/include/linux/notifier.h -#opt/MACHINE-uClibc/usr/include/linux/nubus.h -#opt/MACHINE-uClibc/usr/include/linux/numa.h -#opt/MACHINE-uClibc/usr/include/linux/nvram.h -#opt/MACHINE-uClibc/usr/include/linux/openprom_fs.h -#opt/MACHINE-uClibc/usr/include/linux/oprofile.h -#opt/MACHINE-uClibc/usr/include/linux/pagemap.h -#opt/MACHINE-uClibc/usr/include/linux/pagevec.h -#opt/MACHINE-uClibc/usr/include/linux/param.h -#opt/MACHINE-uClibc/usr/include/linux/parport.h -#opt/MACHINE-uClibc/usr/include/linux/parport_pc.h -#opt/MACHINE-uClibc/usr/include/linux/parser.h -#opt/MACHINE-uClibc/usr/include/linux/patchkey.h -#opt/MACHINE-uClibc/usr/include/linux/pci-dynids.h -#opt/MACHINE-uClibc/usr/include/linux/pci.h -#opt/MACHINE-uClibc/usr/include/linux/pci_ids.h -#opt/MACHINE-uClibc/usr/include/linux/pcieport_if.h -#opt/MACHINE-uClibc/usr/include/linux/percpu.h -#opt/MACHINE-uClibc/usr/include/linux/percpu_counter.h -#opt/MACHINE-uClibc/usr/include/linux/personality.h -#opt/MACHINE-uClibc/usr/include/linux/pfkeyv2.h -#opt/MACHINE-uClibc/usr/include/linux/pg.h -#opt/MACHINE-uClibc/usr/include/linux/pipe_fs_i.h -#opt/MACHINE-uClibc/usr/include/linux/pkt_cls.h -#opt/MACHINE-uClibc/usr/include/linux/pkt_sched.h -#opt/MACHINE-uClibc/usr/include/linux/pktcdvd.h -#opt/MACHINE-uClibc/usr/include/linux/pmu.h -#opt/MACHINE-uClibc/usr/include/linux/poll.h -#opt/MACHINE-uClibc/usr/include/linux/posix-timers.h -#opt/MACHINE-uClibc/usr/include/linux/posix_acl.h -#opt/MACHINE-uClibc/usr/include/linux/posix_acl_xattr.h -#opt/MACHINE-uClibc/usr/include/linux/posix_types.h -#opt/MACHINE-uClibc/usr/include/linux/ppdev.h -#opt/MACHINE-uClibc/usr/include/linux/ppp-comp.h -#opt/MACHINE-uClibc/usr/include/linux/ppp_channel.h -#opt/MACHINE-uClibc/usr/include/linux/ppp_defs.h -#opt/MACHINE-uClibc/usr/include/linux/prctl.h -#opt/MACHINE-uClibc/usr/include/linux/preempt.h -#opt/MACHINE-uClibc/usr/include/linux/prefetch.h -#opt/MACHINE-uClibc/usr/include/linux/proc_fs.h -#opt/MACHINE-uClibc/usr/include/linux/ps2esdi.h -#opt/MACHINE-uClibc/usr/include/linux/ptrace.h -#opt/MACHINE-uClibc/usr/include/linux/qic117.h -#opt/MACHINE-uClibc/usr/include/linux/qnx4_fs.h -#opt/MACHINE-uClibc/usr/include/linux/qnxtypes.h -#opt/MACHINE-uClibc/usr/include/linux/quota.h -#opt/MACHINE-uClibc/usr/include/linux/quotaio_v1.h -#opt/MACHINE-uClibc/usr/include/linux/quotaio_v2.h -#opt/MACHINE-uClibc/usr/include/linux/radeonfb.h -#opt/MACHINE-uClibc/usr/include/linux/raid -#opt/MACHINE-uClibc/usr/include/linux/raid/linear.h -#opt/MACHINE-uClibc/usr/include/linux/raid/md.h -#opt/MACHINE-uClibc/usr/include/linux/raid/md_p.h -#opt/MACHINE-uClibc/usr/include/linux/raid/md_u.h -#opt/MACHINE-uClibc/usr/include/linux/raid/multipath.h -#opt/MACHINE-uClibc/usr/include/linux/raid/raid0.h -#opt/MACHINE-uClibc/usr/include/linux/raid/raid1.h -#opt/MACHINE-uClibc/usr/include/linux/raid/raid5.h -#opt/MACHINE-uClibc/usr/include/linux/raid/xor.h -#opt/MACHINE-uClibc/usr/include/linux/random.h -#opt/MACHINE-uClibc/usr/include/linux/raw.h -#opt/MACHINE-uClibc/usr/include/linux/rbtree.h -#opt/MACHINE-uClibc/usr/include/linux/reboot.h -#opt/MACHINE-uClibc/usr/include/linux/reiserfs_acl.h -#opt/MACHINE-uClibc/usr/include/linux/reiserfs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/reiserfs_xattr.h -#opt/MACHINE-uClibc/usr/include/linux/resource.h -#opt/MACHINE-uClibc/usr/include/linux/romfs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/root_dev.h -#opt/MACHINE-uClibc/usr/include/linux/rose.h -#opt/MACHINE-uClibc/usr/include/linux/route.h -#opt/MACHINE-uClibc/usr/include/linux/rtc.h -#opt/MACHINE-uClibc/usr/include/linux/rtnetlink.h -#opt/MACHINE-uClibc/usr/include/linux/sc26198.h -#opt/MACHINE-uClibc/usr/include/linux/scc.h -#opt/MACHINE-uClibc/usr/include/linux/sched.h -#opt/MACHINE-uClibc/usr/include/linux/sctp.h -#opt/MACHINE-uClibc/usr/include/linux/scx200.h -#opt/MACHINE-uClibc/usr/include/linux/scx200_gpio.h -#opt/MACHINE-uClibc/usr/include/linux/sdla.h -#opt/MACHINE-uClibc/usr/include/linux/sdla_asy.h -#opt/MACHINE-uClibc/usr/include/linux/sdla_chdlc.h -#opt/MACHINE-uClibc/usr/include/linux/sdla_fr.h -#opt/MACHINE-uClibc/usr/include/linux/sdla_ppp.h -#opt/MACHINE-uClibc/usr/include/linux/sdla_x25.h -#opt/MACHINE-uClibc/usr/include/linux/sdladrv.h -#opt/MACHINE-uClibc/usr/include/linux/sdlapci.h -#opt/MACHINE-uClibc/usr/include/linux/sdlasfm.h -#opt/MACHINE-uClibc/usr/include/linux/securebits.h -#opt/MACHINE-uClibc/usr/include/linux/security.h -#opt/MACHINE-uClibc/usr/include/linux/selection.h -#opt/MACHINE-uClibc/usr/include/linux/selinux_netlink.h -#opt/MACHINE-uClibc/usr/include/linux/sem.h -#opt/MACHINE-uClibc/usr/include/linux/seqlock.h -#opt/MACHINE-uClibc/usr/include/linux/serial.h -#opt/MACHINE-uClibc/usr/include/linux/serial167.h -#opt/MACHINE-uClibc/usr/include/linux/serialP.h -#opt/MACHINE-uClibc/usr/include/linux/serial_8250.h -#opt/MACHINE-uClibc/usr/include/linux/serial_core.h -#opt/MACHINE-uClibc/usr/include/linux/serial_reg.h -#opt/MACHINE-uClibc/usr/include/linux/serio.h -#opt/MACHINE-uClibc/usr/include/linux/shm.h -#opt/MACHINE-uClibc/usr/include/linux/siginfo.h -#opt/MACHINE-uClibc/usr/include/linux/signal.h -#opt/MACHINE-uClibc/usr/include/linux/skbuff.h -#opt/MACHINE-uClibc/usr/include/linux/smb.h -#opt/MACHINE-uClibc/usr/include/linux/smb_fs.h -#opt/MACHINE-uClibc/usr/include/linux/smb_mount.h -#opt/MACHINE-uClibc/usr/include/linux/smbno.h -#opt/MACHINE-uClibc/usr/include/linux/smp_lock.h -#opt/MACHINE-uClibc/usr/include/linux/snmp.h -#opt/MACHINE-uClibc/usr/include/linux/socket.h -#opt/MACHINE-uClibc/usr/include/linux/sockios.h -#opt/MACHINE-uClibc/usr/include/linux/som.h -#opt/MACHINE-uClibc/usr/include/linux/sonet.h -#opt/MACHINE-uClibc/usr/include/linux/sonypi.h -#opt/MACHINE-uClibc/usr/include/linux/sound.h -#opt/MACHINE-uClibc/usr/include/linux/soundcard.h -#opt/MACHINE-uClibc/usr/include/linux/spinlock.h -#opt/MACHINE-uClibc/usr/include/linux/stallion.h -#opt/MACHINE-uClibc/usr/include/linux/stddef.h -#opt/MACHINE-uClibc/usr/include/linux/stringify.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/cache.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/clnt.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/debug.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/gss_asn1.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/gss_krb5.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/gss_spkm3.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/sched.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/stats.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/svc.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/svcsock.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/timer.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/types.h -#opt/MACHINE-uClibc/usr/include/linux/sunrpc/xprt.h -#opt/MACHINE-uClibc/usr/include/linux/superhyway.h -#opt/MACHINE-uClibc/usr/include/linux/suspend.h -#opt/MACHINE-uClibc/usr/include/linux/swap.h -#opt/MACHINE-uClibc/usr/include/linux/swapops.h -#opt/MACHINE-uClibc/usr/include/linux/synclink.h -#opt/MACHINE-uClibc/usr/include/linux/sys.h -#opt/MACHINE-uClibc/usr/include/linux/syscalls.h -#opt/MACHINE-uClibc/usr/include/linux/sysctl.h -#opt/MACHINE-uClibc/usr/include/linux/sysdev.h -#opt/MACHINE-uClibc/usr/include/linux/sysfs.h -#opt/MACHINE-uClibc/usr/include/linux/sysrq.h -#opt/MACHINE-uClibc/usr/include/linux/sysv_fs.h -#opt/MACHINE-uClibc/usr/include/linux/tc_act -#opt/MACHINE-uClibc/usr/include/linux/tc_act/tc_defact.h -#opt/MACHINE-uClibc/usr/include/linux/tc_act/tc_gact.h -#opt/MACHINE-uClibc/usr/include/linux/tc_act/tc_ipt.h -#opt/MACHINE-uClibc/usr/include/linux/tc_act/tc_mirred.h -#opt/MACHINE-uClibc/usr/include/linux/tc_act/tc_pedit.h -#opt/MACHINE-uClibc/usr/include/linux/tc_ematch -#opt/MACHINE-uClibc/usr/include/linux/tc_ematch/tc_em_cmp.h -#opt/MACHINE-uClibc/usr/include/linux/tc_ematch/tc_em_meta.h -#opt/MACHINE-uClibc/usr/include/linux/tc_ematch/tc_em_nbyte.h -#opt/MACHINE-uClibc/usr/include/linux/tcp.h -#opt/MACHINE-uClibc/usr/include/linux/tcp_diag.h -#opt/MACHINE-uClibc/usr/include/linux/telephony.h -#opt/MACHINE-uClibc/usr/include/linux/termios.h -#opt/MACHINE-uClibc/usr/include/linux/threads.h -#opt/MACHINE-uClibc/usr/include/linux/ticable.h -#opt/MACHINE-uClibc/usr/include/linux/time.h -#opt/MACHINE-uClibc/usr/include/linux/times.h -#opt/MACHINE-uClibc/usr/include/linux/timex.h -#opt/MACHINE-uClibc/usr/include/linux/tiocl.h -#opt/MACHINE-uClibc/usr/include/linux/toshiba.h -#opt/MACHINE-uClibc/usr/include/linux/tty.h -#opt/MACHINE-uClibc/usr/include/linux/types.h -#opt/MACHINE-uClibc/usr/include/linux/udf_fs.h -#opt/MACHINE-uClibc/usr/include/linux/udf_fs_i.h -#opt/MACHINE-uClibc/usr/include/linux/udf_fs_sb.h -#opt/MACHINE-uClibc/usr/include/linux/udp.h -#opt/MACHINE-uClibc/usr/include/linux/ufs_fs.h -#opt/MACHINE-uClibc/usr/include/linux/uinput.h -#opt/MACHINE-uClibc/usr/include/linux/uio.h -#opt/MACHINE-uClibc/usr/include/linux/ultrasound.h -#opt/MACHINE-uClibc/usr/include/linux/umem.h -#opt/MACHINE-uClibc/usr/include/linux/un.h -#opt/MACHINE-uClibc/usr/include/linux/unistd.h -#opt/MACHINE-uClibc/usr/include/linux/usb.h -#opt/MACHINE-uClibc/usr/include/linux/usb_cdc.h -#opt/MACHINE-uClibc/usr/include/linux/usb_ch9.h -#opt/MACHINE-uClibc/usr/include/linux/usb_gadgetfs.h -#opt/MACHINE-uClibc/usr/include/linux/usbdevice_fs.h -#opt/MACHINE-uClibc/usr/include/linux/user.h -#opt/MACHINE-uClibc/usr/include/linux/utime.h -#opt/MACHINE-uClibc/usr/include/linux/uts.h -#opt/MACHINE-uClibc/usr/include/linux/utsname.h -#opt/MACHINE-uClibc/usr/include/linux/version.h -#opt/MACHINE-uClibc/usr/include/linux/video_decoder.h -#opt/MACHINE-uClibc/usr/include/linux/video_encoder.h -#opt/MACHINE-uClibc/usr/include/linux/videodev.h -#opt/MACHINE-uClibc/usr/include/linux/videodev2.h -#opt/MACHINE-uClibc/usr/include/linux/videotext.h -#opt/MACHINE-uClibc/usr/include/linux/vmalloc.h -#opt/MACHINE-uClibc/usr/include/linux/vt.h -#opt/MACHINE-uClibc/usr/include/linux/vt_buffer.h -#opt/MACHINE-uClibc/usr/include/linux/vt_kern.h -#opt/MACHINE-uClibc/usr/include/linux/wait.h -#opt/MACHINE-uClibc/usr/include/linux/wanpipe.h -#opt/MACHINE-uClibc/usr/include/linux/wanrouter.h -#opt/MACHINE-uClibc/usr/include/linux/watchdog.h -#opt/MACHINE-uClibc/usr/include/linux/wavefront.h -#opt/MACHINE-uClibc/usr/include/linux/wireless.h -#opt/MACHINE-uClibc/usr/include/linux/workqueue.h -#opt/MACHINE-uClibc/usr/include/linux/x25.h -#opt/MACHINE-uClibc/usr/include/linux/xattr.h -#opt/MACHINE-uClibc/usr/include/linux/xattr_acl.h -#opt/MACHINE-uClibc/usr/include/linux/xfrm.h -#opt/MACHINE-uClibc/usr/include/linux/yam.h -#opt/MACHINE-uClibc/usr/include/linux/zftape.h -#opt/MACHINE-uClibc/usr/include/linux/zorro.h -#opt/MACHINE-uClibc/usr/include/linux/zorro_ids.h +#usr/include/mtd +#usr/include/mtd/inftl-user.h +#usr/include/mtd/mtd-abi.h +#usr/include/mtd/mtd-user.h +#usr/include/mtd/nftl-user.h +#usr/include/mtd/ubi-user.h +#usr/include/rdma +#usr/include/rdma/ib_user_mad.h +#usr/include/scsi +#usr/include/scsi/scsi.h +#usr/include/scsi/scsi_bsg_fc.h +#usr/include/scsi/scsi_netlink.h +#usr/include/scsi/scsi_netlink_fc.h +#usr/include/sound +#usr/include/sound/asequencer.h +#usr/include/sound/asound.h +#usr/include/sound/asound_fm.h +#usr/include/sound/emu10k1.h +#usr/include/sound/hdsp.h +#usr/include/sound/hdspm.h +#usr/include/sound/sb16_csp.h +#usr/include/sound/sfnt_info.h +#usr/include/sound/sscape_ioctl.h +#usr/include/video +#usr/include/video/edid.h +#usr/include/video/sisfb.h +#usr/include/video/uvesafb.h +#usr/include/xen +#usr/include/xen/evtchn.h diff --git a/config/rootfiles/common/mbr b/config/rootfiles/common/mbr index 29544b6..231e27d 100644 --- a/config/rootfiles/common/mbr +++ b/config/rootfiles/common/mbr @@ -1,3 +1,2 @@ -#usr/local/man/man8 -#usr/local/man/man8/install-mbr.8 -#usr/local/sbin/install-mbr +#usr/sbin/install-mbr +#usr/share/man/man8/install-mbr.8 diff --git a/lfs/glibc b/lfs/glibc index e2638b6..97b1cfe 100644 --- a/lfs/glibc +++ b/lfs/glibc @@ -24,11 +24,7 @@ include Config -ifeq "$(MACHINE_TYPE)" "arm" - VER = 2.5 -else - VER = 2.3.6 -endif +VER = 2.5 THISAPP = glibc-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -73,13 +69,8 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2 -ifeq "$(MACHINE_TYPE)" "arm" - $(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f - glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01 -else - $(DL_FILE)_MD5 = bfdce99f82d6dbcb64b7f11c05d6bc96 - glibc-libidn-$(VER).tar.bz2_MD5 = 49dbe06ce830fc73874d6b38bdc5b4db -endif +$(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f +glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01 # ARM needs glibc-ports ifeq "$(MACHINE_TYPE)" "arm" @@ -125,15 +116,9 @@ ifeq "$(MACHINE_TYPE)" "arm" # asm/page.h should not be included in sysdeps/unix/sysv/linux/arm/ioperm.c. cd $(DIR_APP) && sed "/asm\/page.h/d" -i ports/sysdeps/unix/sysv/linux/arm/ioperm.c -else - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-dont_use_origin_on_privil_exec.patch endif ifeq "$(ROOT)" "" -ifeq "$(MACHINE)" "i586" - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-linux_types-1.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-inotify-1.patch -endif # This locale causes a loop on bash login - exclude it cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED ifeq "$(MACHINE_TYPE)" "arm" @@ -150,9 +135,6 @@ ifeq "$(ROOT)" "" touch /etc/ld.so.conf cd $(DIR_SRC)/glibc-build && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install -ifeq "$(MACHINE)" "i586" - cp -v $(DIR_APP)/sysdeps/unix/sysv/linux/inotify.h /usr/include/sys -endif else -mkdir /tools/etc touch /tools/etc/ld.so.conf diff --git a/lfs/linux-libc-header b/lfs/linux-libc-header deleted file mode 100644 index a2ff9d3..0000000 --- a/lfs/linux-libc-header +++ /dev/null @@ -1,105 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.6.12.0 - -THISAPP = linux-libc-headers-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) - -ifeq "$(ROOT)" "" -ifeq "$(LFS_PASS)" "install" - TARGET = $(DIR_INFO)/$(THISAPP)-install -else - TARGET = $(DIR_INFO)/$(THISAPP) -endif -else - TARGET = $(DIR_INFO)/$(THISAPP)-tools1 -endif - -############################################################################### -# Top-level Rules -############################################################################### -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = eae2f562afe224ad50f65a6acfb4252c - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) -ifeq "$(ROOT)" "" -ifeq "$(LFS_PASS)" "install" - -mkdir -p /opt/$(MACHINE)-uClibc - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-inotify-3.patch - cd $(DIR_APP) && install -dv /opt/$(MACHINE)-uClibc/usr/include/asm - cd $(DIR_APP) && cp -Rv include/asm-i386/* /opt/$(MACHINE)-uClibc/usr/include/asm - cd $(DIR_APP) && cp -Rv include/linux /opt/$(MACHINE)-uClibc/usr/include - cd $(DIR_APP) && chown -Rv root:root /opt/$(MACHINE)-uClibc/usr/include/{asm,linux} - cd $(DIR_APP) && find /opt/$(MACHINE)-uClibc/usr/include/{asm,linux} -type d -exec chmod -v 755 {} \; - cd $(DIR_APP) && find /opt/$(MACHINE)-uClibc/usr/include/{asm,linux} -type f -exec chmod -v 644 {} \; -else - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-inotify-3.patch - cd $(DIR_APP) && install -dv /usr/include/asm - cd $(DIR_APP) && cp -Rv include/asm-i386/* /usr/include/asm - cd $(DIR_APP) && cp -Rv include/linux /usr/include - cd $(DIR_APP) && chown -Rv root:root /usr/include/{asm,linux} - cd $(DIR_APP) && find /usr/include/{asm,linux} -type d -exec chmod -v 755 {} \; - cd $(DIR_APP) && find /usr/include/{asm,linux} -type f -exec chmod -v 644 {} \; -endif -else - cd $(DIR_APP) && cp -Rv include/asm-i386 /tools/include/asm - cd $(DIR_APP) && cp -Rv include/linux /tools/include -endif - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/man b/lfs/man index c5f847f..04aed20 100644 --- a/lfs/man +++ b/lfs/man @@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && mv man/es{_ES.88591,} cd $(DIR_APP) && mv man/it{_IT.88591,} cd $(DIR_APP) && mv man/ja{_JP.eucJP,} + cd $(DIR_APP) && sed -i "s/-I-//g" {lib,src}/Makefile* cd $(DIR_APP) && sed -i 's,\*_\*,??,' man/Makefile.in cd $(DIR_APP) && sed -i '/\t\/usr\/man/d' src/man_db.conf.in cd $(DIR_APP) && echo -e "#define WEB_BROWSER \"exec /usr/bin/lynx\"" >> include/manconfig.h.in diff --git a/lfs/mbr b/lfs/mbr index 077efa7..c43f2fd 100644 --- a/lfs/mbr +++ b/lfs/mbr @@ -24,7 +24,7 @@ include Config -VER = 1.1.8 +VER = 1.1.11 THISAPP = mbr-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = da195c75b26bd45ecbb113b317996f9a +$(DL_FILE)_MD5 = 4e406ded185f94c2d2bf5fc793ac1842 install : $(TARGET) @@ -71,7 +71,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure + cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/sdl b/lfs/sdl index 2716f3f..5f5ecdc 100644 --- a/lfs/sdl +++ b/lfs/sdl @@ -77,10 +77,8 @@ dist: $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) -ifeq "$(MACHINE_TYPE)" "arm" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/SDL-1.2.11-asm-page.h.patch cd $(DIR_APP) && sed "/asm\/page.h/d" -i src/video/fbcon/SDL_fbvideo.c -endif cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/usb-stick b/lfs/usb-stick index 4c5e716..30a1475 100644 --- a/lfs/usb-stick +++ b/lfs/usb-stick @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -92,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) COUNT=$$((`du -k -s $(IMGfs) | awk '{print $$1}'` + 32 )); \ dd bs=1k if=/dev/zero of=$(IMGhdd) count=$$COUNT # write mbr before partitioning save a 'not msdos fs' warning from sfdisk - /usr/local/sbin/install-mbr -f $(IMGhdd) + /usr/sbin/install-mbr -f $(IMGhdd) echo -e "0,,6,*\n;\n;\n;" | sfdisk -qLD -H 64 -S 32 $(IMGhdd) # copy the entire partition, make the fs and dd back dd if=$(IMGfs) of=$(IMGhdd) bs=512 seek=32 diff --git a/make.sh b/make.sh index 2c52ad1..84447f5 100755 --- a/make.sh +++ b/make.sh @@ -265,11 +265,7 @@ buildtoolchain() { lfsmake1 binutils PASS=1 lfsmake1 gcc PASS=1 export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH - if [ "${MACHINE_TYPE}" = "arm" ]; then - lfsmake1 linux TOOLS=1 HEADERS=1 - else - lfsmake1 linux-libc-header - fi + lfsmake1 linux TOOLS=1 HEADERS=1 lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 lfsmake1 fake-environ @@ -306,11 +302,7 @@ buildbase() { LOGFILE="$BASEDIR/log/_build.base.log" export LOGFILE lfsmake2 stage2 - if [ "${MACHINE_TYPE}" = "arm" ]; then - lfsmake2 linux HEADERS=1 - else - lfsmake2 linux-libc-header - fi + lfsmake2 linux HEADERS=1 lfsmake2 man-pages lfsmake2 glibc lfsmake2 tzdata diff --git a/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch b/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch deleted file mode 100644 index 26c8ac8..0000000 --- a/src/patches/glibc-2.3.6-dont_use_origin_on_privil_exec.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Naur glibc-2.3.6.org/elf/dl-load.c glibc-2.3.6/elf/dl-load.c ---- glibc-2.3.6.org/elf/dl-load.c 2005-04-06 04:50:10.000000000 +0200 -+++ glibc-2.3.6/elf/dl-load.c 2010-10-19 17:41:09.000000000 +0200 -@@ -176,8 +176,7 @@ - - - static size_t --is_dst (const char *start, const char *name, const char *str, -- int is_path, int secure) -+is_dst (const char *start, const char *name, const char *str, int is_path) - { - size_t len; - bool is_curly = false; -@@ -206,11 +205,6 @@ - && (!is_path || name[len] != ':')) - return 0; - -- if (__builtin_expect (secure, 0) -- && ((name[len] != '\0' && (!is_path || name[len] != ':')) -- || (name != start + 1 && (!is_path || name[-2] != ':')))) -- return 0; -- - return len; - } - -@@ -225,13 +219,12 @@ - { - size_t len; - -- /* $ORIGIN is not expanded for SUID/GUID programs (except if it -- is $ORIGIN alone) and it must always appear first in path. */ -+ /* $ORIGIN is not expanded for SUID/GUID programs. */ - ++name; -- if ((len = is_dst (start, name, "ORIGIN", is_path, -- INTUSE(__libc_enable_secure))) != 0 -- || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 -- || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) -+ if (((len = is_dst (start, name, "ORIGIN", is_path)) != 0 -+ && !INTUSE(__libc_enable_secure)) -+ || (len = is_dst (start, name, "PLATFORM", is_path)) != 0 -+ || (len = is_dst (start, name, "LIB", is_path)) != 0) - ++cnt; - - name = strchr (name + len, '$'); -@@ -263,12 +256,17 @@ - size_t len; - - ++name; -- if ((len = is_dst (start, name, "ORIGIN", is_path, -- INTUSE(__libc_enable_secure))) != 0) -- repl = l->l_origin; -- else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) -+ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0) -+ { -+ // Ignore this path at SUID/GUID -+ if (INTUSE(__libc_enable_secure)) -+ repl = (const char *) -1; -+ else -+ repl = l->l_origin; -+ } -+ else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0) - repl = GLRO(dl_platform); -- else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0) -+ else if ((len = is_dst (start, name, "LIB", is_path)) != 0) - repl = DL_DST_LIB; - - if (repl != NULL && repl != (const char *) -1) diff --git a/src/patches/glibc-2.3.6-inotify-1.patch b/src/patches/glibc-2.3.6-inotify-1.patch deleted file mode 100644 index 30af30c..0000000 --- a/src/patches/glibc-2.3.6-inotify-1.patch +++ /dev/null @@ -1,45 +0,0 @@ -Submitted By: Dan Nicholson <dnicholson at linuxfromscratch dot org> -Date: 2006-09-01 -Initial Package Version: 2.3.6 -Origin: udev-096, syscall functions generated by Alexander E. Patrakov -Upstream Status: Added to syscall list in 2.4 -Description: Adds inotify syscall functions for use in userspace. Minimal - syscall functions borrowed from udev local implementation to - provide system inotify support. -Testcase: dovecot-1.0rc2, ./configure --with-notify=inotify - -diff -pNur glibc-2.3.6.orig/sysdeps/unix/sysv/linux/inotify.h glibc-2.3.6/sysdeps/unix/sysv/linux/inotify.h ---- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/inotify.h 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.3.6/sysdeps/unix/sysv/linux/inotify.h 2006-08-01 05:48:27.000000000 +0000 -@@ -0,0 +1,31 @@ -+/* -+ * Inode based directory notification for Linux -+ * -+ * Copyright (C) 2005 John McCutchan -+ */ -+ -+#ifndef _SYS_INOTIFY_H -+#define _SYS_INOTIFY_H -+ -+#include <stdint.h> -+#include <linux/inotify.h> -+#include <asm/unistd.h> -+ -+extern long int syscall (long int __sysno, ...) __THROW; -+ -+static inline int inotify_init(void) -+{ -+ return syscall(__NR_inotify_init); -+} -+ -+static inline int inotify_add_watch(int fd, const char *name, uint32_t mask) -+{ -+ return syscall(__NR_inotify_add_watch, fd, name, mask); -+} -+ -+static inline int inotify_rm_watch (int fd, uint32_t wd) -+{ -+ return syscall(__NR_inotify_rm_watch, fd, wd); -+} -+ -+#endif /* _SYS_INOTIFY_H */ diff --git a/src/patches/glibc-2.3.6-linux_types-1.patch b/src/patches/glibc-2.3.6-linux_types-1.patch deleted file mode 100644 index a365b81..0000000 --- a/src/patches/glibc-2.3.6-linux_types-1.patch +++ /dev/null @@ -1,33 +0,0 @@ -Submitted By: DJ Lucas <dj at linuxfromscratch dot org> -Date: 2006-04-05 -Initial Package Version: 2.3.6 -Upstream Status: Committed -Origin: Glibc CVS -Description: Fixes build errors where linux/types.h is included after sys/kd.h. - -diff -Naur glibc-2.3.6-orig/sysdeps/unix/sysv/linux/sys/kd.h glibc-2.3.6/sysdeps/unix/sysv/linux/sys/kd.h ---- glibc-2.3.6-orig/sysdeps/unix/sysv/linux/sys/kd.h 2001-07-05 23:56:21.000000000 -0500 -+++ glibc-2.3.6/sysdeps/unix/sysv/linux/sys/kd.h 2006-04-04 21:40:50.000000000 -0500 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. -+/* Copyright (C) 1996, 1997, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -21,9 +21,15 @@ - - /* Make sure the <linux/types.h> header is not loaded. */ - #ifndef _LINUX_TYPES_H --# define _LINUX_TYPES_H 1 -+# define _LINUX_TYPES_H 1 -+# define __undef_LINUX_TYPES_H - #endif - - #include <linux/kd.h> - -+#ifdef __undef_LINUX_TYPES_H -+# undef _LINUX_TYPES_H -+# undef __undef_LINUX_TYPES_H -+#endif -+ - #endif /* sys/kd.h */ diff --git a/src/patches/linux-libc-headers-2.6.12.0-inotify-3.patch b/src/patches/linux-libc-headers-2.6.12.0-inotify-3.patch deleted file mode 100644 index 4acfd8f..0000000 --- a/src/patches/linux-libc-headers-2.6.12.0-inotify-3.patch +++ /dev/null @@ -1,115 +0,0 @@ -Submitted By: Dan Nicholson <dnicholson at linuxfromscratch dot org> -Date: 2006-08-01 -Initial Package Version: 2.6.12.0 -Origin: linux-2.6.16 series, syscalls diffed by Alexander Patrakov -Upstream Status: Project is dead -Description: Adds userspace headers and syscalls for inotify -Testcase: dovecot-1.0rc2, ./configure --with-notify=inotify - -diff -pNur linux-libc-headers-2.6.12.0.orig/include/asm-i386/unistd.h linux-libc-headers-2.6.12.0/include/asm-i386/unistd.h ---- linux-libc-headers-2.6.12.0.orig/include/asm-i386/unistd.h 2005-07-06 00:17:47.000000000 +0000 -+++ linux-libc-headers-2.6.12.0/include/asm-i386/unistd.h 2006-08-01 05:56:42.000000000 +0000 -@@ -294,8 +294,13 @@ - #define __NR_add_key 286 - #define __NR_request_key 287 - #define __NR_keyctl 288 -+/* #define __NR_ioprio_set 289 */ -+/* #define __NR_ioprio_get 290 */ -+#define __NR_inotify_init 291 -+#define __NR_inotify_add_watch 292 -+#define __NR_inotify_rm_watch 293 - --#define NR_syscalls 289 -+#define NR_syscalls 294 - - /* - * user-visible error numbers are in the range -1 - -128: see -diff -pNur linux-libc-headers-2.6.12.0.orig/include/asm-ppc/unistd.h linux-libc-headers-2.6.12.0/include/asm-ppc/unistd.h ---- linux-libc-headers-2.6.12.0.orig/include/asm-ppc/unistd.h 2005-07-06 00:17:23.000000000 +0000 -+++ linux-libc-headers-2.6.12.0/include/asm-ppc/unistd.h 2006-08-01 05:56:42.000000000 +0000 -@@ -277,8 +277,13 @@ - #define __NR_request_key 270 - #define __NR_keyctl 271 - #define __NR_waitid 272 -+/* #define __NR_ioprio_set 273 */ -+/* #define __NR_ioprio_get 274 */ -+#define __NR_inotify_init 275 -+#define __NR_inotify_add_watch 276 -+#define __NR_inotify_rm_watch 277 - --#define __NR_syscalls 273 -+#define __NR_syscalls 278 - - #define __NR(n) #n - -diff -pNur linux-libc-headers-2.6.12.0.orig/include/linux/inotify.h linux-libc-headers-2.6.12.0/include/linux/inotify.h ---- linux-libc-headers-2.6.12.0.orig/include/linux/inotify.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-libc-headers-2.6.12.0/include/linux/inotify.h 2006-08-01 05:56:42.000000000 +0000 -@@ -0,0 +1,67 @@ -+/* -+ * Inode based directory notification for Linux -+ * -+ * Copyright (C) 2005 John McCutchan -+ */ -+ -+#ifndef _LINUX_INOTIFY_H -+#define _LINUX_INOTIFY_H -+ -+#include <linux/types.h> -+ -+/* -+ * struct inotify_event - structure read from the inotify device for each event -+ * -+ * When you are watching a directory, you will receive the filename for events -+ * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ..., relative to the wd. -+ */ -+struct inotify_event { -+ __s32 wd; /* watch descriptor */ -+ __u32 mask; /* watch mask */ -+ __u32 cookie; /* cookie to synchronize two events */ -+ __u32 len; /* length (including nulls) of name */ -+ char name[0]; /* stub for possible name */ -+}; -+ -+/* the following are legal, implemented events that user-space can watch for */ -+#define IN_ACCESS 0x00000001 /* File was accessed */ -+#define IN_MODIFY 0x00000002 /* File was modified */ -+#define IN_ATTRIB 0x00000004 /* Metadata changed */ -+#define IN_CLOSE_WRITE 0x00000008 /* Writtable file was closed */ -+#define IN_CLOSE_NOWRITE 0x00000010 /* Unwrittable file closed */ -+#define IN_OPEN 0x00000020 /* File was opened */ -+#define IN_MOVED_FROM 0x00000040 /* File was moved from X */ -+#define IN_MOVED_TO 0x00000080 /* File was moved to Y */ -+#define IN_CREATE 0x00000100 /* Subfile was created */ -+#define IN_DELETE 0x00000200 /* Subfile was deleted */ -+#define IN_DELETE_SELF 0x00000400 /* Self was deleted */ -+#define IN_MOVE_SELF 0x00000800 /* Self was moved */ -+ -+/* the following are legal events. they are sent as needed to any watch */ -+#define IN_UNMOUNT 0x00002000 /* Backing fs was unmounted */ -+#define IN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */ -+#define IN_IGNORED 0x00008000 /* File was ignored */ -+ -+/* helper events */ -+#define IN_CLOSE (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close */ -+#define IN_MOVE (IN_MOVED_FROM | IN_MOVED_TO) /* moves */ -+ -+/* special flags */ -+#define IN_ONLYDIR 0x01000000 /* only watch the path if it is a directory */ -+#define IN_DONT_FOLLOW 0x02000000 /* don't follow a sym link */ -+#define IN_MASK_ADD 0x20000000 /* add to the mask of an already existing watch */ -+#define IN_ISDIR 0x40000000 /* event occurred against dir */ -+#define IN_ONESHOT 0x80000000 /* only send event once */ -+ -+/* -+ * All of the events - we build the list by hand so that we can add flags in -+ * the future and not break backward compatibility. Apps will get only the -+ * events that they originally wanted. Be sure to add new events here! -+ */ -+#define IN_ALL_EVENTS (IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \ -+ IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \ -+ IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF | \ -+ IN_MOVE_SELF) -+ -+ -+#endif /* _LINUX_INOTIFY_H */ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. cb8d2bc602b6c360daafa34f5c856066bf4f2f1a
by git＠ipfire.org 26 Jul '12

26 Jul '12

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 3.x development tree". The branch, master has been updated via cb8d2bc602b6c360daafa34f5c856066bf4f2f1a (commit) via b45eecb9d66a5070290f04486cb1c5c88ca38351 (commit) via 9f394aa3cad37ad8e62fcbed4f4dbd6a60b12a4e (commit) via b1c97f06eea8441b164dd12122eeda482f27fbd3 (commit) from cb570e99064e25ae4f39b6299fa911db9d267fa1 (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 cb8d2bc602b6c360daafa34f5c856066bf4f2f1a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 21:03:00 2012 +0200 transifex-client: New package. Needed to maintain the translations for pakfire and some more IPFire packages. commit b45eecb9d66a5070290f04486cb1c5c88ca38351 Merge: b1c97f0 9f394aa Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 21:02:22 2012 +0200 Merge remote-tracking branch 'stevee/python-setuptools' commit 9f394aa3cad37ad8e62fcbed4f4dbd6a60b12a4e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Thu Jul 26 19:46:15 2012 +0200 python-setuptools: Update to 0.6.28. Fixes #10189. commit b1c97f06eea8441b164dd12122eeda482f27fbd3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 20:47:00 2012 +0200 libmpc: Update to 1.0 (0.9 is compat package). ----------------------------------------------------------------------- Summary of changes: libmpc/libmpc.nm | 50 +++++++++++++++++++++++++------ python-setuptools/python-setuptools.nm | 14 ++++++-- transifex-client/transifex-client.nm | 41 ++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 14 deletions(-) create mode 100644 transifex-client/transifex-client.nm Difference in files: diff --git a/libmpc/libmpc.nm b/libmpc/libmpc.nm index 9f51969..a1d1d5c 100644 --- a/libmpc/libmpc.nm +++ b/libmpc/libmpc.nm @@ -4,35 +4,57 @@ ############################################################################### name = libmpc -version = 0.9 -release = 2 +version = 1.0 +release = 1 +thisapp = mpc-%{version} + +compat_version = 0.9 groups = System/Libraries url = http://www.multiprecision.org/ license = LGPLv2.1+ summary = Mpc is a C library for the arithmetic of complex numbers. -thisapp = mpc-%{version} - description - Mpc is a C library for the arithmetic of complex numbers with \ - arbitrarily high precision and correct rounding of the result. \ + Mpc is a C library for the arithmetic of complex numbers with + arbitrarily high precision and correct rounding of the result. It is built upon and follows the same principles as Mpfr. end source_dl = http://www.multiprecision.org/mpc/download/ +sources += mpc-%{compat_version}.tar.gz build requires - gmp-devel>=4.3.2 - mpfr-devel>=2.4.2 + gmp-devel >= 4.3.2 + mpfr-devel >= 2.4.2 end - # http://lists.gforge.inria.fr/pipermail/mpc-discuss/2011-February/000805.html - export EGREP=egrep + configure_options += \ + --enable-shared \ + --disable-static + + build_cmds + cd %{DIR_SRC}/mpc-%{compat_version} + EGREP=egrep ./configure \ + %{configure_options} + + make %{PARALLELISMFLAGS} + end test + export LD_LIBRARY_PATH=$(pwd)/src/.libs make check + + cd %{DIR_SRC}/mpc-%{compat_version} + export LD_LIBRARY_PATH=$(pwd)/src/.libs + make check + end + + install_cmds + cd %{DIR_SRC}/mpc-%{compat_version} + install -m 644 src/.libs/libmpc.so.2.0.0 %{BUILDROOT}%{libdir} + ln -svf libmpc.so.2.0.0 %{BUILDROOT}%{libdir}/libmpc.so.2 end end @@ -43,6 +65,14 @@ packages template DEVEL end + package %{name}-compat + summary = Compat libraries of %{thisapp}. + + files + %{libdir}/libmpc.so.2* + end + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/python-setuptools/python-setuptools.nm b/python-setuptools/python-setuptools.nm index ad07679..e4d8fe8 100644 --- a/python-setuptools/python-setuptools.nm +++ b/python-setuptools/python-setuptools.nm @@ -4,10 +4,10 @@ ############################################################################### name = python-setuptools -version = 0.6c9 +version = 0.6.28 release = 1 arch = noarch -thisapp = setuptools-%{version} +thisapp = distribute-%{version} maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = Development/Libraries @@ -21,7 +21,7 @@ description especially ones that have dependencies on other packages. end -source_dl = +source_dl = http://pypi.python.org/packages/source/d/distribute/ build requires @@ -30,7 +30,12 @@ build prepare_cmds # Scripts seem to have a wrong hashbang - find . -name "*.py" | xargs sed -i "1s@^#!python@#!/usr/bin/python@" + for file in setuptools/command/easy_install.py distribute_setup.py ; do + sed -i '1s|^#!python|#!/usr/bin/python|' $file + done + + # Fix file permissions. + chmod -R 644 %{DIR_APP}/distribute.egg-info end build @@ -42,6 +47,7 @@ build # XXX %{PYTHON_EXTRACT_EGG} /usr/lib/python*/site-packages/%{name}*.egg rm -vf %{BUILDROOT}/usr/lib/python*/site-packages/setuptools/*.exe + rm -rvf %{BUILDROOT}/usr/lib/python*/site-packages/setuptools/tests end end diff --git a/transifex-client/transifex-client.nm b/transifex-client/transifex-client.nm new file mode 100644 index 0000000..39e03fa --- /dev/null +++ b/transifex-client/transifex-client.nm @@ -0,0 +1,41 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = transifex-client +version = 0.7.3 +release = 1 +arch = noarch + +groups = Development/Tools +url = http://transifex.org +license = GPLv2 +summary = A tool for creating scanners (text pattern recognizers). + +description + The Transifex Command-line Client is a command line tool that enables + you to easily manage your translations within a project without the + need of an elaborate UI system. +end + +source_dl = http://pypi.python.org/packages/source/t/transifex-client + +build + requires + python-devel + python-setuptools >= 0.6.28 + end + + build + python setup.py build + end + + install + python setup.py install -O1 --skip-build --root %{BUILDROOT} + end +end + +packages + package %{name} +end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. cb570e99064e25ae4f39b6299fa911db9d267fa1
by git＠ipfire.org 26 Jul '12

26 Jul '12

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 3.x development tree". The branch, master has been updated via cb570e99064e25ae4f39b6299fa911db9d267fa1 (commit) from 3a64a15f1eb94f4e82d7bb6fe413d4cee05f3456 (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 cb570e99064e25ae4f39b6299fa911db9d267fa1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 18:05:28 2012 +0200 pakfire: Update to 0.9.23. Introduces a new version of the package format. ----------------------------------------------------------------------- Summary of changes: pakfire/pakfire.nm | 4 +- ...ng-index-data-after-the-transaction-is-do.patch | 40 - .../0002-find-provides-Accept-bogous-soname.patch | 28 - ...right-package-format-to-all-actions-in-th.patch | 75 - ...on-Don-t-make-internal-server-errors-fata.patch | 500 ------ ...w-to-install-multiple-non-default-kernels.patch | 32 - ...y-remove-installed-packages-from-database.patch | 26 - ...packages-from-the-database-by-their-UUIDs.patch | 29 - ...-Fixes-for-removing-files-and-configfiles.patch | 51 - pakfire/patches/0009-Fix-two-coding-errors.patch | 39 - ...ingbay-repository-from-example-configurat.patch | 80 - ...Move-C-module-to-newer-version-of-libsolv.patch | 1787 -------------------- ...s-by-their-version-number-not-in-alphabet.patch | 26 - .../patches/0013-Fix-linking-to-libsolvext.patch | 28 - pakfire/patches/0014-Fix-the-download-sizes.patch | 30 - .../0015-Add-option-to-export-secret-keys.patch | 71 - .../0016-template-Fix-packaging-cmake-files.patch | 25 - 17 files changed, 2 insertions(+), 2869 deletions(-) delete mode 100644 pakfire/patches/0001-Fix-accessing-index-data-after-the-transaction-is-do.patch delete mode 100644 pakfire/patches/0002-find-provides-Accept-bogous-soname.patch delete mode 100644 pakfire/patches/0003-Fix-adding-right-package-format-to-all-actions-in-th.patch delete mode 100644 pakfire/patches/0004-client-daemon-Don-t-make-internal-server-errors-fata.patch delete mode 100644 pakfire/patches/0005-Allow-to-install-multiple-non-default-kernels.patch delete mode 100644 pakfire/patches/0006-Actually-remove-installed-packages-from-database.patch delete mode 100644 pakfire/patches/0007-Select-packages-from-the-database-by-their-UUIDs.patch delete mode 100644 pakfire/patches/0008-Fixes-for-removing-files-and-configfiles.patch delete mode 100644 pakfire/patches/0009-Fix-two-coding-errors.patch delete mode 100644 pakfire/patches/0010-Remove-testingbay-repository-from-example-configurat.patch delete mode 100644 pakfire/patches/0011-Move-C-module-to-newer-version-of-libsolv.patch delete mode 100644 pakfire/patches/0012-Sort-patches-by-their-version-number-not-in-alphabet.patch delete mode 100644 pakfire/patches/0013-Fix-linking-to-libsolvext.patch delete mode 100644 pakfire/patches/0014-Fix-the-download-sizes.patch delete mode 100644 pakfire/patches/0015-Add-option-to-export-secret-keys.patch delete mode 100644 pakfire/patches/0016-template-Fix-packaging-cmake-files.patch Difference in files: diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index c81b3dc..c071243 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -4,8 +4,8 @@ ############################################################################### name = pakfire -version = 0.9.22 -release = 5 +version = 0.9.23 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Packaging diff --git a/pakfire/patches/0001-Fix-accessing-index-data-after-the-transaction-is-do.patch b/pakfire/patches/0001-Fix-accessing-index-data-after-the-transaction-is-do.patch deleted file mode 100644 index 4324d8a..0000000 --- a/pakfire/patches/0001-Fix-accessing-index-data-after-the-transaction-is-do.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b856696a0a8173eaacdd03833971272de06118ce Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sat, 14 Apr 2012 21:16:30 +0200 -Subject: [PATCH 01/16] Fix accessing index data after the transaction is - done. - ---- - python/pakfire/client/builder.py | 1 + - python/pakfire/repository/system.py | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/python/pakfire/client/builder.py b/python/pakfire/client/builder.py -index a039e65..2ade5dc 100644 ---- a/python/pakfire/client/builder.py -+++ b/python/pakfire/client/builder.py -@@ -334,6 +334,7 @@ class ClientBuilder(object): - pkgs = [] - - for pkg in installed_packages: -+ assert pkg.uuid, "%s has got no UUID" - pkgs.append((pkg.friendly_name, pkg.uuid)) - - return self.conn.build_upload_buildroot(self.build_id, pkgs) -diff --git a/python/pakfire/repository/system.py b/python/pakfire/repository/system.py -index 642c4bd..5dcdd04 100644 ---- a/python/pakfire/repository/system.py -+++ b/python/pakfire/repository/system.py -@@ -52,6 +52,9 @@ class RepositorySystem(base.RepositoryFactory): - # Commit the database to disk. - self.db.commit() - -+ # Make sure that all data in the index is accessable. -+ self.index.optimize() -+ - def add_package(self, pkg): - # Add package to the database. - self.db.add_package(pkg) --- -1.7.10.4 - diff --git a/pakfire/patches/0002-find-provides-Accept-bogous-soname.patch b/pakfire/patches/0002-find-provides-Accept-bogous-soname.patch deleted file mode 100644 index d42cd8d..0000000 --- a/pakfire/patches/0002-find-provides-Accept-bogous-soname.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cf4f218f42c2a43a520eac4f3a6251d557dcbe80 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Tue, 17 Apr 2012 17:36:52 +0200 -Subject: [PATCH 02/16] find-provides: Accept bogous soname. - -This is a kind of weird bug. Some libs are "versioned" by -using their SONAME for symbol maps. This caused trouble -because the SONAME was not added to the list of provides -which is now changed by this commit. ---- - tools/find-provides | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tools/find-provides b/tools/find-provides -index 2e138ba..06b3c47 100755 ---- a/tools/find-provides -+++ b/tools/find-provides -@@ -69,7 +69,6 @@ for file in ${binary_files}; do - /Version definitions:/ { START=1; } - /^[0-9]/ && (START==1) { print $4; } - /^$/ { START=0; }' | \ -- grep -v ${soname} | \ - while read symbol ; do - echo "${soname}(${symbol})$(${is_64} && echo ${mark64} | sed 's/()//')" - done --- -1.7.10.4 - diff --git a/pakfire/patches/0003-Fix-adding-right-package-format-to-all-actions-in-th.patch b/pakfire/patches/0003-Fix-adding-right-package-format-to-all-actions-in-th.patch deleted file mode 100644 index 987808b..0000000 --- a/pakfire/patches/0003-Fix-adding-right-package-format-to-all-actions-in-th.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 39097e291ae050dbefe2dfa265e55dd330328acd Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Thu, 19 Apr 2012 16:56:03 +0200 -Subject: [PATCH 03/16] Fix adding right package format to all actions in the - transaction. - ---- - python/pakfire/transaction.py | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/python/pakfire/transaction.py b/python/pakfire/transaction.py -index 0b417d2..58b52c6 100644 ---- a/python/pakfire/transaction.py -+++ b/python/pakfire/transaction.py -@@ -301,7 +301,7 @@ class Transaction(object): - - @property - def downloads(self): -- return sorted([a for a in self.actions if a.needs_download]) -+ return sorted([a.pkg_solv for a in self.actions if a.needs_download]) - - def download(self, logger=None): - if logger is None: -@@ -309,16 +309,13 @@ class Transaction(object): - - # Get all download actions as a list. - downloads = [d for d in self.downloads] -- downloads.sort() - - # If there are no downloads, we can just stop here. - if not downloads: - return - - # Calculate downloadsize. -- download_size = 0 -- for action in downloads: -- download_size += action.pkg.size -+ download_size = sum([d.size for d in downloads]) - - # Get free space of the download location. - path = os.path.realpath(REPO_CACHE_DIR) -@@ -334,9 +331,19 @@ class Transaction(object): - time_start = time.time() - - i = 0 -- for action in downloads: -+ for pkg in downloads: - i += 1 -- action.download(text="(%d/%d): " % (i, len(downloads)), logger=logger) -+ -+ # Download the package file. -+ bin_pkg = pkg.download(text="(%d/%d): " % (i, len(downloads)), logger=logger) -+ -+ # Search in every action if we need to replace the package. -+ for action in self.actions: -+ if not action.pkg_solv.uuid == bin_pkg.uuid: -+ continue -+ -+ # Replace the package. -+ action.pkg = bin_pkg - - # Write an empty line to the console when there have been any downloads. - width, height = util.terminal_size() -@@ -420,7 +427,7 @@ class Transaction(object): - - # Calculate the size of all files that need to be downloaded this this - # transaction. -- download_size = sum([a.pkg.size for a in self.downloads]) -+ download_size = sum([d.size for d in self.downloads]) - if download_size: - s.append(_("Total download size: %s") % util.format_size(download_size)) - --- -1.7.10.4 - diff --git a/pakfire/patches/0004-client-daemon-Don-t-make-internal-server-errors-fata.patch b/pakfire/patches/0004-client-daemon-Don-t-make-internal-server-errors-fata.patch deleted file mode 100644 index f9b0387..0000000 --- a/pakfire/patches/0004-client-daemon-Don-t-make-internal-server-errors-fata.patch +++ /dev/null @@ -1,500 +0,0 @@ -From e3eb933336605515fe8cc9968a83a37b7df6b257 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Thu, 19 Apr 2012 17:02:09 +0200 -Subject: [PATCH 04/16] client/daemon: Don't make internal server errors fatal - for keepalives/updates. - -Because sometime, the hub could have some hiccups, this is no -reason to kill the daemon. It should retry sending the request in a short -time. - -However, we should now about the error and so the last try would -raise an exception. ---- - po/pakfire.pot | 137 ++++++++++++++++++++---------------- - python/pakfire/client/base.py | 43 +++++++---- - python/pakfire/client/transport.py | 8 +++ - python/pakfire/errors.py | 4 ++ - 4 files changed, 117 insertions(+), 75 deletions(-) - -diff --git a/po/pakfire.pot b/po/pakfire.pot -index 10f4e2a..4fd12e7 100644 ---- a/po/pakfire.pot -+++ b/po/pakfire.pot -@@ -8,7 +8,7 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2012-04-14 14:32+0200\n" -+"POT-Creation-Date: 2012-04-19 16:57+0200\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" - "Language-Team: LANGUAGE <LL(a)li.org>\n" -@@ -116,7 +116,7 @@ msgstr "" - - #: ../python/pakfire/base.py:382 ../python/pakfire/base.py:450 - #: ../python/pakfire/base.py:487 ../python/pakfire/base.py:546 --#: ../python/pakfire/base.py:567 ../python/pakfire/transaction.py:389 -+#: ../python/pakfire/base.py:567 ../python/pakfire/transaction.py:396 - msgid "Nothing to do" - msgstr "" - -@@ -416,7 +416,7 @@ msgstr "" - msgid "Give name of at least one package to check." - msgstr "" - --#: ../python/pakfire/cli.py:348 ../python/pakfire/transaction.py:398 -+#: ../python/pakfire/cli.py:348 ../python/pakfire/transaction.py:405 - msgid "Repository" - msgstr "" - -@@ -740,7 +740,7 @@ msgid "Job: %(name)s" - msgstr "" - - #: ../python/pakfire/cli.py:1078 ../python/pakfire/packages/base.py:107 --#: ../python/pakfire/transaction.py:397 -+#: ../python/pakfire/transaction.py:404 - msgid "Arch" - msgstr "" - -@@ -777,140 +777,151 @@ msgstr "" - msgid "Pakfire daemon command line interface." - msgstr "" - --#: ../python/pakfire/cli.py:1161 -+#: ../python/pakfire/cli.py:1156 - msgid "Pakfire key command line interface." - msgstr "" - --#: ../python/pakfire/cli.py:1205 ../python/pakfire/cli.py:1215 -+#: ../python/pakfire/cli.py:1200 ../python/pakfire/cli.py:1210 - msgid "Import a key from file." - msgstr "" - --#: ../python/pakfire/cli.py:1207 -+#: ../python/pakfire/cli.py:1202 - msgid "The real name of the owner of this key." - msgstr "" - --#: ../python/pakfire/cli.py:1209 -+#: ../python/pakfire/cli.py:1204 - msgid "The email address of the owner of this key." - msgstr "" - --#: ../python/pakfire/cli.py:1217 -+#: ../python/pakfire/cli.py:1212 - msgid "Filename of that key to import." - msgstr "" - --#: ../python/pakfire/cli.py:1223 -+#: ../python/pakfire/cli.py:1218 - msgid "Export a key to a file." - msgstr "" - --#: ../python/pakfire/cli.py:1225 -+#: ../python/pakfire/cli.py:1220 - msgid "The ID of the key to export." - msgstr "" - --#: ../python/pakfire/cli.py:1227 -+#: ../python/pakfire/cli.py:1222 - msgid "Write the key to this file." - msgstr "" - --#: ../python/pakfire/cli.py:1233 -+#: ../python/pakfire/cli.py:1228 - msgid "Delete a key from the local keyring." - msgstr "" - --#: ../python/pakfire/cli.py:1235 -+#: ../python/pakfire/cli.py:1230 - msgid "The ID of the key to delete." - msgstr "" - --#: ../python/pakfire/cli.py:1241 -+#: ../python/pakfire/cli.py:1236 - msgid "List all imported keys." - msgstr "" - --#: ../python/pakfire/cli.py:1247 -+#: ../python/pakfire/cli.py:1242 - msgid "Sign one or more packages." - msgstr "" - --#: ../python/pakfire/cli.py:1249 -+#: ../python/pakfire/cli.py:1244 - msgid "Key that is used sign the package(s)." - msgstr "" - --#: ../python/pakfire/cli.py:1251 -+#: ../python/pakfire/cli.py:1246 - msgid "Package(s) to sign." - msgstr "" - --#: ../python/pakfire/cli.py:1257 -+#: ../python/pakfire/cli.py:1252 - msgid "Verify one or more packages." - msgstr "" - --#: ../python/pakfire/cli.py:1261 -+#: ../python/pakfire/cli.py:1256 - msgid "Package(s) to verify." - msgstr "" - --#: ../python/pakfire/cli.py:1268 -+#: ../python/pakfire/cli.py:1263 - msgid "Generating the key may take a moment..." - msgstr "" - --#: ../python/pakfire/cli.py:1316 -+#: ../python/pakfire/cli.py:1311 - #, python-format - msgid "Signing %s..." - msgstr "" - --#: ../python/pakfire/cli.py:1333 -+#: ../python/pakfire/cli.py:1328 - #, python-format - msgid "Verifying %s..." - msgstr "" - --#: ../python/pakfire/cli.py:1343 -+#: ../python/pakfire/cli.py:1338 - msgid "This signature is valid." - msgstr "" - --#: ../python/pakfire/cli.py:1346 -+#: ../python/pakfire/cli.py:1341 - msgid "Unknown key" - msgstr "" - --#: ../python/pakfire/cli.py:1347 -+#: ../python/pakfire/cli.py:1342 - msgid "Could not check if this signature is valid." - msgstr "" - --#: ../python/pakfire/cli.py:1350 ../python/pakfire/keyring.py:96 -+#: ../python/pakfire/cli.py:1345 ../python/pakfire/keyring.py:96 - #, python-format - msgid "Created: %s" - msgstr "" - --#: ../python/pakfire/cli.py:1354 ../python/pakfire/keyring.py:99 -+#: ../python/pakfire/cli.py:1349 ../python/pakfire/keyring.py:99 - #, python-format - msgid "Expires: %s" - msgstr "" - --#: ../python/pakfire/client/builder.py:173 -+#. If the keepalive message could not successfully be sent, we don't -+#. bother, because the client will soon retry. -+#: ../python/pakfire/client/base.py:213 -+msgid "Could not send a keepalive message to the hub." -+msgstr "" -+ -+#. Don't give a shit either. -+#: ../python/pakfire/client/base.py:247 -+msgid "Could not update the host information." -+msgstr "" -+ -+#: ../python/pakfire/client/builder.py:179 - msgid "Less than 2GB of free space. Cannot request a new job." - msgstr "" - - #. Log all XMLRPC protocol errors. --#: ../python/pakfire/client/transport.py:78 -+#: ../python/pakfire/client/transport.py:90 - msgid "XMLRPC protocol error:" - msgstr "" - --#: ../python/pakfire/client/transport.py:79 -+#: ../python/pakfire/client/transport.py:91 - #, python-format - msgid "URL: %s" - msgstr "" - --#: ../python/pakfire/client/transport.py:80 -+#: ../python/pakfire/client/transport.py:92 - msgid " HTTP headers:" - msgstr "" - --#: ../python/pakfire/client/transport.py:83 -+#: ../python/pakfire/client/transport.py:95 - #, python-format - msgid "Error code: %s" - msgstr "" - --#: ../python/pakfire/client/transport.py:84 -+#: ../python/pakfire/client/transport.py:96 - #, python-format - msgid "Error message: %s" - msgstr "" - --#: ../python/pakfire/client/transport.py:104 -+#: ../python/pakfire/client/transport.py:116 - #, python-format - msgid "Trying again in %(timeout)s second(s). %(tries)s tries left." - msgstr "" - --#: ../python/pakfire/client/transport.py:109 -+#: ../python/pakfire/client/transport.py:121 - msgid "Maximum number of tries was reached. Giving up." - msgstr "" - -@@ -981,7 +992,7 @@ msgstr "" - msgid "Running pakfire-build in a pakfire container?" - msgstr "" - --#: ../python/pakfire/errors.py:94 ../python/pakfire/transaction.py:468 -+#: ../python/pakfire/errors.py:94 ../python/pakfire/transaction.py:475 - msgid "Transaction test was not successful" - msgstr "" - -@@ -996,10 +1007,14 @@ msgid "" - msgstr "" - - #: ../python/pakfire/errors.py:106 --msgid "Could not find the requested URL." -+msgid "A request could not be fulfilled by the server." - msgstr "" - - #: ../python/pakfire/errors.py:110 -+msgid "Could not find the requested URL." -+msgstr "" -+ -+#: ../python/pakfire/errors.py:114 - msgid "An unforseable problem on the XML-RPC transport connection occured." - msgstr "" - -@@ -1070,7 +1085,7 @@ msgstr "" - msgid "Name" - msgstr "" - --#: ../python/pakfire/packages/base.py:110 ../python/pakfire/transaction.py:397 -+#: ../python/pakfire/packages/base.py:110 ../python/pakfire/transaction.py:404 - msgid "Version" - msgstr "" - -@@ -1078,7 +1093,7 @@ msgstr "" - msgid "Release" - msgstr "" - --#: ../python/pakfire/packages/base.py:115 ../python/pakfire/transaction.py:398 -+#: ../python/pakfire/packages/base.py:115 ../python/pakfire/transaction.py:405 - msgid "Size" - msgstr "" - -@@ -1356,93 +1371,93 @@ msgid "" - "perform transaction." - msgstr "" - --#: ../python/pakfire/transaction.py:330 -+#: ../python/pakfire/transaction.py:327 - #, python-format - msgid "Not enough space to download %s of packages." - msgstr "" - --#: ../python/pakfire/transaction.py:333 -+#: ../python/pakfire/transaction.py:330 - msgid "Downloading packages:" - msgstr "" - --#: ../python/pakfire/transaction.py:397 -+#: ../python/pakfire/transaction.py:404 - msgid "Package" - msgstr "" - --#: ../python/pakfire/transaction.py:402 -+#: ../python/pakfire/transaction.py:409 - msgid "Installing:" - msgstr "" - --#: ../python/pakfire/transaction.py:403 -+#: ../python/pakfire/transaction.py:410 - msgid "Reinstalling:" - msgstr "" - --#: ../python/pakfire/transaction.py:404 -+#: ../python/pakfire/transaction.py:411 - msgid "Updating:" - msgstr "" - --#: ../python/pakfire/transaction.py:405 -+#: ../python/pakfire/transaction.py:412 - msgid "Downgrading:" - msgstr "" - --#: ../python/pakfire/transaction.py:406 -+#: ../python/pakfire/transaction.py:413 - msgid "Removing:" - msgstr "" - --#: ../python/pakfire/transaction.py:412 -+#: ../python/pakfire/transaction.py:419 - msgid "Transaction Summary" - msgstr "" - --#: ../python/pakfire/transaction.py:419 -+#: ../python/pakfire/transaction.py:426 - msgid "package" - msgstr "" - --#: ../python/pakfire/transaction.py:425 -+#: ../python/pakfire/transaction.py:432 - #, python-format - msgid "Total download size: %s" - msgstr "" - --#: ../python/pakfire/transaction.py:429 -+#: ../python/pakfire/transaction.py:436 - #, python-format - msgid "Installed size: %s" - msgstr "" - --#: ../python/pakfire/transaction.py:432 -+#: ../python/pakfire/transaction.py:439 - #, python-format - msgid "Freed size: %s" - msgstr "" - --#: ../python/pakfire/transaction.py:443 -+#: ../python/pakfire/transaction.py:450 - msgid "Is this okay?" - msgstr "" - --#: ../python/pakfire/transaction.py:449 -+#: ../python/pakfire/transaction.py:456 - msgid "Running Transaction Test" - msgstr "" - --#: ../python/pakfire/transaction.py:461 -+#: ../python/pakfire/transaction.py:468 - msgid "Transaction Test Succeeded" - msgstr "" - - #. Make a nice progressbar. --#: ../python/pakfire/transaction.py:494 -+#: ../python/pakfire/transaction.py:501 - msgid "Verifying signatures..." - msgstr "" - --#: ../python/pakfire/transaction.py:526 -+#: ../python/pakfire/transaction.py:533 - #, python-format - msgid "Found %s signature error(s)!" - msgstr "" - --#: ../python/pakfire/transaction.py:531 -+#: ../python/pakfire/transaction.py:538 - msgid "Going on because we are running in permissive mode." - msgstr "" - --#: ../python/pakfire/transaction.py:532 -+#: ../python/pakfire/transaction.py:539 - msgid "This is dangerous!" - msgstr "" - --#: ../python/pakfire/transaction.py:553 -+#: ../python/pakfire/transaction.py:560 - msgid "Running transaction" - msgstr "" - -diff --git a/python/pakfire/client/base.py b/python/pakfire/client/base.py -index 632ec8b..cd661ca 100644 ---- a/python/pakfire/client/base.py -+++ b/python/pakfire/client/base.py -@@ -204,7 +204,15 @@ class PakfireBuilderClient(BuildMixin, PakfireClient): - # Collect the current loadavg and send it to the hub. - loadavg = ", ".join(("%.2f" % round(l, 2) for l in os.getloadavg())) - -- needs_update = self.conn.send_keepalive(loadavg, overload, free_space) -+ try: -+ needs_update = self.conn.send_keepalive(loadavg, overload, free_space) -+ -+ except XMLRPCInternalServerError: -+ # If the keepalive message could not successfully be sent, we don't -+ # bother, because the client will soon retry. -+ log.warning(_("Could not send a keepalive message to the hub.")) -+ -+ return - - if force or needs_update: - log.debug("The hub is requesting an update.") -@@ -215,20 +223,27 @@ class PakfireBuilderClient(BuildMixin, PakfireClient): - - config = pakfire.config.ConfigDaemon() - -- self.conn.send_update( -- # Supported architectures. -- system.supported_arches, -+ try: -+ self.conn.send_update( -+ # Supported architectures. -+ system.supported_arches, -+ -+ # CPU information. -+ system.cpu_model, -+ system.cpu_count, -+ -+ # Amount of memory in bytes. -+ system.memory / 1024, - -- # CPU information. -- system.cpu_model, -- system.cpu_count, -+ # Send the currently running version of Pakfire. -+ PAKFIRE_VERSION, - -- # Amount of memory in bytes. -- system.memory / 1024, -+ # Send the host key. -+ config.get("signatures", "host_key", None), -+ ) - -- # Send the currently running version of Pakfire. -- PAKFIRE_VERSION, -+ except XMLRPCInternalServerError: -+ # Don't give a shit either. -+ log.warning(_("Could not update the host information.")) - -- # Send the host key. -- config.get("signatures", "host_key", None), -- ) -+ return -diff --git a/python/pakfire/client/transport.py b/python/pakfire/client/transport.py -index 4fb8a8f..ac7de8d 100644 ---- a/python/pakfire/client/transport.py -+++ b/python/pakfire/client/transport.py -@@ -72,6 +72,14 @@ class XMLRPCMixin: - # Cannot go on. - raise XMLRPCNotFoundError(e) - -+ elif e.errcode == 500: -+ # This could have various reasons, so we can not -+ # be sure to kill connections here. -+ # But to visualize the issue, we will raise an -+ # exception on the last try. -+ if tries == 1: -+ raise XMLRPCInternalServerError(e) -+ - elif e.errcode == 503: - # Possibly the hub is not running but the SSL proxy - # is. Just try again in a short time. -diff --git a/python/pakfire/errors.py b/python/pakfire/errors.py -index c0f711f..3af257d 100644 ---- a/python/pakfire/errors.py -+++ b/python/pakfire/errors.py -@@ -102,6 +102,10 @@ class XMLRPCForbiddenError(XMLRPCError): - message = _("You are forbidden to perform this action. Maybe you need to check your credentials.") - - -+class XMLRPCInternalServerError(XMLRPCError): -+ message = _("A request could not be fulfilled by the server.") -+ -+ - class XMLRPCNotFoundError(XMLRPCError): - message = _("Could not find the requested URL.") - --- -1.7.10.4 - diff --git a/pakfire/patches/0005-Allow-to-install-multiple-non-default-kernels.patch b/pakfire/patches/0005-Allow-to-install-multiple-non-default-kernels.patch deleted file mode 100644 index 677e179..0000000 --- a/pakfire/patches/0005-Allow-to-install-multiple-non-default-kernels.patch +++ /dev/null @@ -1,32 +0,0 @@ -From acf9ff3a740f37550287b4e263e6d7e76cef3e36 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sun, 22 Apr 2012 14:42:37 +0200 -Subject: [PATCH 05/16] Allow to install multiple non-default kernels. - ---- - python/pakfire/constants.py | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/python/pakfire/constants.py b/python/pakfire/constants.py -index 0899dd0..44d1d02 100644 ---- a/python/pakfire/constants.py -+++ b/python/pakfire/constants.py -@@ -184,7 +184,14 @@ end - PACKAGE_INFO_DESCRIPTION_LINE = PACKAGE_INFO_DEPENDENCY_LINE = "\t\t%s" - - # XXX make this configurable in pakfire.conf --PAKFIRE_MULTIINSTALL = ["kernel", "kernel-PAE",] -+PAKFIRE_MULTIINSTALL = [ -+ "kernel", -+ "kernel-kirkwood", -+ "kernel-legacy", -+ "kernel-omap", -+ "kernel-versatile", -+ "kernel-devel", -+] - - SCRIPTLET_INTERPRETER = "/bin/sh" - SCRIPTLET_TIMEOUT = 60 * 15 --- -1.7.10.4 - diff --git a/pakfire/patches/0006-Actually-remove-installed-packages-from-database.patch b/pakfire/patches/0006-Actually-remove-installed-packages-from-database.patch deleted file mode 100644 index d43af1a..0000000 --- a/pakfire/patches/0006-Actually-remove-installed-packages-from-database.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e13f4e02e11afa45d8bcb6ceb46bd50c3b6c9aae Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sun, 22 Apr 2012 14:44:51 +0200 -Subject: [PATCH 06/16] Actually remove installed packages from database. - -When removing packages, the metadata was not removed from -the local package database. ---- - python/pakfire/repository/system.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/python/pakfire/repository/system.py b/python/pakfire/repository/system.py -index 5dcdd04..ce3e979 100644 ---- a/python/pakfire/repository/system.py -+++ b/python/pakfire/repository/system.py -@@ -62,6 +62,7 @@ class RepositorySystem(base.RepositoryFactory): - - def rem_package(self, pkg): - # Remove package from the database. -+ self.db.rem_package(pkg) - self.index.rem_package(pkg) - - @property --- -1.7.10.4 - diff --git a/pakfire/patches/0007-Select-packages-from-the-database-by-their-UUIDs.patch b/pakfire/patches/0007-Select-packages-from-the-database-by-their-UUIDs.patch deleted file mode 100644 index 0ef6a9f..0000000 --- a/pakfire/patches/0007-Select-packages-from-the-database-by-their-UUIDs.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b8f51d988734a75e8e41496a5d272057d18ecfda Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sun, 22 Apr 2012 14:47:43 +0200 -Subject: [PATCH 07/16] Select packages from the database by their UUIDs. - ---- - python/pakfire/repository/database.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/python/pakfire/repository/database.py b/python/pakfire/repository/database.py -index 11321ae..6f8f397 100644 ---- a/python/pakfire/repository/database.py -+++ b/python/pakfire/repository/database.py -@@ -334,9 +334,9 @@ class DatabaseLocal(Database): - - # Get the ID of the package in the database. - c = self.cursor() -- #c.execute("SELECT id FROM packages WHERE uuid = ? LIMIT 1", (pkg.uuid,)) -- c.execute("SELECT id FROM packages WHERE name = ? AND epoch = ? AND version = ?" -- " AND release = ? LIMIT 1", (pkg.name, pkg.epoch, pkg.version, pkg.release,)) -+ c.execute("SELECT id FROM packages WHERE uuid = ? LIMIT 1", (pkg.uuid,)) -+ #c.execute("SELECT id FROM packages WHERE name = ? AND epoch = ? AND version = ?" -+ # " AND release = ? LIMIT 1", (pkg.name, pkg.epoch, pkg.version, pkg.release,)) - - id = None - for row in c: --- -1.7.10.4 - diff --git a/pakfire/patches/0008-Fixes-for-removing-files-and-configfiles.patch b/pakfire/patches/0008-Fixes-for-removing-files-and-configfiles.patch deleted file mode 100644 index 15332d9..0000000 --- a/pakfire/patches/0008-Fixes-for-removing-files-and-configfiles.patch +++ /dev/null @@ -1,51 +0,0 @@ -From d38612fe50395a35d6fdc0774d56c7c2ddc58cf7 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sun, 22 Apr 2012 14:48:10 +0200 -Subject: [PATCH 08/16] Fixes for removing files (and configfiles). - -There were some problems when the user removed those -files earlier. ---- - python/pakfire/packages/base.py | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/python/pakfire/packages/base.py b/python/pakfire/packages/base.py -index e27c3f7..9162536 100644 ---- a/python/pakfire/packages/base.py -+++ b/python/pakfire/packages/base.py -@@ -516,6 +516,12 @@ class Package(object): - - # Rename configuration files. - if _file.is_config(): -+ # Skip already removed config files. -+ try: -+ os.lstat(file) -+ except OSError: -+ continue -+ - file_save = "%s%s" % (file, CONFIG_FILE_SUFFIX_SAVE) - - try: -@@ -530,6 +536,7 @@ class Package(object): - - # Handle regular files and symlinks. - if os.path.isfile(file) or os.path.islink(file): -+ log.debug("Removing %s..." % _file) - try: - os.remove(file) - except OSError: -@@ -545,6 +552,11 @@ class Package(object): - except OSError: - pass - -+ # Handle files that have already been removed -+ # by somebody else. -+ elif not os.path.exists(file): -+ pass -+ - # Log all unhandled types. - else: - log.warning("Cannot remove file: %s. Filetype is unhandled." % file) --- -1.7.10.4 - diff --git a/pakfire/patches/0009-Fix-two-coding-errors.patch b/pakfire/patches/0009-Fix-two-coding-errors.patch deleted file mode 100644 index ff292c0..0000000 --- a/pakfire/patches/0009-Fix-two-coding-errors.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 949ba4bfa1055343b39d988c7b26c1f73ce28ac2 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Mon, 30 Apr 2012 23:41:22 +0200 -Subject: [PATCH 09/16] Fix two coding errors. - ---- - python/pakfire/chroot.py | 2 ++ - python/pakfire/repository/remote.py | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/python/pakfire/chroot.py b/python/pakfire/chroot.py -index 521759b..9862dc7 100644 ---- a/python/pakfire/chroot.py -+++ b/python/pakfire/chroot.py -@@ -92,6 +92,8 @@ def do(command, shell=False, chrootPath=None, cwd=None, timeout=0, raiseExc=True - if logger: - logger.debug("Executing command: %s in %s" % (command, chrootPath or "/")) - -+ child = None -+ - try: - # Create new child process - child = subprocess.Popen( -diff --git a/python/pakfire/repository/remote.py b/python/pakfire/repository/remote.py -index dade232..6d2cdc7 100644 ---- a/python/pakfire/repository/remote.py -+++ b/python/pakfire/repository/remote.py -@@ -112,7 +112,7 @@ class RepositoryRemote(base.RepositoryFactory): - ) - - def clean(self): -- RepositoryFactory.clean(self) -+ base.RepositoryFactory.clean(self) - - # Remove all files in the files cache. - self.cache.destroy() --- -1.7.10.4 - diff --git a/pakfire/patches/0010-Remove-testingbay-repository-from-example-configurat.patch b/pakfire/patches/0010-Remove-testingbay-repository-from-example-configurat.patch deleted file mode 100644 index 2ddb05c..0000000 --- a/pakfire/patches/0010-Remove-testingbay-repository-from-example-configurat.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 2b40137a3bfb1b8a31d5acbba32bd5e285599ba3 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Tue, 1 May 2012 14:30:30 +0200 -Subject: [PATCH 10/16] Remove testingbay repository from example - configuration. - ---- - Makefile | 4 ++-- - examples/distros/ipfire3.conf | 8 +------- - examples/repos/ipfire.repo | 22 ---------------------- - 3 files changed, 3 insertions(+), 31 deletions(-) - delete mode 100644 examples/repos/ipfire.repo - -diff --git a/Makefile b/Makefile -index 492d068..0361af6 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,8 +32,8 @@ install: build - cp -vf macros/*.macro $(DESTDIR)$(PREFIX)/lib/pakfire/macros - - # Install example configuration. -- -mkdir -pv $(DESTDIR)/etc/pakfire -- for file in general.conf builder.conf client.conf daemon.conf distros repos; do \ -+ -mkdir -pv $(DESTDIR)/etc/pakfire/repos -+ for file in general.conf builder.conf client.conf daemon.conf distros; do \ - [ -e "$(DESTDIR)/etc/pakfire/$${file}" ] && continue; \ - cp -rvf examples/$${file} $(DESTDIR)/etc/pakfire/; \ - done -diff --git a/examples/distros/ipfire3.conf b/examples/distros/ipfire3.conf -index aed95ce..9d15bf0 100644 ---- a/examples/distros/ipfire3.conf -+++ b/examples/distros/ipfire3.conf -@@ -1,5 +1,5 @@ - --# Configuration of IPFire 3- -+# Configuration of IPFire 3. - - [distro] - name = IPFire -@@ -28,9 +28,3 @@ description = IPFire 3 - This is a repository for testing stuff. - enabled = 0 - baseurl = http://pakfire.ipfire.org/repositories/ipfire3/testing/%{arch} - mirrors = https://pakfire.ipfire.org/distro/ipfire3/repo/testing/mirrorlist?arch=%{ar… -- --[repo:testingbay] --description = IPFire 3 - Temporary bootstrap repository. --enabled = 1 --baseurl = http://people.ipfire.org/~ms/testingbay-%{arch} --mirrors = http://people.ipfire.org/~ms/testingbay-%{arch}/mirrors -diff --git a/examples/repos/ipfire.repo b/examples/repos/ipfire.repo -deleted file mode 100644 -index 8c9f50a..0000000 ---- a/examples/repos/ipfire.repo -+++ /dev/null -@@ -1,22 +0,0 @@ --;[repo:ipfire] --;description = IPFire Main Repository --; --;url = http://mirror0.ipfire.org/pakfire3/$name/$arch --; --;gpgkey = /not/yet/existant -- --;[repo:ipfire-development] --;description = IPFire Development Repository -- --#url = http://mirror0.ipfire.org/pakfire3/$name/$arch --#url = file:///ipfire-3.x/build/packages/i686 --;url = file:///tmp/pakfire3 -- --;gpgkey = /not/yet/existant -- --[repo:testingbay] --description = IPFire Testing Repository for %{arch} --enabled = 1 -- --mirrors = http://people.ipfire.org/~ms/testingbay-%{arch}/mirrors --baseurl = http://people.ipfire.org/~ms/testingbay-%{arch} --- -1.7.10.4 - diff --git a/pakfire/patches/0011-Move-C-module-to-newer-version-of-libsolv.patch b/pakfire/patches/0011-Move-C-module-to-newer-version-of-libsolv.patch deleted file mode 100644 index f7dcdd2..0000000 --- a/pakfire/patches/0011-Move-C-module-to-newer-version-of-libsolv.patch +++ /dev/null @@ -1,1787 +0,0 @@ -From 9b68f47c96625fdafc9b3810de08563abe8e78be Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Wed, 16 May 2012 12:43:25 +0000 -Subject: [PATCH 11/16] Move C module to newer version of libsolv. - -Many more improvements which should make the -transaction check much faster. ---- - po/pakfire.pot | 155 +++++++++++++++++---------------- - python/pakfire/actions.py | 10 +-- - python/pakfire/base.py | 36 +++++--- - python/pakfire/builder.py | 3 +- - python/pakfire/filelist.py | 13 +-- - python/pakfire/packages/installed.py | 18 ++-- - python/pakfire/repository/database.py | 46 +++++----- - python/pakfire/repository/index.py | 9 +- - python/pakfire/repository/system.py | 50 +++++++++-- - python/pakfire/satsolver.py | 65 ++++---------- - python/pakfire/transaction.py | 49 +++++------ - python/src/_pakfiremodule.c | 18 +++- - python/src/repo.c | 31 ++++--- - python/src/repo.h | 1 + - python/src/request.c | 64 +++++++------- - python/src/request.h | 4 + - python/src/solution.c | 8 +- - python/src/solver.c | 88 +++++++++++-------- - python/src/solver.h | 5 +- - 19 files changed, 368 insertions(+), 305 deletions(-) - -diff --git a/po/pakfire.pot b/po/pakfire.pot -index 4fd12e7..db3a88f 100644 ---- a/po/pakfire.pot -+++ b/po/pakfire.pot -@@ -8,7 +8,7 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2012-04-19 16:57+0200\n" -+"POT-Creation-Date: 2012-05-16 12:33+0000\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" - "Language-Team: LANGUAGE <LL(a)li.org>\n" -@@ -73,13 +73,13 @@ msgid "Exception occured: %s" - msgstr "" - - #: ../python/pakfire/actions.py:364 ../python/pakfire/actions.py:402 --#: ../python/pakfire/actions.py:425 ../python/pakfire/actions.py:448 --#: ../python/pakfire/actions.py:465 ../python/pakfire/actions.py:484 -+#: ../python/pakfire/actions.py:424 ../python/pakfire/actions.py:446 -+#: ../python/pakfire/actions.py:463 ../python/pakfire/actions.py:482 - #, python-format - msgid "Running transaction test for %s" - msgstr "" - --#: ../python/pakfire/actions.py:373 ../python/pakfire/actions.py:477 -+#: ../python/pakfire/actions.py:373 - msgid "Installing" - msgstr "" - -@@ -87,63 +87,67 @@ msgstr "" - msgid "Updating" - msgstr "" - --#: ../python/pakfire/actions.py:431 -+#: ../python/pakfire/actions.py:430 - msgid "Removing" - msgstr "" - - #. Cleaning up leftover files and stuff. --#: ../python/pakfire/actions.py:455 -+#: ../python/pakfire/actions.py:453 - msgid "Cleanup" - msgstr "" - --#: ../python/pakfire/actions.py:493 -+#: ../python/pakfire/actions.py:475 -+msgid "Reinstalling" -+msgstr "" -+ -+#: ../python/pakfire/actions.py:491 - msgid "Downgrading" - msgstr "" - --#: ../python/pakfire/base.py:315 -+#: ../python/pakfire/base.py:320 - msgid "Local install repository" - msgstr "" - --#: ../python/pakfire/base.py:372 -+#: ../python/pakfire/base.py:377 - #, python-format - msgid "Could not find any installed package providing \"%s\"." - msgstr "" - --#: ../python/pakfire/base.py:378 -+#: ../python/pakfire/base.py:383 - #, python-format - msgid "Multiple reinstall candidates for \"%(pattern)s\": %(pkgs)s" - msgstr "" - --#: ../python/pakfire/base.py:382 ../python/pakfire/base.py:450 --#: ../python/pakfire/base.py:487 ../python/pakfire/base.py:546 --#: ../python/pakfire/base.py:567 ../python/pakfire/transaction.py:396 -+#: ../python/pakfire/base.py:387 ../python/pakfire/base.py:455 -+#: ../python/pakfire/base.py:491 ../python/pakfire/base.py:553 -+#: ../python/pakfire/base.py:574 ../python/pakfire/transaction.py:390 - msgid "Nothing to do" - msgstr "" - --#: ../python/pakfire/base.py:407 -+#: ../python/pakfire/base.py:412 - #, python-format - msgid "Could not find package %s in a remote repository." - msgstr "" - --#: ../python/pakfire/base.py:479 -+#: ../python/pakfire/base.py:483 - #, python-format - msgid "Excluding %s." - msgstr "" - --#: ../python/pakfire/base.py:531 -+#: ../python/pakfire/base.py:535 - #, python-format - msgid "\"%s\" package does not seem to be installed." - msgstr "" - --#: ../python/pakfire/base.py:681 -+#: ../python/pakfire/base.py:688 - msgid "Build command has failed." - msgstr "" - --#: ../python/pakfire/base.py:716 -+#: ../python/pakfire/base.py:723 - msgid "New repository" - msgstr "" - --#: ../python/pakfire/base.py:752 -+#: ../python/pakfire/base.py:764 - msgid "Everything is fine." - msgstr "" - -@@ -199,72 +203,72 @@ msgstr "" - msgid "Running installation test..." - msgstr "" - --#: ../python/pakfire/builder.py:766 -+#: ../python/pakfire/builder.py:767 - msgid "Installation test succeeded." - msgstr "" - - #. Create a progressbar. --#: ../python/pakfire/builder.py:803 -+#: ../python/pakfire/builder.py:804 - msgid "Signing packages..." - msgstr "" - --#: ../python/pakfire/builder.py:837 -+#: ../python/pakfire/builder.py:838 - msgid "Dumping package information:" - msgstr "" - - #. Walk through the whole tree and collect all files - #. that are on the same disk (not crossing mountpoints). --#: ../python/pakfire/builder.py:867 -+#: ../python/pakfire/builder.py:868 - msgid "Creating filelist..." - msgstr "" - - #. Create a nice progressbar. --#: ../python/pakfire/builder.py:886 -+#: ../python/pakfire/builder.py:887 - msgid "Compressing files..." - msgstr "" - --#: ../python/pakfire/builder.py:905 -+#: ../python/pakfire/builder.py:906 - #, python-format - msgid "Cache file was successfully created at %s." - msgstr "" - --#: ../python/pakfire/builder.py:906 -+#: ../python/pakfire/builder.py:907 - #, python-format - msgid " Containing %(files)s files, it has a size of %(size)s." - msgstr "" - - #. Make a nice progress bar as always. --#: ../python/pakfire/builder.py:917 -+#: ../python/pakfire/builder.py:918 - msgid "Extracting files..." - msgstr "" - - #. Update all packages. --#: ../python/pakfire/builder.py:937 -+#: ../python/pakfire/builder.py:938 - msgid "Updating packages from cache..." - msgstr "" - - #. Package the result. - #. Make all these little package from the build environment. --#: ../python/pakfire/builder.py:1075 -+#: ../python/pakfire/builder.py:1076 - msgid "Creating packages:" - msgstr "" - - #. Execute the buildscript of this stage. --#: ../python/pakfire/builder.py:1089 -+#: ../python/pakfire/builder.py:1090 - #, python-format - msgid "Running stage %s:" - msgstr "" - --#: ../python/pakfire/builder.py:1107 -+#: ../python/pakfire/builder.py:1108 - #, python-format - msgid "Could not remove static libraries: %s" - msgstr "" - --#: ../python/pakfire/builder.py:1113 -+#: ../python/pakfire/builder.py:1114 - msgid "Compressing man pages did not complete successfully." - msgstr "" - --#: ../python/pakfire/builder.py:1133 -+#: ../python/pakfire/builder.py:1134 - msgid "Extracting debuginfo did not complete with success. Aborting build." - msgstr "" - -@@ -416,7 +420,7 @@ msgstr "" - msgid "Give name of at least one package to check." - msgstr "" - --#: ../python/pakfire/cli.py:348 ../python/pakfire/transaction.py:405 -+#: ../python/pakfire/cli.py:348 ../python/pakfire/transaction.py:399 - msgid "Repository" - msgstr "" - -@@ -740,7 +744,7 @@ msgid "Job: %(name)s" - msgstr "" - - #: ../python/pakfire/cli.py:1078 ../python/pakfire/packages/base.py:107 --#: ../python/pakfire/transaction.py:404 -+#: ../python/pakfire/transaction.py:398 - msgid "Arch" - msgstr "" - -@@ -992,7 +996,7 @@ msgstr "" - msgid "Running pakfire-build in a pakfire container?" - msgstr "" - --#: ../python/pakfire/errors.py:94 ../python/pakfire/transaction.py:475 -+#: ../python/pakfire/errors.py:94 ../python/pakfire/transaction.py:469 - msgid "Transaction test was not successful" - msgstr "" - -@@ -1085,7 +1089,7 @@ msgstr "" - msgid "Name" - msgstr "" - --#: ../python/pakfire/packages/base.py:110 ../python/pakfire/transaction.py:404 -+#: ../python/pakfire/packages/base.py:110 ../python/pakfire/transaction.py:398 - msgid "Version" - msgstr "" - -@@ -1093,7 +1097,7 @@ msgstr "" - msgid "Release" - msgstr "" - --#: ../python/pakfire/packages/base.py:115 ../python/pakfire/transaction.py:405 -+#: ../python/pakfire/packages/base.py:115 ../python/pakfire/transaction.py:399 - msgid "Size" - msgstr "" - -@@ -1173,7 +1177,7 @@ msgstr "" - msgid "Not set" - msgstr "" - --#: ../python/pakfire/packages/base.py:528 -+#: ../python/pakfire/packages/base.py:534 - #, python-format - msgid "Config file saved as %s." - msgstr "" -@@ -1243,16 +1247,16 @@ msgstr "" - msgid "Building source package %s:" - msgstr "" - --#: ../python/pakfire/repository/database.py:116 -+#: ../python/pakfire/repository/database.py:123 - msgid "The format of the database is not supported by this version of pakfire." - msgstr "" - --#: ../python/pakfire/repository/database.py:224 -+#: ../python/pakfire/repository/database.py:231 - #, python-format - msgid "Cannot use database with version greater than %s." - msgstr "" - --#: ../python/pakfire/repository/database.py:226 -+#: ../python/pakfire/repository/database.py:233 - #, python-format - msgid "Migrating database from format %(old)s to %(new)s." - msgstr "" -@@ -1320,33 +1324,38 @@ msgstr "" - msgid "Trying an other mirror." - msgstr "" - --#: ../python/pakfire/satsolver.py:230 ../python/pakfire/satsolver.py:256 -+#. Create a progressbar. -+#: ../python/pakfire/repository/system.py:66 -+msgid "Loading installed packages" -+msgstr "" -+ -+#: ../python/pakfire/satsolver.py:199 ../python/pakfire/satsolver.py:225 - msgid "The solver returned one problem:" - msgstr "" - - #. Ask the user if he or she want to modify the request. If not, just exit. --#: ../python/pakfire/satsolver.py:272 -+#: ../python/pakfire/satsolver.py:241 - msgid "Do you want to manually alter the request?" - msgstr "" - --#: ../python/pakfire/satsolver.py:275 -+#: ../python/pakfire/satsolver.py:244 - msgid "You can now try to satisfy the solver by modifying your request." - msgstr "" - --#: ../python/pakfire/satsolver.py:280 -+#: ../python/pakfire/satsolver.py:249 - msgid "Which problem to you want to resolve?" - msgstr "" - --#: ../python/pakfire/satsolver.py:282 -+#: ../python/pakfire/satsolver.py:251 - msgid "Press enter to try to re-solve the request." - msgstr "" - --#: ../python/pakfire/satsolver.py:313 -+#: ../python/pakfire/satsolver.py:282 - #, python-format - msgid " Solution: %s" - msgstr "" - --#: ../python/pakfire/satsolver.py:322 -+#: ../python/pakfire/satsolver.py:291 - msgid " Solutions:" - msgstr "" - -@@ -1354,110 +1363,110 @@ msgstr "" - msgid "Could not be determined" - msgstr "" - --#: ../python/pakfire/transaction.py:95 -+#: ../python/pakfire/transaction.py:94 - #, python-format - msgid "file %(name)s from %(pkg1)s conflicts with file from package %(pkg2)s" - msgstr "" - --#: ../python/pakfire/transaction.py:101 -+#: ../python/pakfire/transaction.py:100 - #, python-format - msgid "file %(name)s from %(pkg)s conflicts with files from %(pkgs)s" - msgstr "" - --#: ../python/pakfire/transaction.py:109 -+#: ../python/pakfire/transaction.py:108 - #, python-format - msgid "" - "There is not enough space left on %(name)s. Need at least %(size)s to " - "perform transaction." - msgstr "" - --#: ../python/pakfire/transaction.py:327 -+#: ../python/pakfire/transaction.py:321 - #, python-format - msgid "Not enough space to download %s of packages." - msgstr "" - --#: ../python/pakfire/transaction.py:330 -+#: ../python/pakfire/transaction.py:324 - msgid "Downloading packages:" - msgstr "" - --#: ../python/pakfire/transaction.py:404 -+#: ../python/pakfire/transaction.py:398 - msgid "Package" - msgstr "" - --#: ../python/pakfire/transaction.py:409 -+#: ../python/pakfire/transaction.py:403 - msgid "Installing:" - msgstr "" - --#: ../python/pakfire/transaction.py:410 -+#: ../python/pakfire/transaction.py:404 - msgid "Reinstalling:" - msgstr "" - --#: ../python/pakfire/transaction.py:411 -+#: ../python/pakfire/transaction.py:405 - msgid "Updating:" - msgstr "" - --#: ../python/pakfire/transaction.py:412 -+#: ../python/pakfire/transaction.py:406 - msgid "Downgrading:" - msgstr "" - --#: ../python/pakfire/transaction.py:413 -+#: ../python/pakfire/transaction.py:407 - msgid "Removing:" - msgstr "" - --#: ../python/pakfire/transaction.py:419 -+#: ../python/pakfire/transaction.py:413 - msgid "Transaction Summary" - msgstr "" - --#: ../python/pakfire/transaction.py:426 -+#: ../python/pakfire/transaction.py:420 - msgid "package" - msgstr "" - --#: ../python/pakfire/transaction.py:432 -+#: ../python/pakfire/transaction.py:426 - #, python-format - msgid "Total download size: %s" - msgstr "" - --#: ../python/pakfire/transaction.py:436 -+#: ../python/pakfire/transaction.py:430 - #, python-format - msgid "Installed size: %s" - msgstr "" - --#: ../python/pakfire/transaction.py:439 -+#: ../python/pakfire/transaction.py:433 - #, python-format - msgid "Freed size: %s" - msgstr "" - --#: ../python/pakfire/transaction.py:450 -+#: ../python/pakfire/transaction.py:444 - msgid "Is this okay?" - msgstr "" - --#: ../python/pakfire/transaction.py:456 -+#: ../python/pakfire/transaction.py:450 - msgid "Running Transaction Test" - msgstr "" - --#: ../python/pakfire/transaction.py:468 -+#: ../python/pakfire/transaction.py:462 - msgid "Transaction Test Succeeded" - msgstr "" - - #. Make a nice progressbar. --#: ../python/pakfire/transaction.py:501 -+#: ../python/pakfire/transaction.py:495 - msgid "Verifying signatures..." - msgstr "" - --#: ../python/pakfire/transaction.py:533 -+#: ../python/pakfire/transaction.py:527 - #, python-format - msgid "Found %s signature error(s)!" - msgstr "" - --#: ../python/pakfire/transaction.py:538 -+#: ../python/pakfire/transaction.py:532 - msgid "Going on because we are running in permissive mode." - msgstr "" - --#: ../python/pakfire/transaction.py:539 -+#: ../python/pakfire/transaction.py:533 - msgid "This is dangerous!" - msgstr "" - --#: ../python/pakfire/transaction.py:560 -+#: ../python/pakfire/transaction.py:554 - msgid "Running transaction" - msgstr "" - -diff --git a/python/pakfire/actions.py b/python/pakfire/actions.py -index cdc2778..9fda261 100644 ---- a/python/pakfire/actions.py -+++ b/python/pakfire/actions.py -@@ -417,7 +417,6 @@ class ActionRemove(Action): - def __init__(self, *args, **kwargs): - Action.__init__(self, *args, **kwargs) - -- # XXX This is ugly, but works for the moment. - self.pkg = self.local.db.get_package_from_solv(self.pkg_solv) - assert self.pkg - -@@ -431,7 +430,7 @@ class ActionRemove(Action): - self.pkg.cleanup(_("Removing"), prefix=self.pakfire.path) - - # Remove package from the database. -- self.local.rem_package(self.pkg) -+ self.local.rem_package(self.pkg_solv) - - - class ActionCleanup(Action): -@@ -440,7 +439,6 @@ class ActionCleanup(Action): - def __init__(self, *args, **kwargs): - Action.__init__(self, *args, **kwargs) - -- # XXX This is ugly, but works for the moment. - self.pkg = self.local.db.get_package_from_solv(self.pkg_solv) - assert self.pkg - -@@ -455,7 +453,7 @@ class ActionCleanup(Action): - self.pkg.cleanup(_("Cleanup"), prefix=self.pakfire.path) - - # Remove package from the database. -- self.local.rem_package(self.pkg) -+ self.local.rem_package(self.pkg_solv) - - - class ActionReinstall(Action): -@@ -471,10 +469,10 @@ class ActionReinstall(Action): - def run(self): - # Remove package from the database and add it afterwards. - # Sounds weird, but fixes broken entries in the database. -- self.local.rem_package(self.pkg) -+ self.local.rem_package(self.pkg_solv) - self.local.add_package(self.pkg) - -- self.pkg.extract(_("Installing"), prefix=self.pakfire.path) -+ self.pkg.extract(_("Reinstalling"), prefix=self.pakfire.path) - - - class ActionDowngrade(Action): -diff --git a/python/pakfire/base.py b/python/pakfire/base.py -index 6e2e52e..54485a5 100644 ---- a/python/pakfire/base.py -+++ b/python/pakfire/base.py -@@ -132,7 +132,7 @@ class Pakfire(object): - - return ret - -- def create_request(self, builder=False, install=None, remove=None, update=None): -+ def create_request(self, builder=False, install=None, remove=None, update=None, updateall=False): - request = satsolver.Request(self.pool) - - # Add multiinstall information. -@@ -151,6 +151,11 @@ class Pakfire(object): - for req in self.expand_requires(update): - request.update(req) - -+ # Configure the request to update all packages -+ # if requested. -+ if updateall: -+ request.updateall() -+ - # Return the request. - return request - -@@ -467,12 +472,11 @@ class Pakfire(object): - - # If there are given any packets on the command line, we will - # only update them. Otherwise, we update the whole system. -+ updateall = True - if pkgs: -- update = False -- else: -- update = True -+ updateall = False - -- request = self.create_request(update=pkgs) -+ request = self.create_request(update=pkgs, updateall=updateall) - - # Exclude packages that should not be updated. - for exclude in excludes or []: -@@ -481,7 +485,7 @@ class Pakfire(object): - exclude = self.create_relation(exclude) - request.lock(exclude) - -- solver = self.solv(request, logger=logger, update=update, **kwargs) -+ solver = self.solv(request, logger=logger, **kwargs) - - if not solver.status: - logger.info(_("Nothing to do")) -@@ -534,8 +538,11 @@ class Pakfire(object): - request.install(rel) - - # Solve the request. -- solver = self.solv(request, allow_downgrade=True, allow_vendorchange=allow_vendorchange, -- allow_archchange=allow_archchange) -+ solver = self.solv(request, -+ allow_downgrade=True, -+ allow_vendorchange=allow_vendorchange, -+ allow_archchange=allow_archchange, -+ ) - assert solver.status is True - - # Create the transaction. -@@ -556,7 +563,7 @@ class Pakfire(object): - request = self.create_request(remove=pkgs) - - # Solve the request. -- solver = self.solv(request, uninstall=True) -+ solver = self.solv(request, allow_uninstall=True) - assert solver.status is True - - # Create the transaction. -@@ -737,7 +744,7 @@ class Pakfire(object): - # Clean up repository caches. - self.repos.clean() - -- def check(self, downgrade=True, uninstall=True): -+ def check(self, allow_downgrade=True, allow_uninstall=True): - """ - Try to fix any errors in the system. - """ -@@ -745,8 +752,13 @@ class Pakfire(object): - # For that we create an empty request and solver and try to solve - # something. - request = self.create_request() -- solver = self.solv(request, fix_system=True, allow_downgrade=downgrade, -- uninstall=uninstall) -+ request.verify() -+ -+ solver = self.solv( -+ request, -+ allow_downgrade=allow_downgrade, -+ allow_uninstall=allow_uninstall, -+ ) - - if solver.status is False: - log.info(_("Everything is fine.")) -diff --git a/python/pakfire/builder.py b/python/pakfire/builder.py -index 494049e..863ade3 100644 ---- a/python/pakfire/builder.py -+++ b/python/pakfire/builder.py -@@ -761,7 +761,8 @@ class BuildEnviron(object): - - # Install all packages that were built. - self.install(self.find_result_packages(), -- uninstall=True, signatures_mode="disabled") -+ allow_vendorchange=True, allow_archchange=True, -+ allow_uninstall=True, signatures_mode="disabled") - - self.log.info(_("Installation test succeeded.")) - self.log.info("") -diff --git a/python/pakfire/filelist.py b/python/pakfire/filelist.py -index ef7ee35..4bac6ef 100644 ---- a/python/pakfire/filelist.py -+++ b/python/pakfire/filelist.py -@@ -74,13 +74,12 @@ class File(_File): - - - class FileDatabase(_File): -- def __init__(self, pakfire, db, row_id): -+ def __init__(self, pakfire, db, row_id, row=None): - _File.__init__(self, pakfire) - - self.db = db - self.row_id = row_id -- -- self.__row = None -+ self.__row = row - - @property - def row(self): -@@ -91,13 +90,7 @@ class FileDatabase(_File): - c = self.db.cursor() - c.execute("SELECT * FROM files WHERE id = ? LIMIT 1", (self.row_id,)) - -- # Check if we got the same row. -- #assert c.lastrowid == self.row_id -- -- for row in c: -- self.__row = row -- break -- -+ self.__row = c.fetchone() - c.close() - - return self.__row -diff --git a/python/pakfire/packages/installed.py b/python/pakfire/packages/installed.py -index 5a7763b..33c241d 100644 ---- a/python/pakfire/packages/installed.py -+++ b/python/pakfire/packages/installed.py -@@ -39,6 +39,7 @@ class DatabasePackage(Package): - self.db = db - - self._data = {} -+ self._filelist = None - - for key in data.keys(): - self._data[key] = data[key] -@@ -169,20 +170,21 @@ class DatabasePackage(Package): - - @property - def filename(self): -- return self.metadata.get("filename") # XXX basename? -+ return self.metadata.get("filename") - - @property - def filelist(self): -- filelist = [] -+ if self._filelist is None: -+ self._filelist = [] - -- c = self.db.cursor() -- c.execute("SELECT id FROM files WHERE pkg = ?", (self.id,)) -+ c = self.db.cursor() -+ c.execute("SELECT * FROM files WHERE pkg = ?", (self.id,)) - -- for id in c: -- file = pakfire.filelist.FileDatabase(self.pakfire, self.db, id[0]) -- filelist.append(file) -+ for row in c.fetchall(): -+ file = pakfire.filelist.FileDatabase(self.pakfire, self.db, row["id"], row) -+ self._filelist.append(file) - -- return filelist -+ return self._filelist - - @property - def configfiles(self): -diff --git a/python/pakfire/repository/database.py b/python/pakfire/repository/database.py -index 6f8f397..a5e5b85 100644 ---- a/python/pakfire/repository/database.py -+++ b/python/pakfire/repository/database.py -@@ -53,6 +53,13 @@ class Database(object): - self._db.close() - self._db = None - -+ @property -+ def db(self): -+ if self._db is None: -+ self.open() -+ -+ return self._db -+ - def create(self): - pass - -@@ -338,11 +345,11 @@ class DatabaseLocal(Database): - #c.execute("SELECT id FROM packages WHERE name = ? AND epoch = ? AND version = ?" - # " AND release = ? LIMIT 1", (pkg.name, pkg.epoch, pkg.version, pkg.release,)) - -- id = None -- for row in c: -- id = row["id"] -- break -- assert id -+ row = c.fetchone() -+ if not row: -+ return -+ -+ id = row["id"] - - # First, delete all files from the database and then delete the pkg itself. - c.execute("DELETE FROM files WHERE pkg = ?", (id,)) -@@ -364,34 +371,29 @@ class DatabaseLocal(Database): - - @property - def packages(self): -- c = self.cursor() -+ c = self.db.execute("SELECT * FROM packages ORDER BY name") - -- c.execute("SELECT * FROM packages ORDER BY name") -- -- for row in c: -+ for row in c.fetchall(): - yield packages.DatabasePackage(self.pakfire, self.repo, self, row) - - c.close() - - def get_filelist(self): -- c = self.cursor() -- c.execute("SELECT DISTINCT name FROM files") -- -- ret = [] -- for row in c: -- ret.append(row["name"]) -- -- c.close() -+ c = self.db.execute("SELECT name FROM files") - -- return ret -+ return [r["name"] for r in c.fetchall()] - - def get_package_from_solv(self, solv_pkg): -- c = self.cursor() -- c.execute("SELECT * FROM packages WHERE uuid = ? LIMIT 1", (solv_pkg.uuid,)) -+ assert solv_pkg.uuid -+ -+ c = self.db.execute("SELECT * FROM packages WHERE uuid = ? LIMIT 1", (solv_pkg.uuid,)) - - try: -- for row in c: -- return packages.DatabasePackage(self.pakfire, self.repo, self, row) -+ row = c.fetchone() -+ if row is None: -+ return -+ -+ return packages.DatabasePackage(self.pakfire, self.repo, self, row) - - finally: - c.close() -diff --git a/python/pakfire/repository/index.py b/python/pakfire/repository/index.py -index fac1c2f..7620b38 100644 ---- a/python/pakfire/repository/index.py -+++ b/python/pakfire/repository/index.py -@@ -24,6 +24,7 @@ import os - import logging - log = logging.getLogger("pakfire") - -+import pakfire.packages as packages - import pakfire.satsolver as satsolver - - class Index(object): -@@ -147,8 +148,12 @@ class Index(object): - solvable.add_provides(rel) - - def rem_package(self, pkg): -- # XXX delete the solvable from the index. -- pass # TODO -+ """ -+ Delete the solvable from the index. -+ """ -+ assert isinstance(pkg, packages.SolvPackage) -+ -+ self.solver_repo.rem_solv(pkg) - - def clear(self): - """ -diff --git a/python/pakfire/repository/system.py b/python/pakfire/repository/system.py -index ce3e979..386f252 100644 ---- a/python/pakfire/repository/system.py -+++ b/python/pakfire/repository/system.py -@@ -19,9 +19,17 @@ - # # - ############################################################################### - -+import os -+ - import base - import database - -+import pakfire.packages as packages -+import pakfire.util as util -+ -+from pakfire.constants import * -+from pakfire.i18n import _ -+ - class RepositorySystem(base.RepositoryFactory): - def __init__(self, pakfire): - base.RepositoryFactory.__init__(self, pakfire, "@system", "Local repository") -@@ -33,6 +41,10 @@ class RepositorySystem(base.RepositoryFactory): - self.pool.set_installed(self.solver_repo) - - @property -+ def cache_file(self): -+ return os.path.join(self.pakfire.path, PACKAGES_SOLV) -+ -+ @property - def priority(self): - """ - The local repository has always a high priority. -@@ -40,14 +52,35 @@ class RepositorySystem(base.RepositoryFactory): - return 10 - - def update(self, force=False, offline=False): -- if not force: -- force = len(self) == 0 -+ # XXX using the cache is currently disabled -+ #if not force: -+ # if os.path.exists(self.cache_file): -+ # self.index.read(self.cache_file) -+ # -+ # force = len(self) == 0 -+ -+ force = True - - if force: -+ # Create a progressbar. -+ pb = util.make_progress(_("Loading installed packages"), len(self.db)) -+ -+ # Remove all data from the current index. - self.index.clear() -+ -+ i = 0 - for pkg in self.db.packages: -+ if pb: -+ i += 1 -+ pb.update(i) -+ - self.index.add_package(pkg) - -+ self.index.optimize() -+ -+ if pb: -+ pb.finish() -+ - def commit(self): - # Commit the database to disk. - self.db.commit() -@@ -55,20 +88,23 @@ class RepositorySystem(base.RepositoryFactory): - # Make sure that all data in the index is accessable. - self.index.optimize() - -+ # Write the content of the index to a file -+ # for fast parsing. -+ # XXX this is currently disabled -+ #self.index.write(self.cache_file) -+ - def add_package(self, pkg): - # Add package to the database. - self.db.add_package(pkg) - self.index.add_package(pkg) - - def rem_package(self, pkg): -+ assert isinstance(pkg, packages.SolvPackage), pkg -+ - # Remove package from the database. - self.db.rem_package(pkg) - self.index.rem_package(pkg) - - @property - def filelist(self): -- # XXX ugly? -- -- for pkg in self.db.packages: -- for file in pkg.filelist: -- yield file -+ return self.db.get_filelist() -diff --git a/python/pakfire/satsolver.py b/python/pakfire/satsolver.py -index c3629ce..48c6d0d 100644 ---- a/python/pakfire/satsolver.py -+++ b/python/pakfire/satsolver.py -@@ -111,6 +111,13 @@ class Request(_pakfire.Request): - - - class Solver(object): -+ option2flag = { -+ "allow_archchange" : SOLVER_FLAG_ALLOW_ARCHCHANGE, -+ "allow_downgrade" : SOLVER_FLAG_ALLOW_DOWNGRADE, -+ "allow_uninstall" : SOLVER_FLAG_ALLOW_UNINSTALL, -+ "allow_vendorchange" : SOLVER_FLAG_ALLOW_VENDORCHANGE, -+ } -+ - def __init__(self, pakfire, request, logger=None): - if logger is None: - logger = logging.getLogger("pakfire") -@@ -119,27 +126,6 @@ class Solver(object): - self.pakfire = pakfire - self.pool = self.pakfire.pool - -- # Default settings. -- self.settings = { -- # Update all installed packages? -- "update" : False, -- -- # Allow to uninstall any packages? -- "uninstall" : False, -- -- # Allow to downgrade any packages? -- "allow_downgrade" : False, -- -- # Allow packages to change their vendors? -- "allow_vendorchange" : False, -- -- # Allow packages to change their arch? -- "allow_archchange" : False, -- -- # Fix system? -- "fix_system" : False, -- } -- - self.request = request - assert self.request, "Empty request?" - -@@ -159,40 +145,23 @@ class Solver(object): - self.__problems = None - self.__transaction = None - -- def set(self, key, value): -- assert self.settings.has_key(key), "Unknown configuration setting: %s" % key -- assert value in (True, False), "Invalid value: %s" % value -- -+ def set(self, option, value): - try: -- self.settings[key] = value -+ flag = self.option2flag[option] - except KeyError: -- pass -+ raise Exception, "Unknown configuration setting: %s" % option -+ self.solver.set_flag(flag, value) - -- def get(self, key): -- assert self.settings.has_key(key), "Unknown configuration setting: %s" % key -- -- return self.settings.get(key) -+ def get(self, option): -+ try: -+ flag = self.option2flag[option] -+ except KeyError: -+ raise Exception, "Unknown configuration setting: %s" % option -+ return self.solver.get_flag(flag) - - def solve(self): - assert self.status is None, "Solver did already solve something." - -- # Apply solver configuration. -- self.solver.set_fix_system(self.get("fix_system")) -- self.solver.set_allow_uninstall(self.get("uninstall")) -- self.solver.set_allow_downgrade(self.get("allow_downgrade")) -- -- # Optionally allow packages to change their vendors. -- # This is not recommended because it may have weird effects. -- self.solver.set_allow_vendorchange(self.get("allow_vendorchange")) -- -- # Optionally allow packages ot change their architecture. -- self.solver.set_allow_archchange(self.get("allow_archchange")) -- -- # Configure the solver for an update. -- if self.get("update"): -- self.solver.set_updatesystem(True) -- self.solver.set_do_split_provides(True) -- - # Actually solve the request. - start_time = time.time() - self.status = self.solver.solve(self.request) -diff --git a/python/pakfire/transaction.py b/python/pakfire/transaction.py -index 58b52c6..10a1277 100644 ---- a/python/pakfire/transaction.py -+++ b/python/pakfire/transaction.py -@@ -59,15 +59,16 @@ class TransactionCheck(object): - - @property - def error_files(self): -- ret = {} -+ ret = [] - -- for name, files in self.filelist.items(): -- if len(files) <= 1: -- continue -+ for name, count in self.filelist.items(): -+ if count > 1: -+ ret.append(name) - -- ret[name] = files -+ return sorted(ret) - -- return ret -+ def provides_file(self, name): -+ return [] # XXX TODO - - @property - def successful(self): -@@ -85,18 +86,16 @@ class TransactionCheck(object): - if logger is None: - logger = logging.getLogger("pakfire") - -- for name, files in sorted(self.error_files.items()): -- assert len(files) >= 2 -- -- pkgs = [f.pkg.friendly_name for f in files] -+ for file in self.error_files: -+ pkgs = self.provides_file(file) - -- if len(files) == 2: -+ if len(pkgs) == 2: - logger.critical( - _("file %(name)s from %(pkg1)s conflicts with file from package %(pkg2)s") % \ - { "name" : name, "pkg1" : pkgs[0], "pkg2" : pkgs[1] } - ) - -- elif len(files) >= 3: -+ elif len(pkgs) >= 3: - logger.critical( - _("file %(name)s from %(pkg)s conflicts with files from %(pkgs)s") % \ - { "name" : name, "pkg" : pkgs[0], "pkgs" : i18n.list(pkgs[1:])} -@@ -113,7 +112,7 @@ class TransactionCheck(object): - filelist = {} - - for file in self.pakfire.repos.local.filelist: -- filelist[file.name] = [file,] -+ filelist[file] = 1 - - return filelist - -@@ -122,11 +121,10 @@ class TransactionCheck(object): - if file.is_dir(): - continue - -- if self.filelist.has_key(file.name): -- self.filelist[file.name].append(file) -- -- else: -- self.filelist[file.name] = [file,] -+ try: -+ self.filelist[file.name] += 1 -+ except KeyError: -+ self.filelist[file.name] = 1 - - # Add all filesize data to mountpoints. - self.mountpoints.add_pkg(pkg) -@@ -136,14 +134,10 @@ class TransactionCheck(object): - if file.is_dir(): - continue - -- if not self.filelist.has_key(file.name): -- continue -- -- for f in self.filelist[file.name]: -- if not f.pkg == pkg: -- continue -- -- self.filelist[file.name].remove(f) -+ try: -+ self.filelist[file.name] -= 1 -+ except KeyError: -+ pass - - # Remove all filesize data from mountpoints. - self.mountpoints.rem_pkg(pkg) -@@ -562,8 +556,11 @@ class Transaction(object): - for action in self.actions: - try: - action.run() -+ - except ActionError, e: - logger.error("Action finished with an error: %s - %s" % (action, e)) -+ #except Exception, e: -+ # logger.error(_("An unforeseen error occoured: %s") % e) - - logger.info("") - -diff --git a/python/src/_pakfiremodule.c b/python/src/_pakfiremodule.c -index d4ea688..8e80468 100644 ---- a/python/src/_pakfiremodule.c -+++ b/python/src/_pakfiremodule.c -@@ -80,6 +80,9 @@ static PyMethodDef Request_methods[] = { - {"noobsoletes_solvable", (PyCFunction)Request_noobsoletes_solvable, METH_VARARGS, NULL}, - {"noobsoletes_relation", (PyCFunction)Request_noobsoletes_relation, METH_VARARGS, NULL}, - {"noobsoletes_name", (PyCFunction)Request_noobsoletes_name, METH_VARARGS, NULL}, -+ {"updateall", (PyCFunction)Request_updateall, METH_NOARGS, NULL}, -+ {"distupgrade", (PyCFunction)Request_distupgrade, METH_NOARGS, NULL}, -+ {"verify", (PyCFunction)Request_verify, METH_NOARGS, NULL}, - { NULL, NULL, 0, NULL } - }; - -@@ -99,6 +102,7 @@ static PyMethodDef Repo_methods[] = { - {"internalize", (PyCFunction)Repo_internalize, METH_NOARGS, NULL}, - {"clear", (PyCFunction)Repo_clear, METH_NOARGS, NULL}, - {"get_all", (PyCFunction)Repo_get_all, METH_NOARGS, NULL}, -+ {"rem_solv", (PyCFunction)Repo_rem_solv, METH_VARARGS, NULL}, - { NULL, NULL, 0, NULL } - }; - -@@ -152,10 +156,8 @@ static PyMethodDef Solution_methods[] = { - - static PyMethodDef Solver_methods[] = { - {"solve", (PyCFunction)Solver_solve, METH_VARARGS, NULL}, -- {"get_fix_system", (PyCFunction)Solver_get_fix_system, METH_NOARGS, NULL}, -- {"set_fix_system", (PyCFunction)Solver_set_fix_system, METH_VARARGS, NULL}, -- {"get_allow_downgrade", (PyCFunction)Solver_get_allow_downgrade, METH_NOARGS, NULL}, -- {"set_allow_downgrade", (PyCFunction)Solver_set_allow_downgrade, METH_VARARGS, NULL}, -+ {"get_flag", (PyCFunction)Solver_get_flag, METH_VARARGS, NULL}, -+ {"set_flag", (PyCFunction)Solver_set_flag, METH_VARARGS, NULL}, - {"get_allow_archchange", (PyCFunction)Solver_get_allow_archchange, METH_NOARGS, NULL}, - {"set_allow_archchange", (PyCFunction)Solver_set_allow_archchange, METH_VARARGS, NULL}, - {"get_allow_vendorchange", (PyCFunction)Solver_get_allow_vendorchange, METH_NOARGS, NULL}, -@@ -307,4 +309,12 @@ void init_pakfire(void) { - PyDict_SetItemString(d, "SOLVER_RULE_FEATURE", Py_BuildValue("i", SOLVER_RULE_FEATURE)); - PyDict_SetItemString(d, "SOLVER_RULE_LEARNT", Py_BuildValue("i", SOLVER_RULE_LEARNT)); - PyDict_SetItemString(d, "SOLVER_RULE_CHOICE", Py_BuildValue("i", SOLVER_RULE_CHOICE)); -+ -+ /* Solver flags */ -+ PyDict_SetItemString(d, "SOLVER_FLAG_ALLOW_DOWNGRADE", Py_BuildValue("i", SOLVER_FLAG_ALLOW_DOWNGRADE)); -+ PyDict_SetItemString(d, "SOLVER_FLAG_ALLOW_ARCHCHANGE", Py_BuildValue("i", SOLVER_FLAG_ALLOW_ARCHCHANGE)); -+ PyDict_SetItemString(d, "SOLVER_FLAG_ALLOW_VENDORCHANGE", Py_BuildValue("i", SOLVER_FLAG_ALLOW_VENDORCHANGE)); -+ PyDict_SetItemString(d, "SOLVER_FLAG_ALLOW_UNINSTALL", Py_BuildValue("i", SOLVER_FLAG_ALLOW_UNINSTALL)); -+ PyDict_SetItemString(d, "SOLVER_FLAG_NO_UPDATEPROVIDE", Py_BuildValue("i", SOLVER_FLAG_NO_UPDATEPROVIDE)); -+ PyDict_SetItemString(d, "SOLVER_FLAG_SPLITPROVIDES", Py_BuildValue("i", SOLVER_FLAG_SPLITPROVIDES)); - } -diff --git a/python/src/repo.c b/python/src/repo.c -index 6621c3b..4bc112a 100644 ---- a/python/src/repo.c -+++ b/python/src/repo.c -@@ -47,7 +47,6 @@ PyObject* Repo_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - const char *name; - - if (!PyArg_ParseTuple(args, "Os", &pool, &name)) { -- /* XXX raise exception */ - return NULL; - } - -@@ -67,7 +66,6 @@ PyObject* Repo_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - } - - PyObject *Repo_dealloc(RepoObject *self) { -- // repo_free(self->_repo, 0); - self->ob_type->tp_free((PyObject *)self); - - Py_RETURN_NONE; -@@ -97,7 +95,6 @@ PyObject *Repo_set_enabled(RepoObject *self, PyObject *args) { - bool enabled; - - if (!PyArg_ParseTuple(args, "b", &enabled)) { -- /* XXX raise exception */ - return NULL; - } - -@@ -132,13 +129,12 @@ PyObject *Repo_write(RepoObject *self, PyObject *args) { - char exception[STRING_SIZE]; - - if (!PyArg_ParseTuple(args, "s", &filename)) { -- /* XXX raise exception */ -+ return NULL; - } - - // Prepare the pool and internalize all attributes. -- _Pool_prepare(self->_repo->pool); -+ //_Pool_prepare(self->_repo->pool); - -- // XXX catch if file cannot be opened - FILE *fp = NULL; - if ((fp = fopen(filename, "wb")) == NULL) { - snprintf(exception, STRING_SIZE - 1, "Could not open file for writing: %s (%s).", -@@ -147,8 +143,7 @@ PyObject *Repo_write(RepoObject *self, PyObject *args) { - return NULL; - } - -- repo_write(self->_repo, fp, NULL, NULL, 0); -- -+ repo_write(self->_repo, fp); - fclose(fp); - - Py_RETURN_NONE; -@@ -158,14 +153,12 @@ PyObject *Repo_read(RepoObject *self, PyObject *args) { - const char *filename; - - if (!PyArg_ParseTuple(args, "s", &filename)) { -- /* XXX raise exception */ -+ return NULL; - } - - // XXX catch if file cannot be opened - FILE *fp = fopen(filename, "rb"); -- -- repo_add_solv(self->_repo, fp); -- -+ repo_add_solv(self->_repo, fp, 0); - fclose(fp); - - Py_RETURN_NONE; -@@ -209,3 +202,17 @@ PyObject *Repo_get_all(RepoObject *self) { - - return list; - } -+ -+PyObject *Repo_rem_solv(RepoObject *self, PyObject *args) { -+ Repo *repo = self->_repo; -+ SolvableObject *solv; -+ -+ if (!PyArg_ParseTuple(args, "O", &solv)) { -+ return NULL; -+ } -+ -+ Solvable *s = pool_id2solvable(repo->pool, solv->_id); -+ repo_free_solvable(repo, s - repo->pool->solvables, 1); -+ -+ Py_RETURN_NONE; -+} -diff --git a/python/src/repo.h b/python/src/repo.h -index 9de636f..3ef96df 100644 ---- a/python/src/repo.h -+++ b/python/src/repo.h -@@ -44,6 +44,7 @@ extern PyObject *Repo_read(RepoObject *self, PyObject *args); - extern PyObject *Repo_internalize(RepoObject *self); - extern PyObject *Repo_clear(RepoObject *self); - extern PyObject *Repo_get_all(RepoObject *self); -+extern PyObject *Repo_rem_solv(RepoObject *self, PyObject *args); - - extern PyTypeObject RepoType; - -diff --git a/python/src/request.c b/python/src/request.c -index 168b455..7d7c5b2 100644 ---- a/python/src/request.c -+++ b/python/src/request.c -@@ -64,29 +64,25 @@ PyObject *Request_dealloc(RequestObject *self) { - } - - void _Request_solvable(RequestObject *self, Id what, Id solvable) { -- queue_push(&self->_queue, what|SOLVER_SOLVABLE); -- queue_push(&self->_queue, solvable); -+ queue_push2(&self->_queue, what|SOLVER_SOLVABLE, solvable); - } - - void _Request_relation(RequestObject *self, Id what, Id relation) { -- queue_push(&self->_queue, what|SOLVER_SOLVABLE_PROVIDES); -- queue_push(&self->_queue, relation); -+ queue_push2(&self->_queue, what|SOLVER_SOLVABLE_PROVIDES, relation); - } - - void _Request_name(RequestObject *self, Id what, Id provides) { -- queue_push(&self->_queue, what|SOLVER_SOLVABLE_NAME); -- queue_push(&self->_queue, provides); -+ queue_push2(&self->_queue, what|SOLVER_SOLVABLE_NAME, provides); - } - - PyObject *Request_install_solvable(RequestObject *self, PyObject *args) { - SolvableObject *solv; - - if (!PyArg_ParseTuple(args, "O", &solv)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_solvable(self, SOLVER_INSTALL, solv->_id); -- - Py_RETURN_NONE; - } - -@@ -94,11 +90,10 @@ PyObject *Request_install_relation(RequestObject *self, PyObject *args) { - RelationObject *rel; - - if (!PyArg_ParseTuple(args, "O", &rel)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_relation(self, SOLVER_INSTALL, rel->_id); -- - Py_RETURN_NONE; - } - -@@ -106,7 +101,7 @@ PyObject *Request_install_name(RequestObject *self, PyObject *args) { - const char *name; - - if (!PyArg_ParseTuple(args, "s", &name)) { -- /* XXX raise exception */ -+ return NULL; - } - - Id _name = pool_str2id(self->_pool, name, 1); -@@ -119,11 +114,10 @@ PyObject *Request_remove_solvable(RequestObject *self, PyObject *args) { - SolvableObject *solv; - - if (!PyArg_ParseTuple(args, "O", &solv)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_solvable(self, SOLVER_ERASE, solv->_id); -- - Py_RETURN_NONE; - } - -@@ -131,11 +125,10 @@ PyObject *Request_remove_relation(RequestObject *self, PyObject *args) { - RelationObject *rel; - - if (!PyArg_ParseTuple(args, "O", &rel)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_relation(self, SOLVER_ERASE, rel->_id); -- - Py_RETURN_NONE; - } - -@@ -143,7 +136,7 @@ PyObject *Request_remove_name(RequestObject *self, PyObject *args) { - const char *name; - - if (!PyArg_ParseTuple(args, "s", &name)) { -- /* XXX raise exception */ -+ return NULL; - } - - Id _name = pool_str2id(self->_pool, name, 1); -@@ -156,11 +149,10 @@ PyObject *Request_update_solvable(RequestObject *self, PyObject *args) { - SolvableObject *solv; - - if (!PyArg_ParseTuple(args, "O", &solv)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_solvable(self, SOLVER_UPDATE, solv->_id); -- - Py_RETURN_NONE; - } - -@@ -168,11 +160,10 @@ PyObject *Request_update_relation(RequestObject *self, PyObject *args) { - RelationObject *rel; - - if (!PyArg_ParseTuple(args, "O", &rel)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_relation(self, SOLVER_UPDATE, rel->_id); -- - Py_RETURN_NONE; - } - -@@ -180,7 +171,7 @@ PyObject *Request_update_name(RequestObject *self, PyObject *args) { - const char *name; - - if (!PyArg_ParseTuple(args, "s", &name)) { -- /* XXX raise exception */ -+ return NULL; - } - - Id _name = pool_str2id(self->_pool, name, 1); -@@ -193,11 +184,10 @@ PyObject *Request_lock_solvable(RequestObject *self, PyObject *args) { - SolvableObject *solv; - - if (!PyArg_ParseTuple(args, "O", &solv)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_solvable(self, SOLVER_LOCK, solv->_id); -- - Py_RETURN_NONE; - } - -@@ -205,11 +195,10 @@ PyObject *Request_lock_relation(RequestObject *self, PyObject *args) { - RelationObject *rel; - - if (!PyArg_ParseTuple(args, "O", &rel)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_relation(self, SOLVER_LOCK, rel->_id); -- - Py_RETURN_NONE; - } - -@@ -217,7 +206,7 @@ PyObject *Request_lock_name(RequestObject *self, PyObject *args) { - const char *name; - - if (!PyArg_ParseTuple(args, "s", &name)) { -- /* XXX raise exception */ -+ return NULL; - } - - Id _name = pool_str2id(self->_pool, name, 1); -@@ -230,11 +219,10 @@ PyObject *Request_noobsoletes_solvable(RequestObject *self, PyObject *args) { - SolvableObject *solv; - - if (!PyArg_ParseTuple(args, "O", &solv)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_solvable(self, SOLVER_NOOBSOLETES, solv->_id); -- - Py_RETURN_NONE; - } - -@@ -242,11 +230,10 @@ PyObject *Request_noobsoletes_relation(RequestObject *self, PyObject *args) { - RelationObject *rel; - - if (!PyArg_ParseTuple(args, "O", &rel)) { -- /* XXX raise exception */ -+ return NULL; - } - - _Request_relation(self, SOLVER_NOOBSOLETES, rel->_id); -- - Py_RETURN_NONE; - } - -@@ -254,7 +241,7 @@ PyObject *Request_noobsoletes_name(RequestObject *self, PyObject *args) { - const char *name; - - if (!PyArg_ParseTuple(args, "s", &name)) { -- /* XXX raise exception */ -+ return NULL; - } - - Id _name = pool_str2id(self->_pool, name, 1); -@@ -262,3 +249,18 @@ PyObject *Request_noobsoletes_name(RequestObject *self, PyObject *args) { - - Py_RETURN_NONE; - } -+ -+PyObject *Request_updateall(RequestObject *self, PyObject *args) { -+ queue_push2(&self->_queue, SOLVER_UPDATE|SOLVER_SOLVABLE_ALL, 0); -+ Py_RETURN_NONE; -+} -+ -+PyObject *Request_distupgrade(RequestObject *self, PyObject *args) { -+ queue_push2(&self->_queue, SOLVER_DISTUPGRADE|SOLVER_SOLVABLE_ALL, 0); -+ Py_RETURN_NONE; -+} -+ -+PyObject *Request_verify(RequestObject *self, PyObject *args) { -+ queue_push2(&self->_queue, SOLVER_VERIFY|SOLVER_SOLVABLE_ALL, 0); -+ Py_RETURN_NONE; -+} -diff --git a/python/src/request.h b/python/src/request.h -index b936801..aa79274 100644 ---- a/python/src/request.h -+++ b/python/src/request.h -@@ -59,6 +59,10 @@ extern PyObject *Request_noobsoletes_solvable(RequestObject *self, PyObject *arg - extern PyObject *Request_noobsoletes_relation(RequestObject *self, PyObject *args); - extern PyObject *Request_noobsoletes_name(RequestObject *self, PyObject *args); - -+extern PyObject *Request_updateall(RequestObject *self, PyObject *args); -+extern PyObject *Request_distupgrade(RequestObject *self, PyObject *args); -+extern PyObject *Request_verify(RequestObject *self, PyObject *args); -+ - extern PyTypeObject RequestType; - - #endif -diff --git a/python/src/solution.c b/python/src/solution.c -index b52a1b5..7360a37 100644 ---- a/python/src/solution.c -+++ b/python/src/solution.c -@@ -82,7 +82,7 @@ PyObject *Solution_string(SolutionObject *self) { - - switch (how & SOLVER_JOBMASK) { - case SOLVER_INSTALL: -- if (select == SOLVER_SOLVABLE && solver->installed && pool->solvables[what].repo == solver->installed) -+ if (select == SOLVER_SOLVABLE && pool->installed && pool->solvables[what].repo == pool->installed) - snprintf(str, STRING_SIZE - 1, _("do not keep %s installed"), - pool_solvid2str(pool, what)); - else if (select == SOLVER_SOLVABLE_PROVIDES) -@@ -94,7 +94,7 @@ PyObject *Solution_string(SolutionObject *self) { - break; - - case SOLVER_ERASE: -- if (select == SOLVER_SOLVABLE && !(solver->installed && pool->solvables[what].repo == solver->installed)) -+ if (select == SOLVER_SOLVABLE && !(pool->installed && pool->solvables[what].repo == pool->installed)) - snprintf(str, STRING_SIZE - 1, _("do not forbid installation of %s"), - pool_solvid2str(pool, what)); - else if (select == SOLVER_SOLVABLE_PROVIDES) -@@ -122,7 +122,7 @@ PyObject *Solution_string(SolutionObject *self) { - - } else if (p == SOLVER_SOLUTION_INFARCH) { - s = pool->solvables + rp; -- if (solver->installed && s->repo == solver->installed) -+ if (pool->installed && s->repo == pool->installed) - snprintf(str, STRING_SIZE - 1, _("keep %s despite the inferior architecture"), - pool_solvable2str(pool, s)); - else -@@ -131,7 +131,7 @@ PyObject *Solution_string(SolutionObject *self) { - - } else if (p == SOLVER_SOLUTION_DISTUPGRADE) { - s = pool->solvables + rp; -- if (solver->installed && s->repo == solver->installed) -+ if (pool->installed && s->repo == pool->installed) - snprintf(str, STRING_SIZE - 1, _("keep obsolete %s"), - pool_solvable2str(pool, s)); - else -diff --git a/python/src/solver.c b/python/src/solver.c -index 5079510..54e1294 100644 ---- a/python/src/solver.c -+++ b/python/src/solver.c -@@ -53,6 +53,9 @@ PyObject* Solver_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { - } - } - -+ /* enable splitprovides by default */ -+ solver_set_flag(self->_solver, SOLVER_FLAG_SPLITPROVIDES, 1); -+ - return (PyObject *)self; - } - -@@ -63,138 +66,150 @@ PyObject *Solver_dealloc(SolverObject *self) { - Py_RETURN_NONE; - } - --PyObject *Solver_get_fix_system(SolverObject *self, PyObject *args) { -- return Py_BuildValue("i", self->_solver->fixsystem); -+PyObject *Solver_get_flag(SolverObject *self, PyObject *args) { -+ int flag = 0; -+ -+ if (!PyArg_ParseTuple(args, "i", &flag)) { -+ return NULL; -+ } -+ -+ int val = solver_get_flag(self->_solver, flag); -+ return Py_BuildValue("i", val); - } - --PyObject *Solver_set_fix_system(SolverObject *self, PyObject *args) { -- int val; -+PyObject *Solver_set_flag(SolverObject *self, PyObject *args) { -+ int flag = 0, val = 0; - -- if (!PyArg_ParseTuple(args, "i", &val)) { -- /* XXX raise exception */ -+ if (!PyArg_ParseTuple(args, "ii", &flag, &val)) { -+ return NULL; - } - -- self->_solver->fixsystem = val; -- -+ solver_set_flag(self->_solver, flag, val); - Py_RETURN_NONE; - } - - PyObject *Solver_get_allow_downgrade(SolverObject *self, PyObject *args) { -- return Py_BuildValue("i", self->_solver->allowdowngrade); -+ int val = solver_get_flag(self->_solver, SOLVER_FLAG_ALLOW_DOWNGRADE); -+ -+ return Py_BuildValue("i", val); - } - - PyObject *Solver_set_allow_downgrade(SolverObject *self, PyObject *args) { - int val; - - if (!PyArg_ParseTuple(args, "i", &val)) { -- /* XXX raise exception */ -+ return NULL; - } - -- self->_solver->allowdowngrade = val; -- -+ solver_set_flag(self->_solver, SOLVER_FLAG_ALLOW_DOWNGRADE, val); - Py_RETURN_NONE; - } - - PyObject *Solver_get_allow_archchange(SolverObject *self, PyObject *args) { -- return Py_BuildValue("i", self->_solver->allowarchchange); -+ int val = solver_get_flag(self->_solver, SOLVER_FLAG_ALLOW_ARCHCHANGE); -+ -+ return Py_BuildValue("i", val); - } - - PyObject *Solver_set_allow_archchange(SolverObject *self, PyObject *args) { - int val; - - if (!PyArg_ParseTuple(args, "i", &val)) { -- /* XXX raise exception */ -+ return NULL; - } - -- self->_solver->allowarchchange = val; -- -+ solver_set_flag(self->_solver, SOLVER_FLAG_ALLOW_ARCHCHANGE, val); - Py_RETURN_NONE; - } - - PyObject *Solver_get_allow_vendorchange(SolverObject *self, PyObject *args) { -- return Py_BuildValue("i", self->_solver->allowvendorchange); -+ int val = solver_get_flag(self->_solver, SOLVER_FLAG_ALLOW_VENDORCHANGE); -+ -+ return Py_BuildValue("i", val); - } - - PyObject *Solver_set_allow_vendorchange(SolverObject *self, PyObject *args) { - int val; - - if (!PyArg_ParseTuple(args, "i", &val)) { -- /* XXX raise exception */ -+ return NULL; - } - -- self->_solver->allowvendorchange = val; -- -+ solver_set_flag(self->_solver, SOLVER_FLAG_ALLOW_VENDORCHANGE, val); - Py_RETURN_NONE; - } - - PyObject *Solver_get_allow_uninstall(SolverObject *self, PyObject *args) { -- return Py_BuildValue("i", self->_solver->allowuninstall); -+ int val = solver_get_flag(self->_solver, SOLVER_FLAG_ALLOW_UNINSTALL); -+ -+ return Py_BuildValue("i", val); - } - - PyObject *Solver_set_allow_uninstall(SolverObject *self, PyObject *args) { - int val; - - if (!PyArg_ParseTuple(args, "i", &val)) { -- /* XXX raise exception */ -+ return NULL; - } - -- self->_solver->allowuninstall = val; -- -+ solver_set_flag(self->_solver, SOLVER_FLAG_ALLOW_UNINSTALL, val); - Py_RETURN_NONE; - } - - PyObject *Solver_get_updatesystem(SolverObject *self, PyObject *args) { -- return Py_BuildValue("i", self->_solver->updatesystem); -+ //return Py_BuildValue("i", self->_solver->updatesystem); -+ Py_RETURN_NONE; - } - - PyObject *Solver_set_updatesystem(SolverObject *self, PyObject *args) { -- int val; -+ /*int val; - - if (!PyArg_ParseTuple(args, "i", &val)) { -- /* XXX raise exception */ -+ return NULL; - } - -- self->_solver->updatesystem = val; -+ self->_solver->updatesystem = val; */ - - Py_RETURN_NONE; - } - - PyObject *Solver_get_do_split_provides(SolverObject *self, PyObject *args) { -- return Py_BuildValue("i", self->_solver->dosplitprovides); -+ int val = solver_get_flag(self->_solver, SOLVER_FLAG_SPLITPROVIDES); -+ -+ return Py_BuildValue("i", val); - } - - PyObject *Solver_set_do_split_provides(SolverObject *self, PyObject *args) { - int val; - - if (!PyArg_ParseTuple(args, "i", &val)) { -- /* XXX raise exception */ -+ return NULL; - } - -- self->_solver->dosplitprovides = val; -- -+ solver_set_flag(self->_solver, SOLVER_FLAG_SPLITPROVIDES, val); - Py_RETURN_NONE; - } - - PyObject *Solver_solve(SolverObject *self, PyObject *args) { - RequestObject *request; -+ int res = 0; - - if (!PyArg_ParseTuple(args, "O", &request)) { -- /* XXX raise exception */ -+ return NULL; - } - - // Make sure, the pool is prepared. - _Pool_prepare(self->_solver->pool); - -- solver_solve(self->_solver, &request->_queue); -+ res = solver_solve(self->_solver, &request->_queue); - - #ifdef DEBUG - solver_printallsolutions(self->_solver); - #endif - -- if (self->_solver->problems.count == 0) { -+ if (res == 0) { - Py_RETURN_TRUE; - } -- - Py_RETURN_FALSE; - } - -@@ -202,7 +217,6 @@ PyObject *Solver_get_problems(SolverObject *self, PyObject *args) { - RequestObject *request; - - if (!PyArg_ParseTuple(args, "O", &request)) { -- /* XXX raise exception */ - return NULL; - } - -diff --git a/python/src/solver.h b/python/src/solver.h -index 604cb83..8a4478b 100644 ---- a/python/src/solver.h -+++ b/python/src/solver.h -@@ -34,8 +34,9 @@ typedef struct { - extern PyObject* Solver_new(PyTypeObject *type, PyObject *args, PyObject *kwds); - extern PyObject *Solver_dealloc(SolverObject *self); - --extern PyObject *Solver_get_fix_system(SolverObject *self, PyObject *args); --extern PyObject *Solver_set_fix_system(SolverObject *self, PyObject *args); -+extern PyObject *Solver_get_flag(SolverObject *self, PyObject *args); -+extern PyObject *Solver_set_flag(SolverObject *self, PyObject *args); -+ - extern PyObject *Solver_get_allow_downgrade(SolverObject *self, PyObject *args); - extern PyObject *Solver_set_allow_downgrade(SolverObject *self, PyObject *args); - extern PyObject *Solver_get_allow_archchange(SolverObject *self, PyObject *args); --- -1.7.10.4 - diff --git a/pakfire/patches/0012-Sort-patches-by-their-version-number-not-in-alphabet.patch b/pakfire/patches/0012-Sort-patches-by-their-version-number-not-in-alphabet.patch deleted file mode 100644 index edb24ea..0000000 --- a/pakfire/patches/0012-Sort-patches-by-their-version-number-not-in-alphabet.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2d1d622ac9859c90363076aa2f44edf1efe53597 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Tue, 26 Jun 2012 19:32:11 +0200 -Subject: [PATCH 12/16] Sort patches by their version number (not in - alphabetical order). - ---- - macros/constants.macro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/macros/constants.macro b/macros/constants.macro -index 07459a3..74484ea 100644 ---- a/macros/constants.macro -+++ b/macros/constants.macro -@@ -11,7 +11,7 @@ DIR_SOURCE = %{BASEDIR} - - # By default, take all patches from the patches directory - # in alphabetical order. --patches = $(find %{DIR_PATCHES} -not -type d 2>/dev/null | sort) -+patches = $(find %{DIR_PATCHES} -not -type d 2>/dev/null | sort --version-sort) - sources = %{thisapp}.tar.gz - - # Macro definitions --- -1.7.10.4 - diff --git a/pakfire/patches/0013-Fix-linking-to-libsolvext.patch b/pakfire/patches/0013-Fix-linking-to-libsolvext.patch deleted file mode 100644 index b02eab7..0000000 --- a/pakfire/patches/0013-Fix-linking-to-libsolvext.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bc17ee1a8d7ea87e7e3bb137c86519209eb24c00 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sat, 30 Jun 2012 12:18:52 +0200 -Subject: [PATCH 13/16] Fix linking to libsolvext. - -This is pulled in by libsolv itself. Although this is not good -style, it works more reliable without patching libsolvext which -is missing symbols from libexpat, libz and more. ---- - python/src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/python/src/Makefile b/python/src/Makefile -index 583cc16..2741fa2 100644 ---- a/python/src/Makefile -+++ b/python/src/Makefile -@@ -7,7 +7,7 @@ MODULE_LZMA = _lzma.so - MODULES = $(MODULE_PAKFIRE) $(MODULE_LZMA) - - # Libs that are to be linked into the module. --MODULE_PAKFIRE_LIBS = -lcap -lpython$(PYTHON_VERSION) -lsolv -lsolvext -+MODULE_PAKFIRE_LIBS = -lcap -lpython$(PYTHON_VERSION) -lsolv - MODULE_LZMA_LIBS = -llzma - - SOURCES_LZMA = _lzmamodule.c --- -1.7.10.4 - diff --git a/pakfire/patches/0014-Fix-the-download-sizes.patch b/pakfire/patches/0014-Fix-the-download-sizes.patch deleted file mode 100644 index 06ec0ca..0000000 --- a/pakfire/patches/0014-Fix-the-download-sizes.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f1cfbffe3df6ed137c522072adb7ef872592cba4 Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sat, 30 Jun 2012 12:19:52 +0200 -Subject: [PATCH 14/16] Fix the download sizes. - -Newer versions of libsolv require an unsigned long here. ---- - python/src/solvable.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/src/solvable.c b/python/src/solvable.c -index 21ad758..1198df3 100644 ---- a/python/src/solvable.c -+++ b/python/src/solvable.c -@@ -492,10 +492,10 @@ PyObject *Solvable_set_downloadsize(SolvableObject *self, PyObject *args) { - PyObject *Solvable_get_downloadsize(SolvableObject *self) { - Solvable *solv = pool_id2solvable(self->_pool, self->_id); - -- unsigned int downloadsize = repo_lookup_num(solv->repo, self->_id, -+ unsigned long long downloadsize = repo_lookup_num(solv->repo, self->_id, - SOLVABLE_DOWNLOADSIZE, 0); - -- return Py_BuildValue("i", downloadsize); -+ return Py_BuildValue("K", downloadsize / 1024); - } - - PyObject *Solvable_set_installsize(SolvableObject *self, PyObject *args) { --- -1.7.10.4 - diff --git a/pakfire/patches/0015-Add-option-to-export-secret-keys.patch b/pakfire/patches/0015-Add-option-to-export-secret-keys.patch deleted file mode 100644 index 0934ab1..0000000 --- a/pakfire/patches/0015-Add-option-to-export-secret-keys.patch +++ /dev/null @@ -1,71 +0,0 @@ -From a78770d3e74e29522a0a29f04ba2757fc8f8704d Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sat, 30 Jun 2012 12:20:41 +0200 -Subject: [PATCH 15/16] Add option to export secret keys. - ---- - python/pakfire/api.py | 4 ++-- - python/pakfire/cli.py | 5 ++++- - python/pakfire/keyring.py | 4 ++-- - 3 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/python/pakfire/api.py b/python/pakfire/api.py -index 5203c5f..372e4d5 100644 ---- a/python/pakfire/api.py -+++ b/python/pakfire/api.py -@@ -145,10 +145,10 @@ def key_import(keyfile, **pakfire_args): - - return pakfire.keyring.import_key(keyfile) - --def key_export(keyid, keyfile, **pakfire_args): -+def key_export(keyid, keyfile, secret=False, **pakfire_args): - pakfire = Pakfire(**pakfire_args) - -- return pakfire.keyring.export_key(keyid, keyfile) -+ return pakfire.keyring.export_key(keyid, keyfile, secret=secret) - - def key_delete(keyid, **pakfire_args): - pakfire = Pakfire(**pakfire_args) -diff --git a/python/pakfire/cli.py b/python/pakfire/cli.py -index 05a8c6e..a808975 100644 ---- a/python/pakfire/cli.py -+++ b/python/pakfire/cli.py -@@ -1220,6 +1220,8 @@ class CliKey(Cli): - help=_("The ID of the key to export.")) - sub_export.add_argument("filename", nargs=1, - help=_("Write the key to this file.")) -+ sub_export.add_argument("--secret", action="store_true", -+ help=_("Export the secret key, too.")) - sub_export.add_argument("action", action="store_const", const="export") - - def parse_command_delete(self): -@@ -1275,8 +1277,9 @@ class CliKey(Cli): - def handle_export(self): - keyid = self.args.keyid[0] - filename = self.args.filename[0] -+ secret = self.args.secret - -- pakfire.key_export(keyid, filename, **self.pakfire_args) -+ pakfire.key_export(keyid, filename, secret=secret, **self.pakfire_args) - - def handle_delete(self): - keyid = self.args.keyid[0] -diff --git a/python/pakfire/keyring.py b/python/pakfire/keyring.py -index 8fe052e..d1f4626 100644 ---- a/python/pakfire/keyring.py -+++ b/python/pakfire/keyring.py -@@ -168,9 +168,9 @@ class Keyring(object): - - log.info(_("Successfully imported %s.") % keyfile) - -- def export_key(self, keyid, keyfile): -+ def export_key(self, keyid, keyfile, secret=False): - keydata = io.BytesIO() -- self.ctx.export(keyid, keydata) -+ self.ctx.export(keyid, keydata, secret) - - f = open(keyfile, "wb") - f.write(keydata.getvalue()) --- -1.7.10.4 - diff --git a/pakfire/patches/0016-template-Fix-packaging-cmake-files.patch b/pakfire/patches/0016-template-Fix-packaging-cmake-files.patch deleted file mode 100644 index 5c25532..0000000 --- a/pakfire/patches/0016-template-Fix-packaging-cmake-files.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 42d6af74306ecb1627eb3c5b6a0163fc6308b46d Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Sat, 30 Jun 2012 13:32:23 +0200 -Subject: [PATCH 16/16] template: Fix packaging cmake files. - ---- - macros/templates.macro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/macros/templates.macro b/macros/templates.macro -index 76dcf69..794619b 100644 ---- a/macros/templates.macro -+++ b/macros/templates.macro -@@ -52,7 +52,7 @@ packages - %{libdir}/pkgconfig - %{datadir}/aclocal - %{libdir}/*.so -- %{datadir}/*/cmake -+ %{datadir}/cmake - %{mandir}/man2 - %{mandir}/man3 - %{datadir}/pkgconfig --- -1.7.10.4 - hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3a64a15f1eb94f4e82d7bb6fe413d4cee05f3456
by git＠ipfire.org 22 Jul '12

22 Jul '12

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2012