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

vm: do not override /etc/hosts, just add VMNAME to 127.0.0.1

Browse Source
This commit is contained in:
Marek Marczykowski 2012-05-08 23:34:01 +02:00
parent 02e312ab04
commit 0268819655
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm-init.d/qubes_core
View File

@ -26,7 +26,7 @@ start()
# because it makes some of the pre-created dotfiles invalid (e.g. .kde/cache-<hostname>) # because it makes some of the pre-created dotfiles invalid (e.g. .kde/cache-<hostname>)
# (let's be frank: nobody's gonna use xterm on DispVM) # (let's be frank: nobody's gonna use xterm on DispVM)
hostname $name hostname $name
(grep -v "\<$name\>" /etc/hosts; echo "127.0.0.1 $name localhost") > /etc/hosts sed -i "s/^\(127\.0\.0\.1 .*\) \($name \)\?\(.*\)/\1\2 $name/" /etc/hosts
fi fi
timezone=`/usr/bin/xenstore-read qubes-timezone 2> /dev/null` timezone=`/usr/bin/xenstore-read qubes-timezone 2> /dev/null`

2
vm-systemd/qubes-sysinit.sh
View File

@ -52,7 +52,7 @@ done
name=`$XS_READ name` name=`$XS_READ name`
if [ -n "$name" ]; then if [ -n "$name" ]; then
hostname $name hostname $name
(grep -v "\<$name\>" /etc/hosts; echo "127.0.0.1 $name localhost") > /etc/hosts sed -i "s/^\(127\.0\.0\.1 .*\) \($name \)\?\(.*\)/\1\2 $name/" /etc/hosts
fi fi
timezone=`$XS_READ qubes-timezone 2> /dev/null` timezone=`$XS_READ qubes-timezone 2> /dev/null`