Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dom0: Edit xl.conf in %post instead of overriding file (rpm file conflict)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-06-23 14:39:17 +02:00
parent d9d7a69c27
commit 151b15bb8c
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom0/misc/xl.conf
View File

@ -1,11 +0,0 @@
## Global XL config file ##
# automatically balloon down dom0 when xen doesn't have enough free
# memory to create a domain
autoballoon=0
# full path of the lockfile used by xl during domain creation
lockfile="/var/run/qubes/xl-lock"
# default vif script
#vifscript="vif-bridge"

7
rpm_spec/core-dom0.spec
View File

@ -138,8 +138,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
cp ../common/iptables $RPM_BUILD_ROOT/etc/sysconfig cp ../common/iptables $RPM_BUILD_ROOT/etc/sysconfig
mkdir -p $RPM_BUILD_ROOT/etc/security/limits.d mkdir -p $RPM_BUILD_ROOT/etc/security/limits.d
cp misc/limits-qubes.conf $RPM_BUILD_ROOT/etc/security/limits.d/99-qubes.conf cp misc/limits-qubes.conf $RPM_BUILD_ROOT/etc/security/limits.d/99-qubes.conf
mkdir -p $RPM_BUILD_ROOT/etc/xen/
cp misc/xl.conf $RPM_BUILD_ROOT/etc/xen/
mkdir -p $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d mkdir -p $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d
cp pm-utils/01qubes-sync-vms-clock $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/ cp pm-utils/01qubes-sync-vms-clock $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/
@ -170,6 +168,10 @@ fi
sed 's/^net.ipv4.ip_forward.*/net.ipv4.ip_forward = 1/' -i /etc/sysctl.conf sed 's/^net.ipv4.ip_forward.*/net.ipv4.ip_forward = 1/' -i /etc/sysctl.conf
sed '/^autoballoon=/d;/^lockfile=/d' -i /etc/xen/xl.conf
echo 'autoballoon=0' >> /etc/xen/xl.conf
echo 'lockfile="/var/run/qubes/xl-lock"' >> /etc/xen/xl.conf
sed '/^reposdir=/d' -i /etc/yum.conf sed '/^reposdir=/d' -i /etc/yum.conf
echo reposdir=/etc/yum.real.repos.d >> /etc/yum.conf echo reposdir=/etc/yum.real.repos.d >> /etc/yum.conf
@ -321,5 +323,4 @@ fi
/etc/sudoers.d/qubes /etc/sudoers.d/qubes
/etc/xdg/autostart/qubes-guid.desktop /etc/xdg/autostart/qubes-guid.desktop
/etc/security/limits.d/99-qubes.conf /etc/security/limits.d/99-qubes.conf
/etc/xen/xl.conf
/etc/yum/post-actions/qubes_sync_rpmdb_updatevm.action /etc/yum/post-actions/qubes_sync_rpmdb_updatevm.action