Skip to content

archlinux: Sync /etc/fstab with other distros #575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marmarek merged 3 commits into from
May 30, 2025
Merged

archlinux: Sync /etc/fstab with other distros #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24adc1a
archlinux: /proc/xen is not relevant anymore
marmarek May 27, 2025
66c561e
archlinux: install qubes version of /etc/fstab
marmarek May 27, 2025
aff3c5c
archlinux: remove static /home and /usr/local entries
marmarek May 27, 2025
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
8 changes: 8 additions & 0 deletions archlinux/PKGBUILD.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,14 @@ package_qubes-vm-core() {
make -C qubes-rpc/kde DESTDIR="$pkgdir" install
make -C qubes-rpc/nautilus DESTDIR="$pkgdir" install
make -C qubes-rpc/thunar DESTDIR="$pkgdir" install
make -C filesystem DESTDIR="$pkgdir" install

# Adjust fstab for Arch
mv "$pkgdir/etc/fstab" "$pkgdir/etc/fstab.qubes"
echo "
# This MUST be a ramfs, not a tmpfs! The data here is incredibly sensitive
# (allows root access) and must not be leaked to disk.
tmpfs /etc/pacman.d/gnupg/private-keys-v1.d ramfs defaults,noexec,nosuid,nodev,mode=600 0 0" >> "$pkgdir/etc/fstab.qubes"

# Install systemd script allowing to automount /lib/modules
install -m 644 "archlinux/PKGBUILD.qubes-ensure-lib-modules.service" "${pkgdir}/usr/lib/systemd/system/qubes-ensure-lib-modules.service"
Expand Down
18 changes: 13 additions & 5 deletions archlinux/PKGBUILD.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ pre_install() {
cp /etc/fstab /var/lib/qubes/fstab.orig
fi

# Add qubes core related fstab entries
echo "xen /proc/xen xenfs defaults 0 0" >> /etc/fstab

usermod -L root
usermod -L user
}
Expand Down Expand Up @@ -88,8 +85,19 @@ update_qubesconfig() {
mount /usr/local || :
fi

# Fix fstab update to core-agent-linux 4.0.33
grep -F -q "/rw/usrlocal" /etc/fstab || sed "/\/rw\/home/a\/rw\/usrlocal \/usr\/local none noauto,bind,defaults 0 0" -i /etc/fstab
# Install qubes version of fstab
if ! grep -q dmroot /etc/fstab; then
cp -f /etc/fstab.qubes /etc/fstab
fi

# Fix fstab update to core-agent-linux 4.3.19
if grep -q '/rw/home\|/rw/usrlocal' /etc/fstab; then
sed -i \
-e '/# Template Binds/d' \
-e '/\/rw\/home/d' \
-e '/\/rw\/usrlocal/d' \
/etc/fstab
fi

#/usr/lib/qubes/update-proxy-configs
# Archlinux pacman configuration is handled in update_finalize
Expand Down