[master 1/1] Apply the environment substitutions more liberally in nfs-repo-and-addon

dashea installerbot-noreply at redhat.com
Wed Aug 5 20:44:36 UTC 2015


From: David Shea <dshea at redhat.com>

Some of the environment variables appear in the tests in %post, so those
need to be substituted as well.
---
 tests/kickstart_tests/nfs-repo-and-addon.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/kickstart_tests/nfs-repo-and-addon.sh b/tests/kickstart_tests/nfs-repo-and-addon.sh
index a4c5c94..ef63827 100755
--- a/tests/kickstart_tests/nfs-repo-and-addon.sh
+++ b/tests/kickstart_tests/nfs-repo-and-addon.sh
@@ -43,9 +43,9 @@ prepare() {
         return 1
     fi
 
-    sed -e "/^nfs/ s|NFS-SERVER|${KSTEST_NFS_SERVER}|" \
-        -e "/^nfs/ s|NFS-PATH|${KSTEST_NFS_PATH}|" \
-        -e "/^repo/ s|NFS-ADDON-REPO|${KSTEST_ADDON_NFS_REPO}|" \
-        -e "/^repo/ s|HTTP-ADDON-REPO|${KSTEST_ADDON_HTTP_REPO}|" ${ks} > ${tmpdir}/kickstart.ks
+    sed -e "s|NFS-SERVER|${KSTEST_NFS_SERVER}|" \
+        -e "s|NFS-PATH|${KSTEST_NFS_PATH}|" \
+        -e "s|NFS-ADDON-REPO|${KSTEST_ADDON_NFS_REPO}|" \
+        -e "s|HTTP-ADDON-REPO|${KSTEST_ADDON_HTTP_REPO}|" ${ks} > ${tmpdir}/kickstart.ks
     echo ${tmpdir}/kickstart.ks
 }


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/27294bdc1946baa8719df83b6b7177e07d04bb81


More information about the anaconda-patches mailing list