Hello Steve,
        Thanks for identifying this issue with @ETCDIR@,
and for filing a bug-report.

        I've attached a patch which should sort out the issue.
I hope to have an updated release of cryptmount available soon.

                Kind regards,
                        RW Penney
diff --git a/sysinit/Makefile.am b/sysinit/Makefile.am
index 8e1e044..f42ede6 100644
--- a/sysinit/Makefile.am
+++ b/sysinit/Makefile.am
@@ -5,7 +5,7 @@ EXTRA_DIST = cryptmount.service.in modules-load.conf \
 	setupscript.sh.in initscript.in
 
 scripttransform='s,@EXENAME@,$(bindir)/cryptmount$(EXEEXT),g; \
-		s,@CM_SYSCONF_DIR@,$(CM_SYSCONF_DIR),g; \
+		s,@SYSCONF_DIR@,$(CM_SYSCONF_DIR),g; \
 		s,@PKG_NAME@,$(PACKAGE_NAME),g; \
 		s,@PKG_VERSION@,$(VERSION),g; \
 		s,@LCL_DIR@,$(localedir),g'
diff --git a/sysinit/initscript.in b/sysinit/initscript.in
index 98df30f..409407e 100644
--- a/sysinit/initscript.in
+++ b/sysinit/initscript.in
@@ -77,7 +77,7 @@ dofilesys() {
 doALL() {
     if test -n "${CM_BOOTDV}" -o -n "${CM_BOOTSW}" \
             -o -n "${CM_BOOTFS}" -o -n "${CM_EARLYDV}"; then
-        echo "Using /etc/default/cryptmount is DEPRECATED - please use 'bootaction={mount|swap|prepare}' flags within /etc/cryptmount/cmtab"
+        echo "Using /etc/default/cryptmount is DEPRECATED - please use 'bootaction={mount|swap|prepare}' flags within @SYSCONF_DIR@/cmtab"
     fi
 
     case "$1" in
diff --git a/sysinit/setupscript.sh.in b/sysinit/setupscript.sh.in
index 308586a..511adf8 100755
--- a/sysinit/setupscript.sh.in
+++ b/sysinit/setupscript.sh.in
@@ -8,7 +8,7 @@
 # for further information.
 
 CM_BINEXE="@EXENAME@"
-CM_CFGDIR="@ETCDIR@"
+CM_CFGDIR="@SYSCONF_DIR@"
 
 
 # prepare gettext internationalization:

Reply via email to