Skip to content

archlinux: include scrub_pages initrd hook #126

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
merged 7 commits into from
May 30, 2025
Merged

archlinux: include scrub_pages initrd hook #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ee52667
rpm: allow BR: systemd-mini on openSUSE
marmarek Mar 29, 2025
68fdbd9
rpm: relax regex in %files
marmarek Mar 29, 2025
0cb0708
Add gptfix and swapon to Arch Linux initramfs
SaswatPadhi May 5, 2025
d1af3f7
Fix the order of mkinitcpio hooks
SaswatPadhi May 25, 2025
4ae0573
Merge remote-tracking branch 'origin/pr/125'
marmarek May 29, 2025
2a2533d
archlinux: include scrub_pages initrd hook
marmarek May 29, 2025
5886a77
archlinux/initcpio: add required modules directly
marmarek May 29, 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
3 changes: 2 additions & 1 deletion archlinux/PKGBUILD-initcpio-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ run_earlyhook() {

msg "Starting Qubes copy on write setup script"

/usr/lib/qubes/scrub_pages.sh
/usr/lib/qubes/qubes_cow_setup.sh

}
}
11 changes: 10 additions & 1 deletion archlinux/PKGBUILD-initcpio-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,20 @@ build() {
add_module "xen-blkfront"
add_binary "/usr/bin/sfdisk"
add_binary "/usr/bin/mkswap"
add_binary "/usr/bin/swapon"
add_binary "/usr/bin/dmsetup"
add_binary "/usr/bin/gptfix"
add_binary "/usr/lib/qubes/scrub_pages.sh"
add_binary "/usr/lib/qubes/qubes_cow_setup.sh"

map add_module \
'dm-mod' \
'dm-snapshot'

add_runscript


# Mark it's safe to add scrub_pages=0 to the kernel cmdline now
echo 1 > /var/lib/qubes/initramfs-updated
}

help() {
Expand Down
4 changes: 2 additions & 2 deletions archlinux/PKGBUILD-qubes-vm-kernel-support.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $end"
if [[ ! -s /etc/default/grub ]]; then
echo >> /etc/default/grub
fi
sed -Ei 's/^(HOOKS=[("])base/\1lvm2 qubes base/' /etc/mkinitcpio.conf
sed -Ei '/^HOOKS=/ s/(block)/\1 qubes/' /etc/mkinitcpio.conf
echo 'Adding qubes required hooks to /etc/default/grub'
sed -Ei "/^$begin\$/,/^$end\$/{
\$c$combined
Expand All @@ -41,7 +41,7 @@ post_upgrade () {
post_remove () {
local begin='### BEGIN QUBES HOOKS ###' end='### END QUBES HOOKS ###'
echo 'Removing qubes required hooks from mkinitcpio.conf'
sed -Ei 's/^(HOOKS=[("])lvm2 qubes base/\1base/' /etc/mkinitcpio.conf
sed -Ei '/^HOOKS=/ s/(block) (lvm2 )?qubes/\1/' /etc/mkinitcpio.conf
echo 'Removing qubes required hooks from /etc/default/grub'
sed -Ei "/^$begin\$/,/^$end\$/d" /etc/default/grub
grub-mkconfig -o /boot/grub/grub.cfg
Expand Down
1 change: 1 addition & 0 deletions archlinux/PKGBUILD.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ package_qubes-vm-kernel-support() {
install -m 611 "${srcdir}/${_pkgnvr}/archlinux/PKGBUILD-initcpio-install.sh" "${pkgdir}/usr/lib/initcpio/install/qubes"
install -m 611 "${srcdir}/${_pkgnvr}/archlinux/PKGBUILD-initcpio-hook.sh" "${pkgdir}/usr/lib/initcpio/hooks/qubes"
install -m 755 "${srcdir}/${_pkgnvr}/dracut/full-dmroot/qubes_cow_setup.sh" "${pkgdir}/usr/lib/qubes/qubes_cow_setup.sh"
install -m 755 "${srcdir}/${_pkgnvr}/dracut/xen-balloon-scrub-pages/scrub_pages.sh" "${pkgdir}/usr/lib/qubes/scrub_pages.sh"
install -m 0644 "${srcdir}/${_pkgnvr}/grub/grub.qubes-kernel-vm-support" "${pkgdir}/etc/default/grub.qubes-kernel-vm-support"
make install-gptfix SBINDIR=/usr/bin "DESTDIR=$pkgdir"
}
6 changes: 5 additions & 1 deletion rpm_spec/qubes-utils.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ Requires: GraphicsMagick
Requires: python%{python3_pkgversion}-qubesimgconverter
Requires: (%{name}-selinux if selinux-policy)
%{?systemd_requires}
%if 0%{?is_opensuse}
BuildRequires: (systemd or systemd-mini)
%else
BuildRequires: systemd
%endif
BuildRequires: python%{python3_pkgversion}-setuptools
BuildRequires: python3-rpm-macros
# for meminfo-writer
Expand Down Expand Up @@ -144,7 +148,7 @@ rm -rf $RPM_BUILD_ROOT
%{python3_sitelib}/qubesimgconverter/imggen.py
%{python3_sitelib}/qubesimgconverter/test.py
%{python3_sitelib}/qubesimgconverter/test_integ.py
%{python3_sitelib}/qubesimgconverter-%{version}-py?.[0-9]*.egg-info
%{python3_sitelib}/qubesimgconverter-*.egg-info
%{python3_sitelib}/qubesimgconverter/__pycache__

%files libs
Expand Down