Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm
This commit is contained in:
commit
f1eb950b2e
@ -43,6 +43,10 @@ fi
|
||||
mkdir -p $DOM0_UPDATES_DIR/etc
|
||||
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
|
||||
yum $OPTS clean all
|
||||
rm -f $DOM0_UPDATES_DIR/packages/*
|
||||
|
@ -30,6 +30,11 @@ if [ -e /dev/xvdb ] ; then
|
||||
|
||||
touch /var/lib/qubes/first_boot_completed
|
||||
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
|
||||
|
||||
[ -x /rw/config/rc.local ] && /rw/config/rc.local
|
||||
|
Loading…
Reference in New Issue
Block a user