From 558d1ee58278081f229e581c62dab6d9a8380b73 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Wed, 14 Sep 2011 00:35:49 +0200 Subject: [PATCH] dom+vm: Copy dom0 yum.conf to UpdateVM At least to use dom0 'exclude' options, not VM one. Especially to not exlude kernel and xorg updates... --- common/qubes_check_for_updates.sh | 2 +- common/qubes_download_dom0_updates.sh | 2 +- dom0/aux-tools/sync_rpmdb_updatevm.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/qubes_check_for_updates.sh b/common/qubes_check_for_updates.sh index 038637a2..abb1fd1d 100755 --- a/common/qubes_check_for_updates.sh +++ b/common/qubes_check_for_updates.sh @@ -8,7 +8,7 @@ if ! [ -d "$DOM0_UPDATES_DIR" ]; then fi mkdir -p $DOM0_UPDATES_DIR/etc -cp /etc/yum.conf $DOM0_UPDATES_DIR/etc/ +sed -i '/^reposdir\s*=/d' $DOM0_UPDATES_DIR/etc/yum.conf # check also for template updates echo "Checking for template updates..." >&2 diff --git a/common/qubes_download_dom0_updates.sh b/common/qubes_download_dom0_updates.sh index 132a1619..eb2b2296 100755 --- a/common/qubes_download_dom0_updates.sh +++ b/common/qubes_download_dom0_updates.sh @@ -34,7 +34,7 @@ if ! [ -d "$DOM0_UPDATES_DIR" ]; then fi mkdir -p $DOM0_UPDATES_DIR/etc -cp /etc/yum.conf $DOM0_UPDATES_DIR/etc/ +sed -i '/^reposdir\s*=/d' $DOM0_UPDATES_DIR/etc/yum.conf if [ "x$CLEAN" = "1" ]; then yum $OPTS clean all diff --git a/dom0/aux-tools/sync_rpmdb_updatevm.sh b/dom0/aux-tools/sync_rpmdb_updatevm.sh index d508b55c..88a8b29f 100755 --- a/dom0/aux-tools/sync_rpmdb_updatevm.sh +++ b/dom0/aux-tools/sync_rpmdb_updatevm.sh @@ -3,7 +3,7 @@ UPDATEVM=`qvm-get-updatevm` if [ -n "$UPDATEVM" ]; then - /usr/lib/qubes/qrexec_client -d "$UPDATEVM" -l 'tar c /var/lib/rpm /etc/yum.repos.d 2>/dev/null' 'user:tar x -C /var/lib/qubes/dom0-updates' + /usr/lib/qubes/qrexec_client -d "$UPDATEVM" -l 'tar c /var/lib/rpm /etc/yum.repos.d /etc/yum.conf 2>/dev/null' 'user:tar x -C /var/lib/qubes/dom0-updates' fi # Ignore errors (eg VM not running)