From b6f036caf2276b26a064156f4ee8ca7b026ecdc0 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 30 Jun 2011 01:07:47 +0200 Subject: [PATCH] dom0+vm: Update VM kernel mechanism (#242) Get kernel from global kernels dir (/var/lib/qubes/vm-kernels), not per-VM. Can be configured by qvm-prefs (kernel parameter). New tool: qvm-set-default-kernel For backward compatibility kernel=None means kernel in VM dir (kernels subdir). (possibly empty) modules.img should be created in it. --- common/fstab | 1 + rpm_spec/core-commonvm.spec | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/common/fstab b/common/fstab index 3bd3474..37b23a9 100644 --- a/common/fstab +++ b/common/fstab @@ -9,6 +9,7 @@ /dev/mapper/dmroot / ext4 defaults,noatime 1 1 /dev/xvdb /rw ext4 noauto,defaults 0 0 /dev/xvdc1 swap swap defaults 0 0 +/dev/xvdd /lib/modules ext3 defaults,ro 0 0 tmpfs /dev/shm tmpfs defaults 0 0 devpts /dev/pts devpts gid=5,mode=620 0 0 sysfs /sys sysfs defaults 0 0 diff --git a/rpm_spec/core-commonvm.spec b/rpm_spec/core-commonvm.spec index d754c36..26d89b1 100644 --- a/rpm_spec/core-commonvm.spec +++ b/rpm_spec/core-commonvm.spec @@ -86,6 +86,9 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib/qubes cp qubes_trigger_sync_appmenus.sh $RPM_BUILD_ROOT/usr/lib/qubes/ mkdir -p $RPM_BUILD_ROOT/var/lib/qubes/dom0-updates +mkdir -p $RPM_BUILD_ROOT/lib/firmware +ln -s /lib/modules/firmware $RPM_BUILD_ROOT/lib/firmware/updates + %triggerin -- initscripts cp /var/lib/qubes/serial.conf /etc/init/serial.conf @@ -236,3 +239,4 @@ rm -rf $RPM_BUILD_ROOT /etc/yum/post-actions/qubes_trigger_sync_appmenus.action /usr/lib/qubes/qubes_trigger_sync_appmenus.sh /usr/lib/qubes/qubes_download_dom0_updates.sh +/lib/firmware/updates