From bd22c3a5b92f474af07b14282bcfe75d2c9e715e Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 13 Sep 2013 15:37:05 +0200 Subject: [debug] udevd-logger for debug module with systemd-service *unreliable* --- .../debug/data/etc/systemd/system/debug-udevd_logger.service | 8 ++++++++ .../debug/data/opt/openslx/scripts/systemd-debug_udevd_logger | 2 ++ remote/modules/debug/debug.conf | 7 +++++++ remote/modules/debug/debug.conf.opensuse | 1 - 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 remote/modules/debug/data/etc/systemd/system/debug-udevd_logger.service create mode 100755 remote/modules/debug/data/opt/openslx/scripts/systemd-debug_udevd_logger 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/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 9ce39476..0db29dde 100644 --- a/remote/modules/debug/debug.conf +++ b/remote/modules/debug/debug.conf @@ -12,4 +12,11 @@ REQUIRED_BINARIES=" su file @htop + logger " + +# For debug-udevd_logger.service: +# REQUIRED_BINARIES+=" +# logger +# " + 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 " -- cgit v1.2.3-55-g7522 From 58d8ab852a0abd335c92680e9351fa116a6effcc Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 13 Sep 2013 15:38:37 +0200 Subject: [clone_stage4] README: A little -s missing in an example --- scripts/clone_stage4.README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- cgit v1.2.3-55-g7522 From 537f12551f9f6a9aecbfc240e7d875854b4313b8 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 13 Sep 2013 15:39:53 +0200 Subject: [debug] debug.conf: Forgot to delete an obsolete, out-commented entry --- remote/modules/debug/debug.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf index 0db29dde..fa2d92a3 100644 --- a/remote/modules/debug/debug.conf +++ b/remote/modules/debug/debug.conf @@ -14,9 +14,3 @@ REQUIRED_BINARIES=" @htop logger " - -# For debug-udevd_logger.service: -# REQUIRED_BINARIES+=" -# logger -# " - -- cgit v1.2.3-55-g7522 From 545cbfea05a3b60bddf4a9468284e9834a22252b Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 13 Sep 2013 15:45:10 +0200 Subject: [blacklists] README updated to reflect new structure desktop-sessions, 'includes' --- server/blacklists/README | 6 ++++++ 1 file changed, 6 insertions(+) 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. -- cgit v1.2.3-55-g7522 From bc03e7521e51a737f7f1ece8cedc9795e75ee8a7 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 13 Sep 2013 15:46:21 +0200 Subject: [debug] service link for service start within target --- .../etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service | 1 + 1 file changed, 1 insertion(+) create mode 120000 remote/modules/debug/data/etc/systemd/system/sysinit.target.wants/debug-udevd_logger.service 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 -- cgit v1.2.3-55-g7522 From cef95f6a8356640fca8dd7be6085546402128e23 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 13 Sep 2013 15:50:09 +0200 Subject: [blacklists] pam/gnome: transported include entries to desktop-sessions/gnome --- server/blacklists/pam/gnome | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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-* -- cgit v1.2.3-55-g7522 From 5e205f069339769313aaea7a0f4af77a4b171131 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 13 Sep 2013 15:56:00 +0200 Subject: [blacklists] x-autostart/xdg-autostart: gnome entries transported to gnome --- server/blacklists/x-autostart/xdg-autostart | 3 --- 1 file changed, 3 deletions(-) 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/** - -- cgit v1.2.3-55-g7522 From b67c824476c0e4ad4b622f28249e38c6705df349 Mon Sep 17 00:00:00 2001 From: Christian Rößler Date: Fri, 13 Sep 2013 16:11:14 +0200 Subject: [blacklists] desktop-session/gnome: 'includes' for Gnome --- server/blacklists/desktop-sessions/gnome | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 server/blacklists/desktop-sessions/gnome 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* + + -- cgit v1.2.3-55-g7522