diff options
| author | Simon Rettberg | 2013-09-13 16:58:35 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-09-13 16:58:35 +0200 |
| commit | 5efd7fa7250a4c5b9f99780d39ffb92f01b98fb0 (patch) | |
| tree | ced9de90514efc86cc0e07b718778534e821761a /server | |
| parent | [debug] Optionally include tcpdump and getfacl (diff) | |
| parent | [blacklists] desktop-session/gnome: 'includes' for Gnome (diff) | |
| download | tm-scripts-5efd7fa7250a4c5b9f99780d39ffb92f01b98fb0.tar.gz tm-scripts-5efd7fa7250a4c5b9f99780d39ffb92f01b98fb0.tar.xz tm-scripts-5efd7fa7250a4c5b9f99780d39ffb92f01b98fb0.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Conflicts:
remote/modules/debug/debug.conf
Diffstat (limited to 'server')
| -rw-r--r-- | server/blacklists/README | 6 | ||||
| -rw-r--r-- | server/blacklists/desktop-sessions/gnome | 27 | ||||
| -rw-r--r-- | server/blacklists/pam/gnome | 7 | ||||
| -rw-r--r-- | server/blacklists/x-autostart/xdg-autostart | 3 |
4 files changed, 37 insertions, 6 deletions
diff --git a/server/blacklists/README b/server/blacklists/README index 1f4300d1..ed3fe459 100644 --- a/server/blacklists/README +++ b/server/blacklists/README @@ -3,7 +3,13 @@ should be excluded when cloning stage4 of a remote system. The blacklists are split into groups, represented by sub-directories. They contain one or more text files representing blacklists in rsync "--exclude-from" format. + There is a group called "essential", containg blacklists for essential files and dirs that you always want to exclude from being cloned. Other directories are create for specific software packages, like gnome, or kde. + +For inclusion of desktop environments like Gnome or KDE a substructure +(subdirectory) called desktop-sessions was introduced. The files / +directories in there should describe only includes ("+ ....") to provide +files needed for a desktop environment. diff --git a/server/blacklists/desktop-sessions/gnome b/server/blacklists/desktop-sessions/gnome new file mode 100644 index 00000000..c13d0109 --- /dev/null +++ b/server/blacklists/desktop-sessions/gnome @@ -0,0 +1,27 @@ +# transported from pam/gnome: ++ /etc/pam.d/gdm ++ /etc/pam.d/gdm-* ++ /etc/pam.d/gnome-* + +# transported from x-autostart/xdg-autostart: ++ /etc/xdg/autostart/gnome-settings-daemon.desktop ++ /etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop + +# files from /etc: +/etc/gnome +/etc/gnome-app-install +/etc/gnome-settings-daemon + +# files from /usr/bin: +/usr/bin/gnome* + +# from package gnome-session: +/usr/share/gnome-session +/usr/share/doc + +# + from package gnome-session-bin: +/usr/share/GConf +/usr/share/glib-2.0 +/usr/lib/*gnome* + + diff --git a/server/blacklists/pam/gnome b/server/blacklists/pam/gnome index d1c85b72..686f42c6 100644 --- a/server/blacklists/pam/gnome +++ b/server/blacklists/pam/gnome @@ -1,4 +1,5 @@ -+ /etc/pam.d/gdm -+ /etc/pam.d/gdm-* -+ /etc/pam.d/gnome-* +# transported to desktop-sessions/gnome +# + /etc/pam.d/gdm +# + /etc/pam.d/gdm-* +# + /etc/pam.d/gnome-* diff --git a/server/blacklists/x-autostart/xdg-autostart b/server/blacklists/x-autostart/xdg-autostart index 64593d31..b8c499ad 100644 --- a/server/blacklists/x-autostart/xdg-autostart +++ b/server/blacklists/x-autostart/xdg-autostart @@ -1,5 +1,2 @@ + /etc/xdg/autostart/**/ -+ /etc/xdg/autostart/gnome-settings-daemon.desktop -+ /etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop - /etc/xdg/autostart/** - |