diff options
| author | Jonathan Bauer | 2014-01-30 11:08:31 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-30 11:08:31 +0100 |
| commit | 6a650df8c4ec834c03a51604942e32ec9c5741e7 (patch) | |
| tree | e54eb007b92269e6c4872770e62ef398ac347a8e /server | |
| parent | [rfs-s31] append host info from dhcp instead of creating the file (diff) | |
| parent | [systemd] Clean up build file (diff) | |
| download | tm-scripts-6a650df8c4ec834c03a51604942e32ec9c5741e7.tar.gz tm-scripts-6a650df8c4ec834c03a51604942e32ec9c5741e7.tar.xz tm-scripts-6a650df8c4ec834c03a51604942e32ec9c5741e7.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
remote/rootfs/rootfs-stage31/data/inc/udhcpc-trigger
Diffstat (limited to 'server')
| -rw-r--r-- | server/blacklists/desktop-sessions/lightdm-runtime-cache | 4 | ||||
| -rw-r--r-- | server/blacklists/essential/status-files | 1 | ||||
| -rw-r--r-- | server/blacklists/persistent-only/ubuntu-update-notifier | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/server/blacklists/desktop-sessions/lightdm-runtime-cache b/server/blacklists/desktop-sessions/lightdm-runtime-cache new file mode 100644 index 00000000..56aa4cc9 --- /dev/null +++ b/server/blacklists/desktop-sessions/lightdm-runtime-cache @@ -0,0 +1,4 @@ +- /var/lib/lightdm/** ++ /var/lib/lightdm/**/ ++ /var/lib/lightdm/.fontconfig/** + diff --git a/server/blacklists/essential/status-files b/server/blacklists/essential/status-files new file mode 100644 index 00000000..ed81d019 --- /dev/null +++ b/server/blacklists/essential/status-files @@ -0,0 +1 @@ +- /var/lib/logrotate/status diff --git a/server/blacklists/persistent-only/ubuntu-update-notifier b/server/blacklists/persistent-only/ubuntu-update-notifier new file mode 100644 index 00000000..fa51a26d --- /dev/null +++ b/server/blacklists/persistent-only/ubuntu-update-notifier @@ -0,0 +1,5 @@ ++ /var/lib/ubuntu-release-upgrader/**/ +- /var/lib/ubuntu-release-upgrader/** ++ /var/lib/update-notifier/**/ +- /var/lib/update-notifier/** + |