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

Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-06-13 14:47:06 +02:00
commit f1eb950b2e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/qubes_download_dom0_updates.sh
View File

@ -43,6 +43,10 @@ fi
mkdir -p $DOM0_UPDATES_DIR/etc mkdir -p $DOM0_UPDATES_DIR/etc
sed -i '/^reposdir\s*=/d' $DOM0_UPDATES_DIR/etc/yum.conf sed -i '/^reposdir\s*=/d' $DOM0_UPDATES_DIR/etc/yum.conf
# Rebuild rpm database in case of different rpm version
rm -f $DOM0_UPDATES_DIR/var/lib/rpm/__*
rpm --root=$DOM0_UPDATES_DIR --rebuilddb
if [ "$CLEAN" = "1" ]; then if [ "$CLEAN" = "1" ]; then
yum $OPTS clean all yum $OPTS clean all
rm -f $DOM0_UPDATES_DIR/packages/* rm -f $DOM0_UPDATES_DIR/packages/*

5
vm-systemd/misc-post.sh
View File

@ -30,6 +30,11 @@ if [ -e /dev/xvdb ] ; then
touch /var/lib/qubes/first_boot_completed touch /var/lib/qubes/first_boot_completed
fi fi
# Chown home if user UID have changed - can be the case on template switch
HOME_USER_UID=`ls -dn /home/user | awk '{print $3}'`
if [ "`id -u user`" -ne "$HOME_USER_UID" ]; then
find /home/user -uid "$HOME_USER_UID" -print0 | xargs -0 chown user:user
fi
fi fi
[ -x /rw/config/rc.local ] && /rw/config/rc.local [ -x /rw/config/rc.local ] && /rw/config/rc.local