QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename netvm -> sys-net, firewallvm -> sys-firewall

Browse Source
This commit is contained in:
Wojtek Porczyk 2015-03-10 21:46:22 +01:00
parent 96b7053d35
commit 56a66e8027
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firstboot/firstboot-qubes-text
View File

@ -96,14 +96,14 @@ if [ "$vms_template" == "yes" ]; then
fi fi
if [ "$vms_service" == "yes" ]; then if [ "$vms_service" == "yes" ]; then
echo "-> Creating default netvm..." echo "-> Creating default netvm..."
su -c "/usr/bin/qvm-create --net --label red netvm" - $user su -c "/usr/bin/qvm-create --net --label red sys-net" - $user
for dev in `/sbin/lspci -mm -n | sed -ne 's/^\([0-9][0-9]:[0-9][0-9].[0-9]\) "02.*/\1/p'`; do for dev in `/sbin/lspci -mm -n | sed -ne 's/^\([0-9][0-9]:[0-9][0-9].[0-9]\) "02.*/\1/p'`; do
su -c "/usr/bin/qvm-pci -a netvm $dev" - $user su -c "/usr/bin/qvm-pci -a sys-net $dev" - $user
done done
echo "-> Creating default firewallvm..." echo "-> Creating default firewallvm..."
su -c "/usr/bin/qvm-create --proxy --label green firewallvm" - $user su -c "/usr/bin/qvm-create --proxy --label green sys-firewall" - $user
su -c "/usr/bin/qvm-prefs --set firewallvm netvm netvm" - $user su -c "/usr/bin/qvm-prefs --set sys-firewall netvm sys-net" - $user
su -c "/usr/bin/qubes-prefs --set default-netvm firewallvm" - $user su -c "/usr/bin/qubes-prefs --set default-netvm sys-firewall" - $user
echo "-> Starting network..." echo "-> Starting network..."
service qubes-netvm start service qubes-netvm start
echo "-> Creating DispVM savefile (can take long time)..." echo "-> Creating DispVM savefile (can take long time)..."

4
firstboot/modules/qubes_setup.py
View File

@ -33,8 +33,8 @@ _ = lambda x: gettext.ldgettext("firstboot", x)
N_ = lambda x: x N_ = lambda x: x
class moduleClass(Module): class moduleClass(Module):
netvm_name = "netvm" netvm_name = "sys-net"
fwvm_name = "firewallvm" fwvm_name = "sys-firewall"
def __init__(self): def __init__(self):
Module.__init__(self) Module.__init__(self)