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

Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-05-12 13:36:16 +02:00
commit 8a83f2aa63
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpm_spec/core-vm.spec
View File

@ -237,6 +237,14 @@ sed 's/^net.ipv4.ip_forward.*/#\0/' -i /etc/sysctl.conf
sed -i -e '/^exclude = kernel/d' /etc/yum.conf sed -i -e '/^exclude = kernel/d' /etc/yum.conf
echo 'exclude = kernel, xorg-x11-drv-*, xorg-x11-drivers, xorg-x11-server-*' >> /etc/yum.conf echo 'exclude = kernel, xorg-x11-drv-*, xorg-x11-drivers, xorg-x11-server-*' >> /etc/yum.conf
# qubes-core-vm has been broken for some time - it overrides /etc/hosts; restore original content
if ! grep -q localhost /etc/hosts; then
cat <<EOF > /etc/hosts
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 `hostname`
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
EOF
fi
if [ "$1" != 1 ] ; then if [ "$1" != 1 ] ; then
# do the rest of %post thing only when updating for the first time... # do the rest of %post thing only when updating for the first time...
exit 0 exit 0

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`