diff options
| -rw-r--r-- | remote/modules/debug/data/etc/systemd/system/debug-udevd_logger.service | 8 | ||||
| l--------- | remote/modules/debug/data/etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service | 1 | ||||
| -rwxr-xr-x | remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger | 2 | ||||
| -rw-r--r-- | remote/modules/debug/debug.conf | 1 | ||||
| -rw-r--r-- | remote/modules/debug/debug.conf.opensuse | 1 | ||||
| -rw-r--r-- | scripts/clone_stage4.README | 2 | ||||
| -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 |
10 files changed, 50 insertions, 8 deletions
diff --git a/remote/modules/debug/data/etc/systemd/system/debug-udevd_logger.service b/remote/modules/debug/data/etc/systemd/system/debug-udevd_logger.service new file mode 100644 index 00000000..d834292f --- /dev/null +++ b/remote/modules/debug/data/etc/systemd/system/debug-udevd_logger.service @@ -0,0 +1,8 @@ +[Unit] +Description=Logger for udevd-messages via udevadmin monitor +DefaultDependencies=no +IgnoreOnIsolate=yes + +[Service] +Type=oneshot +ExecStart=/opt/openslx/scripts/systemd-debug_udevd_logger diff --git a/remote/modules/debug/data/etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service b/remote/modules/debug/data/etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service new file mode 120000 index 00000000..ad7f978f --- /dev/null +++ b/remote/modules/debug/data/etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service @@ -0,0 +1 @@ +../debug-udevd_logger.service
\ No newline at end of file diff --git a/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger b/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger new file mode 100755 index 00000000..8b772517 --- /dev/null +++ b/remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger @@ -0,0 +1,2 @@ +#!/bin/sh +/usr/bin/udevadm monitor | /usr/bin/logger diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf index 66f90011..82a741fe 100644 --- a/remote/modules/debug/debug.conf +++ b/remote/modules/debug/debug.conf @@ -12,6 +12,7 @@ REQUIRED_BINARIES=" su file @htop + logger @tcpdump getfacl " diff --git a/remote/modules/debug/debug.conf.opensuse b/remote/modules/debug/debug.conf.opensuse index e4306fc3..b7971956 100644 --- a/remote/modules/debug/debug.conf.opensuse +++ b/remote/modules/debug/debug.conf.opensuse @@ -8,5 +8,4 @@ REQUIRED_INSTALLED_PACKAGES=" " REQUIRED_BINARIES+=" fonts-config - logger " diff --git a/scripts/clone_stage4.README b/scripts/clone_stage4.README index 346be031..6a8ddf5c 100644 --- a/scripts/clone_stage4.README +++ b/scripts/clone_stage4.README @@ -21,7 +21,7 @@ Then, on the service computer (the one where's booted from etc, see above) - or, if wanted, sync just some parts, for example: ./mltk server [IP] stage31 -e stage31 -s ./mltk server [IP] stage32 -e stage32 -s - ./mltk server 132.230.8.238 vbox -e addons + ./mltk server 132.230.8.238 vbox -e addons -s (etc.) Well, then do the cloning work: 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/** - |