Browse Source

rules/64-btrfs.rules: substitue @bindir@

See https://bugs.gentoo.org/666892

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
tags/v3.2.7
Anthony G. Basile 2 years ago
parent
commit
96c5552c52
4 changed files with 12 additions and 5 deletions
  1. +2
    -0
      .gitignore
  2. +6
    -4
      configure.ac
  3. +1
    -1
      rules/64-btrfs.rules.in
  4. +3
    -0
      rules/Makefile.am

+ 2
- 0
.gitignore View File

@@ -31,6 +31,8 @@ m4/lt~obsolete.m4

rule_generator/write_net_rules

rules/64-btrfs.rules

src/ata_id/ata_id
src/cdrom_id/cdrom_id
src/collect/collect


+ 6
- 4
configure.ac View File

@@ -165,8 +165,8 @@ AS_IF(
)

# Configured paths
AC_SUBST([rootprefix], [$with_rootprefix])
AC_SUBST([rootlibdir], [$with_rootlibdir])
AC_SUBST([rootprefix], [${with_rootprefix}])
AC_SUBST([rootlibdir], [${with_rootlibdir}])
AC_SUBST([rootlibexecdir], [${with_rootlibexecdir}])
AC_SUBST([udevlibexecdir], [${rootlibexecdir}])

@@ -293,8 +293,8 @@ AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_generator" = xyes])
# mtd_probe - autoloads FTL module for mtd devices
# ------------------------------------------------------------------------------
AC_ARG_ENABLE([mtd_probe],
AS_HELP_STRING([--disable-mtd_probe], [disable MTD support]),
[], [enable_mtd_probe=yes])
AS_HELP_STRING([--disable-mtd_probe], [disable MTD support]),
[], [enable_mtd_probe=yes])
AM_CONDITIONAL([ENABLE_MTD_PROBE], [test "x$enable_mtd_probe" = xyes])

# ------------------------------------------------------------------------------
@@ -305,6 +305,7 @@ AC_CONFIG_FILES([Makefile
rule_generator/Makefile
rule_generator/write_net_rules
rules/Makefile
rules/64-btrfs.rules
src/Makefile
src/ata_id/Makefile
src/cdrom_id/Makefile
@@ -329,6 +330,7 @@ AC_MSG_RESULT([
sysconfdir: ${sysconfdir}
datadir: ${datadir}
includedir: ${includedir}
bindir: ${bindir}
libdir: ${libdir}

rootprefix: ${rootprefix}


rules/64-btrfs.rules → rules/64-btrfs.rules.in View File

@@ -11,6 +11,6 @@ IMPORT{builtin}="btrfs ready $devnode"
ENV{ID_BTRFS_READY}=="0", ENV{SYSTEMD_READY}="0"

# reconsider pending devices in case when multidevice volume awaits
ENV{ID_BTRFS_READY}=="1", RUN+="@rootbindir@/udevadm trigger -s block -p ID_BTRFS_READY=0"
ENV{ID_BTRFS_READY}=="1", RUN+="@bindir@/udevadm trigger -s block -p ID_BTRFS_READY=0"

LABEL="btrfs_end"

+ 3
- 0
rules/Makefile.am View File

@@ -1,5 +1,8 @@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}

EXTRA_DIST = \
64-btrfs.rules.in

dist_udevrules_DATA = \
50-udev-default.rules \
60-block.rules \


Loading…
Cancel
Save