Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert /usr/local from a symlink to a mount point on upgrade

Browse Source 
Fixes QubesOS/qubes-issues#1150
This commit is contained in:
Marek Marczykowski-Górecki 2018-07-11 14:24:17 +02:00
parent c11dd76006
commit f4c10d47da
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archlinux/PKGBUILD.install
View File

@ -79,6 +79,13 @@ update_qubesconfig() {
rm -f /lib/firmware/updates rm -f /lib/firmware/updates
fi fi
# convert /usr/local symlink to a mount point
if [ -L /usr/local ]; then
rm -f /usr/local
mkdir /usr/local
mount /usr/local || :
fi
#/usr/lib/qubes/update-proxy-configs #/usr/lib/qubes/update-proxy-configs
# Archlinux pacman configuration is handled in update_finalize # Archlinux pacman configuration is handled in update_finalize

7
debian/qubes-core-agent.postinst vendored
View File

@ -167,6 +167,13 @@ case "${1}" in
rm -f /lib/firmware/updates rm -f /lib/firmware/updates
fi fi
# convert /usr/local symlink to a mount point
if [ -L /usr/local ]; then
rm -f /usr/local
mkdir /usr/local
mount /usr/local || :
fi
# remove old symlinks # remove old symlinks
if [ -L /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service ]; then if [ -L /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service ]; then
rm /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service rm /etc/systemd/system/sysinit.target.wants/qubes-random-seed.service

7
rpm_spec/core-agent.spec.in
View File

@ -339,6 +339,13 @@ if [ -L /lib/firmware/updates ]; then
rm -f /lib/firmware/updates rm -f /lib/firmware/updates
fi fi
# convert /usr/local symlink to a mount point
if [ -L /usr/local ]; then
rm -f /usr/local
mkdir /usr/local
mount /usr/local || :
fi
if test -f /etc/yum.conf && ! grep -q '/etc/yum\.conf\.d/qubes-proxy\.conf' /etc/yum.conf; then if test -f /etc/yum.conf && ! grep -q '/etc/yum\.conf\.d/qubes-proxy\.conf' /etc/yum.conf; then
echo >> /etc/yum.conf echo >> /etc/yum.conf
echo '# Yum does not support inclusion of config dir...' >> /etc/yum.conf echo '# Yum does not support inclusion of config dir...' >> /etc/yum.conf