From acc102903574fc44345e3a21ac55748c9c0a5a0c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Jul 2013 18:29:10 +0200
Subject: [kdm] Tweak theme
---
.../usr/share/desktop/themes/kdm/bwlehrpool/theme.xml | 4 ++--
.../share/desktop/themes/kdm/bwlehrpool/top-bar.png | Bin 5028 -> 3363 bytes
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'remote/modules')
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml
index 62277113..5de73ea6 100644
--- a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml
+++ b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml
@@ -15,12 +15,12 @@ KDM-OpenSLX-Theme
- -
+
-
-
-
+
-
diff --git a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/top-bar.png b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/top-bar.png
index fb63c5cc..0c89dbef 100644
Binary files a/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/top-bar.png and b/remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/top-bar.png differ
--
cgit v1.2.3-55-g7522
From 15202934cd4aceb7d8b0d8d60659026820132ef2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Jul 2013 18:55:47 +0200
Subject: [nscd] Move nscd related files from pam module to nscd module
---
.../data/etc/systemd/system/basic.target.wants/nscd.service | 1 +
remote/modules/nscd/data/etc/systemd/system/nscd.service | 11 +++++++++++
.../etc/systemd/system/multi-user.target.wants/nscd.service | 1 -
remote/modules/pam/data/etc/systemd/system/nscd.service | 11 -----------
remote/modules/pam/pam.build | 3 ++-
5 files changed, 14 insertions(+), 13 deletions(-)
create mode 120000 remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service
create mode 100644 remote/modules/nscd/data/etc/systemd/system/nscd.service
delete mode 120000 remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service
delete mode 100644 remote/modules/pam/data/etc/systemd/system/nscd.service
(limited to 'remote/modules')
diff --git a/remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service b/remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service
new file mode 120000
index 00000000..70066631
--- /dev/null
+++ b/remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service
@@ -0,0 +1 @@
+../nscd.service
\ No newline at end of file
diff --git a/remote/modules/nscd/data/etc/systemd/system/nscd.service b/remote/modules/nscd/data/etc/systemd/system/nscd.service
new file mode 100644
index 00000000..262bb534
--- /dev/null
+++ b/remote/modules/nscd/data/etc/systemd/system/nscd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Name Service Cache Daemon
+
+[Service]
+ExecStart=/usr/sbin/nscd -d
+ExecStop=/usr/sbin/nscd --shutdown
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+Also=nscd.socket
diff --git a/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service b/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service
deleted file mode 120000
index 70066631..00000000
--- a/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service
+++ /dev/null
@@ -1 +0,0 @@
-../nscd.service
\ No newline at end of file
diff --git a/remote/modules/pam/data/etc/systemd/system/nscd.service b/remote/modules/pam/data/etc/systemd/system/nscd.service
deleted file mode 100644
index 262bb534..00000000
--- a/remote/modules/pam/data/etc/systemd/system/nscd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon
-
-[Service]
-ExecStart=/usr/sbin/nscd -d
-ExecStop=/usr/sbin/nscd --shutdown
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-Also=nscd.socket
diff --git a/remote/modules/pam/pam.build b/remote/modules/pam/pam.build
index d3c0dd88..607139fa 100644
--- a/remote/modules/pam/pam.build
+++ b/remote/modules/pam/pam.build
@@ -6,7 +6,8 @@ build() {
mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
gcc -o "$MODULE_BUILD_DIR/opt/openslx/bin/sslconnect" "$MODULE_DIR/sslconnect.c" -lssl -lcrypto -O3 || perror "Could not compile sslconnect.c"
local COPYLIST="$MODULE_BUILD_DIR/list_packet_files"
- list_packet_files | sort -u > "$COPYLIST"
+ # TODO: Hack for SUSE: Ignore file (/var/lib/nfs/state) that does not exist :(
+ list_packet_files | grep -v '/var/lib/nfs/state' | sort -u > "$COPYLIST"
tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}"
}
--
cgit v1.2.3-55-g7522
From 7bddc7d724f25ca6cbc38f03b5335ab26e7c0c53 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Jul 2013 19:00:11 +0200
Subject: .
---
remote/modules/nscd/data/etc/systemd/system/nscd.service | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'remote/modules')
diff --git a/remote/modules/nscd/data/etc/systemd/system/nscd.service b/remote/modules/nscd/data/etc/systemd/system/nscd.service
index 262bb534..46b7d2e7 100644
--- a/remote/modules/nscd/data/etc/systemd/system/nscd.service
+++ b/remote/modules/nscd/data/etc/systemd/system/nscd.service
@@ -1,5 +1,8 @@
[Unit]
Description=Name Service Cache Daemon
+DefaultDependencies=no
+After=sysinit.target
+Before=shutdown.target
[Service]
ExecStart=/usr/sbin/nscd -d
@@ -7,5 +10,5 @@ ExecStop=/usr/sbin/nscd --shutdown
Restart=always
[Install]
-WantedBy=multi-user.target
+WantedBy=basic.target
Also=nscd.socket
--
cgit v1.2.3-55-g7522
From 124966a33c9702cf63c72ecf894d32d2988dc3ff Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Jul 2013 19:42:44 +0200
Subject: [debug] Remove non-existent required binary
---
remote/modules/debug/debug.conf | 1 -
1 file changed, 1 deletion(-)
(limited to 'remote/modules')
diff --git a/remote/modules/debug/debug.conf b/remote/modules/debug/debug.conf
index 8728c4bf..3657b991 100644
--- a/remote/modules/debug/debug.conf
+++ b/remote/modules/debug/debug.conf
@@ -15,7 +15,6 @@ REQUIRED_BINARIES="
nano
fc-cache
fc-query
- fonts-config
xset
locale
"
--
cgit v1.2.3-55-g7522
From b14f2408f1e6694fd9e108483aeb6fd60c164a54 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 2 Jul 2013 20:12:58 +0200
Subject: [pam] Restart nscd after patching nsswitch.conf
---
remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'remote/modules')
diff --git a/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service b/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service
index a09b78ae..518681b6 100644
--- a/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service
+++ b/remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service
@@ -2,5 +2,7 @@
Description=Activate NSS-LDAP lookups
[Service]
-Type=simple
+Type=oneshot
ExecStart=/opt/openslx/bin/sed -i -e 's/^passwd.*/passwd:\t\tfiles ldap/g;s/^group.*/group:\t\tfiles ldap/g' /etc/nsswitch.conf
+ExecStart=/usr/bin/systemctl restart nscd
+
--
cgit v1.2.3-55-g7522
From d97bd8d09c9a03ab153e2b14eae8d45d705dc296 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Wed, 3 Jul 2013 14:05:28 +0200
Subject: Branched zypper version for retaining binary (/usr/sbin/)fonts-config
in module debug
---
remote/modules/debug/debug.conf.zypper | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 remote/modules/debug/debug.conf.zypper
(limited to 'remote/modules')
diff --git a/remote/modules/debug/debug.conf.zypper b/remote/modules/debug/debug.conf.zypper
new file mode 100644
index 00000000..8728c4bf
--- /dev/null
+++ b/remote/modules/debug/debug.conf.zypper
@@ -0,0 +1,21 @@
+REQUIRED_INSTALLED_PACKAGES="
+ curl
+ ltrace
+ nano
+ fontconfig
+ fonts-config
+ xset
+"
+REQUIRED_BINARIES="
+ strace
+ ltrace
+ ldd
+ setterm
+ curl
+ nano
+ fc-cache
+ fc-query
+ fonts-config
+ xset
+ locale
+"
--
cgit v1.2.3-55-g7522
From f10fe7307760049a30cacc69d3d7565cec4b6d1b Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Wed, 3 Jul 2013 14:51:40 +0200
Subject: Corrected libpath for openSuse 64bit (pango)
---
remote/modules/openbox/openbox.conf.zypper | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'remote/modules')
diff --git a/remote/modules/openbox/openbox.conf.zypper b/remote/modules/openbox/openbox.conf.zypper
index 63e5e25d..1d0b68c5 100644
--- a/remote/modules/openbox/openbox.conf.zypper
+++ b/remote/modules/openbox/openbox.conf.zypper
@@ -2,4 +2,10 @@ REQUIRED_INSTALLED_PACKAGES=" openbox
libpango-1_0-0"
REQUIRED_CONTENT_PACKAGES=" openbox
libpango-1_0-0"
+REQUIRED_BINARIES=" openbox
+ openbox-session"
+REQUIRED_FILES=" /usr/share/xsessions/openbox.desktop"
+REQUIRED_DIRECTORIES=" /etc
+ /usr/$LIB64
+ /usr/share/themes/Clearlooks"
--
cgit v1.2.3-55-g7522