Skip to content

Commit c712e9a

Browse files
committed
remove symlinks before (re)installing packages
1 parent 1c62ad0 commit c712e9a

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

scripts/install-sssd-and-nss-pam-ldapd-EESSI.IO-2023.06_2024-04-15.sh

+9-9
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ echo "Checking out ${eessi_commit} in ${PWD}..."
2727
time git checkout ${eessi_commit}
2828
cd -
2929

30+
# remove the host symlinks that are no longer needed
31+
# see: https://github.com/EESSI/compatibility-layer/pull/199
32+
rm ${EPREFIX}/etc/nsswitch.conf
33+
rm ${EPREFIX}/lib64/libnss_ldap.so.2
34+
rm ${EPREFIX}/lib64/libnss_sss.so.2
35+
rm ${EPREFIX}/var/run
36+
# the following symlink is in our playbook, but it hadn't been added to the production repository yet
37+
# rm ${EPREFIX}/var/log/wtmp
38+
3039
# reinstall the currently installed version of glibc to apply the changes from https://github.com/EESSI/gentoo-overlay/pull/99
3140
emerge --verbose =$(qlist -IRv sys-libs/glibc)
3241

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

51-
# remove the host symlinks that are no longer needed
52-
# see: https://github.com/EESSI/compatibility-layer/pull/199
53-
rm ${EPREFIX}/etc/nsswitch.conf
54-
rm ${EPREFIX}/lib64/libnss_ldap.so.2
55-
rm ${EPREFIX}/lib64/libnss_sss.so.2
56-
rm ${EPREFIX}/var/run
57-
# the following symlink is in our playbook, but it hadn't been added to the production repository yet
58-
# rm ${EPREFIX}/var/log/wtmp
59-
6060
# collect list of installed packages after updating packages
6161
list_installed_pkgs_post_update=${mytmpdir}/installed-pkgs-post-update.txt
6262
echo "Collecting list of installed packages to ${list_installed_pkgs_post_update}..."

0 commit comments

Comments
 (0)