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

Removed old unused code from appvm/qubes_core.

Browse Source
This commit is contained in:
Rafal Wojtczuk 2010-05-20 17:28:29 +02:00 committed by Joanna Rutkowska
parent 56d44d5bab
commit a836798751
1 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
appvm/qubes_core
View File

@ -10,24 +10,6 @@ start()
{
echo -n $"Executing Qubes Core scripts:"
if ! [ -d /rw/home ] ; then
echo
echo "--> Virgin boot of the VM: Linking /home to /rw/home"
mv /home /home.orig
mkdir -p /rw/config
mkdir -p /rw/home
ln -s /rw/home/ /home
# chcon --reference /home.orig /rw/home
cp -a /home.orig/user /home
touch /rw/config/rc.local
rm -fr /home.orig
touch /var/lib/qubes/first_boot_completed
else
mv /home /home.tmpl
ln -s /rw/home/ /home
fi
if ! [ -x /usr/bin/xenstore-read ] ; then
echo "ERROR: /usr/bin/xenstore-read not found!"
exit 1
@ -38,17 +20,12 @@ start()
vmtype=$(/usr/bin/xenstore-read qubes_vm_type)
if [ $vmtype == 'NetVM' ] ; then
# Setup gateway for all the VMs this netVM is serviceing...
brctl addbr br0
gateway=$(/usr/bin/xenstore-read qubes_netvm_gateway)
netmask=$(/usr/bin/xenstore-read qubes_netvm_netmask)
network=$(/usr/bin/xenstore-read qubes_netvm_network)
ifconfig br0 $gateway netmask $netmask up
echo "1" > /proc/sys/net/ipv4/ip_forward
dnsmasq
iptables -t nat -A POSTROUTING -s $network/$netmask -j MASQUERADE
else
if ! [ "X"$vmtype = XAppVM ] ; then
echo "ERROR: vmtype=$vmtype"
exit 1
fi
ip=$(/usr/bin/xenstore-read qubes_ip)
netmask=$(/usr/bin/xenstore-read qubes_netmask)
gateway=$(/usr/bin/xenstore-read qubes_gateway)
@ -59,17 +36,19 @@ start()
echo "nameserver $gateway" > /etc/resolv.conf
echo "nameserver $secondary_dns" >> /etc/resolv.conf
fi
if ! [ -L /home ] ; then
mv /home /home.orig
ln -s /rw/home /home
fi
if ! [ -L /usr/local ] ; then
mv /usr/local /usr/local.orig
ln -s /rw/usrlocal /usr/local
fi
#make it last, we want all above to work without /rw mounted
if ! [ -d /rw/usrlocal ] ; then
cp -a /usr/local.orig /rw/usrlocal
fi
fi
[ -x /rw/config/rc.local ] && /rw/config/rc.local
success
echo ""