From 7ccb981797049a64309cca2303661afc0b9d318f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 13 Jun 2016 13:58:12 -0700 Subject: [PATCH] prod_image_util: move pam.d contents, not the directory The baselayout package now creates and installs /usr/lib/pam.d, causing mv to fail. Move the contents instead which is happy with both versions. --- build_library/prod_image_util.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh index b32320adcf..2d617d703e 100755 --- a/build_library/prod_image_util.sh +++ b/build_library/prod_image_util.sh @@ -108,7 +108,9 @@ L+ /etc/ld.so.conf - - - - ../usr/lib/ld.so.conf EOF # Move the PAM configuration into /usr - sudo mv ${root_fs_dir}/etc/pam.d ${root_fs_dir}/usr/lib + sudo mkdir -p ${root_fs_dir}/usr/lib/pam.d + sudo mv -n ${root_fs_dir}/etc/pam.d/* ${root_fs_dir}/usr/lib/pam.d/ + sudo rmdir ${root_fs_dir}/etc/pam.d finish_image "${image_name}" "${disk_layout}" "${root_fs_dir}" "${image_contents}"