diff options
| author | Ian Stakenvicius <axs@gentoo.org> | 2013-01-14 13:25:57 -0500 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2013-04-04 10:26:47 -0400 |
| commit | d71bb748b299983bf7dc90bf0281083b289c8c6f (patch) | |
| tree | abafbc25a6d0aa5373df0bfd7c36ad564bceaf5b | |
| parent | 85085621ba3e4b695e505848b5778fc36432b7b8 (diff) | |
Removed hard-coded paths in rule-writer scripts
Both scripts had hard-coded paths to 'rule_generator.functions'; these were changed
to be substituted in by configure so the paths will match where files are
installed.øy
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | rule_generator/write_cd_rules.in (renamed from rule_generator/write_cd_rules) | 4 | ||||
| -rw-r--r-- | rule_generator/write_net_rules.in (renamed from rule_generator/write_net_rules) | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index c6aaa6a9ac..f8b8cdbead 100644 --- a/configure.ac +++ b/configure.ac @@ -296,10 +296,10 @@ AC_ARG_WITH([modprobe], AC_SUBST([MODPROBE], ["${with_modprobe}"]) # ------------------------------------------------------------------------------ -# rule_generator - persistent network and optical device rule generator +# rule-generator - persistent network and optical device rule generator # ------------------------------------------------------------------------------ -AC_ARG_ENABLE([rule_generator], - AS_HELP_STRING([--enable-rule_generator], [enable persistent network, cdrom support]), +AC_ARG_ENABLE([rule-generator], + AS_HELP_STRING([--enable-rule-generator], [enable legacy persistent network, cdrom support]), [], [enable_rule_generator=no]) AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_generator" = xyes]) @@ -318,6 +318,8 @@ AC_CONFIG_FILES([Makefile man/Makefile rules/Makefile rule_generator/Makefile + rule_generator/write_cd_rules + rule_generator/write_net_rules src/Makefile src/accelerometer/Makefile src/ata_id/Makefile diff --git a/rule_generator/write_cd_rules b/rule_generator/write_cd_rules.in index 00382ada2f..2b00a32558 100644 --- a/rule_generator/write_cd_rules +++ b/rule_generator/write_cd_rules.in @@ -27,9 +27,9 @@ if [ -n "$UDEV_LOG" ]; then fi fi -RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules" +RULES_FILE="@udevconfdir@/rules.d/70-persistent-cd.rules" -. /lib/udev/rule_generator.functions +. @udevlibexecdir@/rule_generator.functions find_next_available() { raw_find_next_available "$(find_all_rules 'SYMLINK\+=' "$1")" diff --git a/rule_generator/write_net_rules b/rule_generator/write_net_rules.in index 437979241f..324e97821c 100644 --- a/rule_generator/write_net_rules +++ b/rule_generator/write_net_rules.in @@ -38,9 +38,9 @@ if [ -n "$UDEV_LOG" ]; then fi fi -RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' +RULES_FILE='@udevconfdir@/rules.d/70-persistent-net.rules' -. /lib/udev/rule_generator.functions +. @udevlibexecdir@/rule_generator.functions interface_name_taken() { local value="$(find_all_rules 'NAME=' $INTERFACE)" |