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

Completed dvm->setupdvm name transition

Browse Source
This commit is contained in:
Rafal Wojtczuk 2010-09-22 10:24:57 +02:00
parent 7aa55affcf
commit 0217dba40e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom0/init.d/qubes_setupdvm
View File

@ -45,7 +45,7 @@ start()
ln -s /dev/shm/qubes/current_savefile /var/run/qubes/current_savefile ln -s /dev/shm/qubes/current_savefile /var/run/qubes/current_savefile
fi fi
touch /var/lock/subsys/qubes_dvm touch /var/lock/subsys/qubes_setupdvm
success success
echo echo

8
rpm_spec/core-dom0.spec
View File

@ -54,7 +54,7 @@ make -C ../common
mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/etc/init.d
cp init.d/qubes_core $RPM_BUILD_ROOT/etc/init.d/ cp init.d/qubes_core $RPM_BUILD_ROOT/etc/init.d/
cp init.d/qubes_netvm $RPM_BUILD_ROOT/etc/init.d/ cp init.d/qubes_netvm $RPM_BUILD_ROOT/etc/init.d/
cp init.d/qubes_dvm $RPM_BUILD_ROOT/etc/init.d/ cp init.d/qubes_setupdvm $RPM_BUILD_ROOT/etc/init.d/
mkdir -p $RPM_BUILD_ROOT/usr/bin/ mkdir -p $RPM_BUILD_ROOT/usr/bin/
cp qvm-tools/qvm-* $RPM_BUILD_ROOT/usr/bin cp qvm-tools/qvm-* $RPM_BUILD_ROOT/usr/bin
@ -156,11 +156,11 @@ sed 's/^net.ipv4.ip_forward.*/net.ipv4.ip_forward = 1/' -i /etc/sysctl.conf
chkconfig --add qubes_core || echo "WARNING: Cannot add service qubes_core!" chkconfig --add qubes_core || echo "WARNING: Cannot add service qubes_core!"
chkconfig --add qubes_netvm || echo "WARNING: Cannot add service qubes_netvm!" chkconfig --add qubes_netvm || echo "WARNING: Cannot add service qubes_netvm!"
chkconfig --add qubes_dvm || echo "WARNING: Cannot add service qubes_dvm!" chkconfig --add qubes_setupdvm || echo "WARNING: Cannot add service qubes_setupdvm!"
chkconfig qubes_core on || echo "WARNING: Cannot enable service qubes_core!" chkconfig qubes_core on || echo "WARNING: Cannot enable service qubes_core!"
chkconfig qubes_netvm on || echo "WARNING: Cannot enable service qubes_netvm!" chkconfig qubes_netvm on || echo "WARNING: Cannot enable service qubes_netvm!"
chkconfig qubes_dvm on || echo "WARNING: Cannot enable service qubes_dvm!" chkconfig qubes_setupdvm on || echo "WARNING: Cannot enable service qubes_setupdvm!"
if ! [ -e /var/lib/qubes/qubes.xml ]; then if ! [ -e /var/lib/qubes/qubes.xml ]; then
# echo "Initializing Qubes DB..." # echo "Initializing Qubes DB..."
@ -198,7 +198,7 @@ fi
%defattr(-,root,root,-) %defattr(-,root,root,-)
/etc/init.d/qubes_core /etc/init.d/qubes_core
/etc/init.d/qubes_netvm /etc/init.d/qubes_netvm
/etc/init.d/qubes_dvm /etc/init.d/qubes_setupdvm
/usr/bin/qvm-* /usr/bin/qvm-*
/usr/bin/qclipd /usr/bin/qclipd
/usr/bin/qfilexchgd /usr/bin/qfilexchgd