QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent installing all the qubes packages in the installer image

Browse Source 
Split kernel-install hook into separate package, as only this part is
needed by the installer. This will prevent installing all the Qubes/Xen
staff in the installer, especially udev scripts and xenstored, which
doesn't play well with anaconda.

(cherry picked from commit 5e6d3a273d)

Conflicts:
	rpm_spec/core-dom0-linux.spec
This commit is contained in:
Marek Marczykowski-Górecki 2015-07-14 23:27:03 +02:00
parent bc3c9fa422
commit 1d5b55465f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rpm_spec/core-dom0-linux.spec
View File

@ -46,7 +46,7 @@ BuildRequires: pandoc
BuildRequires: qubes-utils-devel >= 2.0.5 BuildRequires: qubes-utils-devel >= 2.0.5
Requires: qubes-core-dom0 Requires: qubes-core-dom0
Requires: qubes-utils >= 2.0.6 Requires: qubes-utils >= 2.0.6
Provides: %{name}-kernel-install Requires: %{name}-kernel-install
# get rid of os-prober, it tries to mount and parse all the block devices in # get rid of os-prober, it tries to mount and parse all the block devices in
# the system, including loop* # the system, including loop*
@ -60,6 +60,12 @@ Linux customizations required to use system as Qubes dom0.
Additionally some graphical elements for every Linux desktop envirnment (icons, Additionally some graphical elements for every Linux desktop envirnment (icons,
appmenus etc). appmenus etc).
%package kernel-install
Summary: Kernel install hook for Xen-based system
%description kernel-install
Kernel install hook for Xen-based system.
%prep %prep
# we operate on the current directory, so no need to unpack anything # we operate on the current directory, so no need to unpack anything
# symlink is to generate useful debuginfo packages # symlink is to generate useful debuginfo packages
@ -257,7 +263,6 @@ chmod -x /etc/grub.d/10_linux
# Others # Others
/etc/sysconfig/iptables /etc/sysconfig/iptables
/etc/sysconfig/ip6tables /etc/sysconfig/ip6tables
/usr/lib/kernel/install.d/90-grub2.install
/etc/sysconfig/modules/qubes-dom0.modules /etc/sysconfig/modules/qubes-dom0.modules
/etc/sysconfig/modules/cpufreq-xen.modules /etc/sysconfig/modules/cpufreq-xen.modules
/etc/sudoers.d/qubes /etc/sudoers.d/qubes
@ -271,5 +276,7 @@ chmod -x /etc/grub.d/10_linux
%{_mandir}/man1/qvm-*.1* %{_mandir}/man1/qvm-*.1*
%{_mandir}/man1/qubes-*.1* %{_mandir}/man1/qubes-*.1*
%files kernel-install
/usr/lib/kernel/install.d/90-grub2.install
%changelog %changelog