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

Move /usr/share/qubes/xdg to /var/lib/qubes/xdg

Browse Source 
No files in /usr should be modified during package runtime, `/var` is
for that. So move this data there.
This commit is contained in:
Marek Marczykowski-Górecki 2015-08-08 02:01:15 +02:00
parent e2cb9b9d74
commit 13c54badcb
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
misc/qubes-desktop-file-install
View File

@ -31,8 +31,8 @@ Description:
The original .desktop files are left untouched and left in place. The original .desktop files are left untouched and left in place.
Qubes modifies the XDG_CONFIG_DIRS to first include the `/usr/share/qubes/xdg` Qubes modifies the XDG_CONFIG_DIRS to first include the `/var/lib/qubes/xdg`
directory (XDG_CONFIG_DIRS=/usr/share/qubes/xdg:/etc/xdg). directory (XDG_CONFIG_DIRS=/var/lib/qubes/xdg:/etc/xdg).
Usage: Usage:
qubes-desktop-file-install [--dir DIR] [--force] qubes-desktop-file-install [--dir DIR] [--force]
@ -48,7 +48,7 @@ Usage:
qubes-desktop-file-install --version qubes-desktop-file-install --version
Examples: Examples:
qubes-desktop-file-install --dir /usr/share/qubes/xdg/autostart --add-only-show-in X-QUBES /etc/xdg/autostart/pulseaudio.desktop qubes-desktop-file-install --dir /var/lib/qubes/xdg/autostart --add-only-show-in X-QUBES /etc/xdg/autostart/pulseaudio.desktop
Arguments: Arguments:
FILE Path to desktop entry file FILE Path to desktop entry file
@ -94,7 +94,7 @@ __version__ = '1.0.0'
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
# Default Qubes directory that modified desktop entry config files are stored in # Default Qubes directory that modified desktop entry config files are stored in
QUBES_XDG_CONFIG_DIR = '/usr/share/qubes/xdg' QUBES_XDG_CONFIG_DIR = '/vat/lib/qubes/xdg'
class DesktopEntry(xdg.DesktopEntry.DesktopEntry): class DesktopEntry(xdg.DesktopEntry.DesktopEntry):

2
misc/qubes-trigger-desktop-file-install
View File

@ -20,7 +20,7 @@
# --add-not-show-in ENVIRONMENT Add ENVIRONMENT to the list of desktop environment where the desktop files should not be displayed # --add-not-show-in ENVIRONMENT Add ENVIRONMENT to the list of desktop environment where the desktop files should not be displayed
QUBES_DESKTOP_FILE_INSTALL='/usr/bin/qubes-desktop-file-install' QUBES_DESKTOP_FILE_INSTALL='/usr/bin/qubes-desktop-file-install'
QUBES_XDG_CONFIG_DIR=/usr/share/qubes/xdg/autostart QUBES_XDG_CONFIG_DIR=/var/lib/qubes/xdg/autostart
XDG_CONFIG_DIR=/etc/xdg/autostart XDG_CONFIG_DIR=/etc/xdg/autostart
INSTALL_CMD=""${QUBES_DESKTOP_FILE_INSTALL}" --force --dir "${QUBES_XDG_CONFIG_DIR}"" INSTALL_CMD=""${QUBES_DESKTOP_FILE_INSTALL}" --force --dir "${QUBES_XDG_CONFIG_DIR}""

8
rpm_spec/core-vm.spec
View File

@ -129,7 +129,7 @@ if [ -e /etc/init/serial.conf ]; then
fi fi
%triggerin -- pulseaudio-module-x11 %triggerin -- pulseaudio-module-x11
/usr/bin/qubes-desktop-file-install --force --dir /usr/share/qubes/xdg/autostart --remove-show-in --add-not-show-in X-QUBES /etc/xdg/autostart/pulseaudio.desktop /usr/bin/qubes-desktop-file-install --force --dir /var/lib/qubes/xdg/autostart --remove-show-in --add-not-show-in X-QUBES /etc/xdg/autostart/pulseaudio.desktop
%triggerin -- iptables %triggerin -- iptables
if ! grep -q IPTABLES_DATA /etc/sysconfig/iptables-config; then if ! grep -q IPTABLES_DATA /etc/sysconfig/iptables-config; then
@ -160,7 +160,7 @@ for F in plymouth-shutdown prefdm splash-manager start-ttys tty ; do
done done
# Update all autostart xdg desktop configuration files (modified copies are # Update all autostart xdg desktop configuration files (modified copies are
# placed in /usr/share/qubes/xdg/autostart) # placed in /var/lib/qubes/xdg/autostart)
/usr/lib/qubes/qubes-trigger-desktop-file-install clean /usr/lib/qubes/qubes-trigger-desktop-file-install clean
# Create NetworkManager configuration if we do not have it # Create NetworkManager configuration if we do not have it
@ -313,7 +313,7 @@ if [ $1 -eq 0 ] ; then
rm /lib/firmware/updates rm /lib/firmware/updates
fi fi
rm -rf /usr/share/qubes/xdg rm -rf /var/lib/qubes/xdg
fi fi
%posttrans %posttrans
@ -426,7 +426,7 @@ rm -f %{name}-%{version}
/usr/share/nautilus-python/extensions/qvm_move_nautilus.py* /usr/share/nautilus-python/extensions/qvm_move_nautilus.py*
/usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py* /usr/share/nautilus-python/extensions/qvm_dvm_nautilus.py*
%dir /usr/share/qubes %dir /var/lib/qubes
/usr/share/qubes/mime-override/globs /usr/share/qubes/mime-override/globs
%dir /home_volatile %dir /home_volatile
%attr(700,user,user) /home_volatile/user %attr(700,user,user) /home_volatile/user

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

@ -27,7 +27,7 @@ INTERFACE=eth0 /usr/lib/qubes/setup-ip
# Start services which haven't own proper systemd unit: # Start services which haven't own proper systemd unit:
# Start AppVM specific services # Start AppVM specific services
INSTALL_CMD='/usr/bin/qubes-desktop-file-install --force --dir /usr/share/qubes/xdg/autostart' INSTALL_CMD='/usr/bin/qubes-desktop-file-install --force --dir /var/lib/qubes/xdg/autostart'
if [ ! -f /etc/systemd/system/cups.service ]; then if [ ! -f /etc/systemd/system/cups.service ]; then
if [ -f /var/run/qubes-service/cups ]; then if [ -f /var/run/qubes-service/cups ]; then