Archlinux-Jerry/pkgbuilds
1
0
Fork 0
mirror of https://github.com/archlinux-jerry/pkgbuilds synced 2024-11-22 14:00:40 +08:00
Code Issues Releases Wiki Activity

Revert "update: kernel-modules-hook-hardlinks: fix umount issue caused by udevd try 1"

Browse source 
This reverts commit 3591f5ee9e.
This commit is contained in:
JerryXiao 2023-05-31 13:49:08 +08:00
parent 3591f5ee9e
commit 92d1a61ebf
Signed by: Jerry
GPG key ID: 22618F758B5BE2E5
2 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kernel-modules-hook-hardlinks/linux-modules-restore
View file

@ -4,18 +4,8 @@ kver=$(uname -r)
while read -r line; do while read -r line; do
# We only care about the running kernel # We only care about the running kernel
if [[ "$line" == usr/lib/modules/$kver/vmlinuz && -d usr/lib/modules/running-kernel ]];then if [[ "$line" == usr/lib/modules/$kver/vmlinuz && -d usr/lib/modules/running-kernel ]];then
mount --mkdir --bind --options ro /usr/lib/modules/{running-kernel,$kver} || continue mount --mkdir --bind --options ro /usr/lib/modules/{running-kernel,$kver}
# Mounting read-only since the only modification here should be unmounting # Mounting read-only since the only modification here should be unmounting
# when rebooting or reinstalling the running kernel # when rebooting or reinstalling the running kernel
mount_unit="usr-lib-modules-${kver//-/\\x2d}.mount"
install -Dm644 <(
cat << EOF
[Unit]
After=$mount_unit
Requires=$mount_unit
EOF
) /run/systemd/system/systemd-udevd.service.d/kernel-modules-hook-hardlinks.conf
systemctl daemon-reload
# Required for clean umount on shutdown
fi fi
done done

3
kernel-modules-hook-hardlinks/linux-modules-save
View file

@ -9,8 +9,7 @@ while read -r line; do
# This means we already ran that hook during 'remove case' # This means we already ran that hook during 'remove case'
# #
# Remove the mount so we can reinstall the kernel # Remove the mount so we can reinstall the kernel
# Fixme: systemd-udevd would likely block the umount umount ${line%vmlinuz}
umount /${line%vmlinuz}
elif [[ -f "$line" && ! -d "/usr/lib/modules/running-kernel/" ]];then elif [[ -f "$line" && ! -d "/usr/lib/modules/running-kernel/" ]];then
# Kernel install is present and we do not have a copy # Kernel install is present and we do not have a copy
# #