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

vm: add -qubes suffix to xenstore-watch to not conflict with xen standard tool

Browse Source
This commit is contained in:
Marek Marczykowski 2011-06-06 02:37:55 +02:00
parent ae6d2ac70c
commit 0ffb186681
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proxyvm/bin/qubes_firewall
View File

@ -32,5 +32,5 @@ while true; do
fi fi
# Wait for changes in xenstore file # Wait for changes in xenstore file
/usr/bin/xenstore-watch $XENSTORE_IPTABLES /usr/bin/xenstore-watch-qubes $XENSTORE_IPTABLES
done done

4
proxyvm/bin/qubes_netwatcher
View File

@ -24,8 +24,8 @@ while true; do
/usr/bin/xenstore-write qubes_netvm_external_ip "$CURR_NETCFG" /usr/bin/xenstore-write qubes_netvm_external_ip "$CURR_NETCFG"
fi fi
/usr/bin/xenstore-watch /local/domain/$NET_DOMID/qubes_netvm_external_ip /usr/bin/xenstore-watch-qubes /local/domain/$NET_DOMID/qubes_netvm_external_ip
else else
/usr/bin/xenstore-watch qubes_netvm_domid /usr/bin/xenstore-watch-qubes qubes_netvm_domid
fi fi
done done

4
rpm_spec/core-commonvm.spec
View File

@ -71,7 +71,7 @@ install -m 644 RPM-GPG-KEY-qubes* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
mkdir -p $RPM_BUILD_ROOT/sbin mkdir -p $RPM_BUILD_ROOT/sbin
cp qubes_serial_login $RPM_BUILD_ROOT/sbin cp qubes_serial_login $RPM_BUILD_ROOT/sbin
mkdir -p $RPM_BUILD_ROOT/usr/bin mkdir -p $RPM_BUILD_ROOT/usr/bin
cp xenstore-watch $RPM_BUILD_ROOT/usr/bin cp xenstore-watch $RPM_BUILD_ROOT/usr/bin/xenstore-watch-qubes
mkdir -p $RPM_BUILD_ROOT/etc mkdir -p $RPM_BUILD_ROOT/etc
cp serial.conf $RPM_BUILD_ROOT/var/lib/qubes/ cp serial.conf $RPM_BUILD_ROOT/var/lib/qubes/
mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d mkdir -p $RPM_BUILD_ROOT/etc/udev/rules.d
@ -223,6 +223,6 @@ rm -rf $RPM_BUILD_ROOT
/etc/yum.repos.d/qubes%{dist}.repo /etc/yum.repos.d/qubes%{dist}.repo
/etc/pki/rpm-gpg/RPM-GPG-KEY-qubes* /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*
/sbin/qubes_serial_login /sbin/qubes_serial_login
/usr/bin/xenstore-watch /usr/bin/xenstore-watch-qubes
/etc/udev/rules.d/qubes_network.rules /etc/udev/rules.d/qubes_network.rules
/usr/lib/qubes/setup_ip /usr/lib/qubes/setup_ip