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 /rule_generator | |
| parent | Restored the rule generator bits from udev-171 (diff) | |
| download | eudev-d71bb748b299983bf7dc90bf0281083b289c8c6f.tar.gz eudev-d71bb748b299983bf7dc90bf0281083b289c8c6f.tar.bz2 eudev-d71bb748b299983bf7dc90bf0281083b289c8c6f.zip | |
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>
Diffstat (limited to 'rule_generator')
| -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 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rule_generator/write_cd_rules b/rule_generator/write_cd_rules.in index 00382ada2..2b00a3255 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 437979241..324e97821 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)" |