Skip to content

Commit af904b8

Browse files
committed
Move dracut to its own RPM package
This was recommended on Fedora's Matrix channel.
1 parent 746b482 commit af904b8

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

rpm_spec/core-agent.spec.in

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ Requires: sed
134134
Requires: util-linux
135135
Requires: e2fsprogs
136136
Requires: hostname
137+
Requires: (%{name}-dracut if dracut)
137138
# for Qubes Manager VM updater
138139
Requires: xterm
139140
# for qubes-desktop-run
@@ -373,6 +374,19 @@ switching from user to root. Since all the user data in a VM is accessible
373374
already from normal user account, there is not much more to guard there. Qubes
374375
VMs are single user systems.
375376

377+
%package dracut
378+
Summary: Dracut configuration needed in Qubes OS
379+
License: GPL
380+
Group: Qubes
381+
Requires: dracut
382+
Requires: qubes-core-agent = %{version}
383+
384+
%description dracut
385+
Dracut configuration needed in Qubes OS. This enables
386+
passwordless login in rescue and emergency modes, as well
387+
as configuring dracut to only install certain drivers and
388+
omit others.
389+
376390
%package thunar
377391
Summary: Thunar support for Qubes VM tools
378392
Requires: Thunar
@@ -1030,12 +1044,6 @@ rm -f %{name}-%{version}
10301044
/usr/lib/qubes/resize-rootfs
10311045
/usr/lib/qubes/set-default-text-editor
10321046
/usr/lib/qubes/tinyproxy-wrapper
1033-
/usr/lib/dracut/dracut.conf.d/30-qubes.conf
1034-
# Ensure that dracut is not a hard requirement.
1035-
# It is only needed with in-VM initramfs, not
1036-
# dom0-provided initramfs.
1037-
%dir /usr/lib/dracut/modules.d/99qubes
1038-
/usr/lib/dracut/modules.d/99qubes/module-setup.sh
10391047

10401048
/usr/lib/environment.d/60-gnome-software-fix.conf
10411049
%dir /usr/lib/qubes/init
@@ -1106,6 +1114,11 @@ rm -f %{name}-%{version}
11061114
/usr/share/caja-python/extensions/qvm_dvm_caja.py*
11071115
%endif
11081116

1117+
%files dracut
1118+
/usr/lib/dracut/dracut.conf.d/30-qubes.conf
1119+
%dir /usr/lib/dracut/modules.d/99qubes
1120+
/usr/lib/dracut/modules.d/99qubes/module-setup.sh
1121+
11091122
%files nautilus
11101123
/usr/share/nautilus-python/extensions/qvm_copy_nautilus.py*
11111124
/usr/share/nautilus-python/extensions/qvm_move_nautilus.py*

0 commit comments

Comments
 (0)