Skip to content
This repository was archived by the owner on Sep 18, 2020. It is now read-only.

prod_image_util: move pam.d contents, not the directory #558

Merged
marineam merged 1 commit into from
Jun 13, 2016
Merged

prod_image_util: move pam.d contents, not the directory #558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build_library/prod_image_util.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Copy link
Contributor

@crawford crawford Jun 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why no-clobber? Should we empty this directory before doing the move?

Copy link
Contributor Author

@marineam marineam Jun 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The directory isn't and shouldn't be empty following the new baselayout version. I tossed in -n on the off chance that something weird happened. What I really want is "fail if you would have clobbered" but there isn't any such option.

Copy link
Contributor Author

@marineam marineam Jun 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, I could do rmdir and that'll be that sanity check

Copy link
Contributor Author

@marineam marineam Jun 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

sudo rmdir ${root_fs_dir}/etc/pam.d

finish_image "${image_name}" "${disk_layout}" "${root_fs_dir}" "${image_contents}"

Expand Down