Skip to content

Commit

Permalink
Merge pull request #205 from bedroge/fix_sssd_nss_installation_script
Browse files Browse the repository at this point in the history
Fix order of commands in installation script for `sssd` and `nss-pam-ldapd`
  • Loading branch information
trz42 authored Apr 16, 2024
2 parents 1c62ad0 + c712e9a commit 010fa7c
Showing 1 changed file with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@ echo "Checking out ${eessi_commit} in ${PWD}..."
time git checkout ${eessi_commit}
cd -

# remove the host symlinks that are no longer needed
# see: https://github.com/EESSI/compatibility-layer/pull/199
rm ${EPREFIX}/etc/nsswitch.conf
rm ${EPREFIX}/lib64/libnss_ldap.so.2
rm ${EPREFIX}/lib64/libnss_sss.so.2
rm ${EPREFIX}/var/run
# the following symlink is in our playbook, but it hadn't been added to the production repository yet
# rm ${EPREFIX}/var/log/wtmp

# reinstall the currently installed version of glibc to apply the changes from https://github.com/EESSI/gentoo-overlay/pull/99
emerge --verbose =$(qlist -IRv sys-libs/glibc)

Expand All @@ -48,15 +57,6 @@ EOF
emerge --verbose sys-auth/nss-pam-ldapd::eessi
emerge --verbose sys-auth/sssd::eessi

# remove the host symlinks that are no longer needed
# see: https://github.com/EESSI/compatibility-layer/pull/199
rm ${EPREFIX}/etc/nsswitch.conf
rm ${EPREFIX}/lib64/libnss_ldap.so.2
rm ${EPREFIX}/lib64/libnss_sss.so.2
rm ${EPREFIX}/var/run
# the following symlink is in our playbook, but it hadn't been added to the production repository yet
# rm ${EPREFIX}/var/log/wtmp

# collect list of installed packages after updating packages
list_installed_pkgs_post_update=${mytmpdir}/installed-pkgs-post-update.txt
echo "Collecting list of installed packages to ${list_installed_pkgs_post_update}..."
Expand Down

0 comments on commit 010fa7c

Please sign in to comment.