diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | rules/64-btrfs.rules.in (renamed from rules/64-btrfs.rules) | 2 | ||||
| -rw-r--r-- | rules/Makefile.am | 3 |
4 files changed, 12 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 9e04dd33f..51d73d647 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/configure.ac b/configure.ac index 276c73d7b..fb25f96b9 100644 --- a/configure.ac +++ b/configure.ac @@ -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} diff --git a/rules/64-btrfs.rules b/rules/64-btrfs.rules.in index c3a0972f2..e10919b96 100644 --- a/rules/64-btrfs.rules +++ b/rules/64-btrfs.rules.in @@ -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" diff --git a/rules/Makefile.am b/rules/Makefile.am index a9c9ea25f..4c8758426 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -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 \ |