From c6c35822fec5f07b42f9944c827b418139731d75 Mon Sep 17 00:00:00 2001 From: Nikos Skalkotos Date: Thu, 6 Oct 2011 14:35:28 +0300 Subject: [PATCH] Fix a path in 50ChangePassword script 50ChangePassword was looking in commondir instead of scriptsdir for snf-passtohash.py --- snf-image-helper/tasks/50ChangePassword.in | 2 +- snf-image-helper/tasks/Makefile.am | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/snf-image-helper/tasks/50ChangePassword.in b/snf-image-helper/tasks/50ChangePassword.in index 55abea7..4885a23 100644 --- a/snf-image-helper/tasks/50ChangePassword.in +++ b/snf-image-helper/tasks/50ChangePassword.in @@ -31,7 +31,7 @@ linux_password() { local target=$1 local password=$2 - local hash=$(@commondir@/snf-passtohash.py $password) + local hash=$(@scriptsdir@/snf-passtohash.py $password) if [ ! -e ${target}/etc/shadow ]; then log_error "No /etc/shadow found!" fi diff --git a/snf-image-helper/tasks/Makefile.am b/snf-image-helper/tasks/Makefile.am index b1952e9..55172e8 100644 --- a/snf-image-helper/tasks/Makefile.am +++ b/snf-image-helper/tasks/Makefile.am @@ -16,7 +16,9 @@ edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@datarootdir[@]|$(datarootdir)|g' \ - -e 's|@commondir[@]|$(commondir)|g' + -e 's|@commondir[@]|$(commondir)|g' \ + -e 's|@scriptsdir[@]|$(scriptsdir)|g' + %:%.in Makefile rm -f $@ $@.tmp -- 1.7.10.4