Skip to content

Commit

Permalink
Call qubes.PostInstall service to notify dom0 about all apps/features
Browse files Browse the repository at this point in the history
Update dom0 about all applications installed, not only desktop files for
them. Update also supported features and other things advertised
initially at template installation.

Fixes QubesOS/qubes-issues#3579
  • Loading branch information
marmarek committed Feb 13, 2018
1 parent f38e204 commit 3ddd687
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 11 deletions.
4 changes: 2 additions & 2 deletions archlinux/PKGBUILD.qubes-update-desktop-icons.hook
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ Operation = Remove
Target = usr/share/applications/*.desktop

[Action]
Description = Updating the Qubes desktop file App Icons...
Description = Updating the Qubes desktop file App Icons and features...
When = PostTransaction
Exec = /usr/lib/qubes/qubes-trigger-sync-appmenus.sh
Exec = /etc/qubes-rpc/qubes.PostInstall
8 changes: 4 additions & 4 deletions debian/qubes-core-agent.postinst
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ case "${1}" in

dconf update || true

# Update Qubes App Menus
/usr/lib/qubes/qubes-trigger-sync-appmenus.sh || true
# tell dom0 about installed updates (applications, features etc)
/etc/qubes-rpc/qubes.PostInstall || true
;;

abort-upgrade|abort-remove|abort-deconfigure)
Expand All @@ -194,8 +194,8 @@ case "${1}" in
case "${trigger}" in

/usr/share/applications)
debug "Updating Qubes App Menus..."
/usr/lib/qubes/qubes-trigger-sync-appmenus.sh || true
debug "Updating Qubes App Menus and advertising features..."
/etc/qubes-rpc/qubes.PostInstall || true
;;

# Install overridden serial.conf init script
Expand Down
5 changes: 2 additions & 3 deletions misc/dnf-qubes-hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,5 @@ def transaction(self):
str(len(updates))
])

if config.getboolean('main', 'sync-appmenus'):
self.log.info("Sending application list and icons to dom0")
subprocess.call(['/usr/lib/qubes/qubes-trigger-sync-appmenus.sh'])
self.log.info("Notifying dom0 about installed applications")
subprocess.call(['/etc/qubes-rpc/qubes.PostInstall'])
4 changes: 2 additions & 2 deletions post-install.d/README
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
All executable files with `.sh` suffix in this directory will be executed as
root just after template installation. Template VM may not have access to the
network at this time yet.
root just after template installation or update. Template VM may
not have access to the network at this time yet.

0 comments on commit 3ddd687

Please sign in to comment.