Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[ssu] Move cache files for features/board-mappings to /var/cache
  • Loading branch information
Bernd Wachter committed Sep 24, 2014
1 parent b57faa4 commit 3ad96b5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion constants.h
Expand Up @@ -13,7 +13,7 @@
/// Path to the main SSU configuration file
#define SSU_REPO_CONFIGURATION "/usr/share/ssu/repos.ini"
/// Path to board / device family mappings file
#define SSU_BOARD_MAPPING_CONFIGURATION "/usr/share/ssu/board-mappings.ini"
#define SSU_BOARD_MAPPING_CONFIGURATION "/var/cache/ssu/board-mappings.ini"
/// Path to config.d for board mappings
#define SSU_BOARD_MAPPING_CONFIGURATION_DIR "/usr/share/ssu/board-mappings.d"
/// Directory where all the non-user modifiable data sits
Expand Down
2 changes: 1 addition & 1 deletion libssu/ssufeaturemanager.cpp
Expand Up @@ -20,7 +20,7 @@

#ifndef SSU_FEATURE_CONFIGURATION
/// Path to the main SSU configuration file
#define SSU_FEATURE_CONFIGURATION "/usr/share/ssu/features.ini"
#define SSU_FEATURE_CONFIGURATION "/var/cache/ssu/features.ini"
#endif

#ifndef SSU_FEATURE_CONFIGURATION_DIR
Expand Down
8 changes: 8 additions & 0 deletions rpm/ssu.spec
Expand Up @@ -169,5 +169,13 @@ if [ "$1" == 0 ]; then
getent group ssu >/dev/null && groupdel ssu
fi

# Removing autogenerated droplets can be dropped eventually
# Just needed for a transition period
%post
/sbin/ldconfig
if [ -f /usr/share/ssu/board-mappings.ini ]; then
rm -f /usr/share/ssu/board-mappings.ini
fi
if [ -f /usr/share/ssu/features.ini ]; then
rm -f /usr/share/ssu/features.ini
fi

0 comments on commit 3ad96b5

Please sign in to comment.