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

Use improved update-notify script also in Fedora

Browse Source 
Among other things this also fixes build failure - those scripts were
installed but not listed in spec file.

Actual check doesn't perform 'apt-get update', so do that when running
"standalone" (not as a hook from 'apt-get').

QubesOS/qubes-issues#1066
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-13 05:28:47 +01:00
parent d23f3d8ddb
commit 13c9149b6c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpm_spec/core-vm.spec
View File

@ -377,6 +377,8 @@ rm -f %{name}-%{version}
/usr/lib/qubes/close-window /usr/lib/qubes/close-window
/usr/lib/qubes/xdg-icon /usr/lib/qubes/xdg-icon
/usr/lib/qubes/update-proxy-configs /usr/lib/qubes/update-proxy-configs
/usr/lib/qubes/upgrades-installed-check
/usr/lib/qubes/upgrades-status-notify
/usr/lib/yum-plugins/yum-qubes-hooks.py* /usr/lib/yum-plugins/yum-qubes-hooks.py*
/usr/lib/python2.7/site-packages/dnf-plugins/qubes-hooks.py* /usr/lib/python2.7/site-packages/dnf-plugins/qubes-hooks.py*
/usr/lib/dracut/dracut.conf.d/30-qubes.conf /usr/lib/dracut/dracut.conf.d/30-qubes.conf

3
vm-systemd/qubes-update-check.service
View File

@ -5,4 +5,5 @@ After=qubes-qrexec-agent.service
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=/usr/lib/qubes/qrexec-client-vm dom0 qubes.NotifyUpdates /bin/sh -c 'if [ -e /etc/system-release ]; then yum -q check-update >/dev/null; [ $? -eq 100 ] && echo 1 || echo 0; else apt-get -q update > /dev/null; apt-get -s upgrade | awk "/^Inst/{ print $2 }" | [ $(wc -L) -eq 0 ] && echo 0 || echo 1; fi' ExecStart=/bin/sh -c 'if [ -e /etc/debian_version ]; then apt-get -q update; fi'
ExecStart=/usr/lib/qubes/upgrades-status-notify