Merge branch 'master' into archfix-201507
This commit is contained in:
commit
bceca326d8
4
debian/qubes-core-agent.postinst
vendored
4
debian/qubes-core-agent.postinst
vendored
@ -220,6 +220,10 @@ case "${1}" in
|
|||||||
|
|
||||||
chown user:user /home_volatile/user
|
chown user:user /home_volatile/user
|
||||||
|
|
||||||
|
if ! dpkg-statoverride --list /var/lib/qubes/dom0-updates >/dev/null 2>&1; then
|
||||||
|
dpkg-statoverride --update --add user user 775 /var/lib/qubes/dom0-updates
|
||||||
|
fi
|
||||||
|
|
||||||
dpkg-divert --divert /etc/init/serial.conf.qubes-orig --package qubes-core-agent --rename --add /etc/init/serial.conf
|
dpkg-divert --divert /etc/init/serial.conf.qubes-orig --package qubes-core-agent --rename --add /etc/init/serial.conf
|
||||||
|
|
||||||
# Enable Qubes systemd units
|
# Enable Qubes systemd units
|
||||||
|
4
debian/qubes-core-agent.postrm
vendored
4
debian/qubes-core-agent.postrm
vendored
@ -48,6 +48,10 @@ if [ "${1}" = "remove" ] ; then
|
|||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ "$1" = "purge" ]; then
|
||||||
|
dpkg-statoverride --remove /var/lib/qubes/dom0-updates || test $? -eq 2
|
||||||
|
fi
|
||||||
|
|
||||||
# dh_installdeb will replace this with shell code automatically
|
# dh_installdeb will replace this with shell code automatically
|
||||||
# generated by other debhelper scripts.
|
# generated by other debhelper scripts.
|
||||||
|
|
||||||
|
@ -80,7 +80,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$PKGLIST" -a -z "$UPDATES" ]; then
|
if [ -z "$PKGLIST" -a -z "$UPDATES" ]; then
|
||||||
# No new updates
|
echo "No new updates available"
|
||||||
if [ "$GUI" = 1 ]; then
|
if [ "$GUI" = 1 ]; then
|
||||||
zenity --info --text="No new updates available"
|
zenity --info --text="No new updates available"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user