diff options
Diffstat (limited to 'remote/modules')
| -rw-r--r-- | remote/modules/debug/debug.conf | 1 | ||||
| -rw-r--r-- | remote/modules/debug/debug.conf.zypper | 21 | ||||
| -rw-r--r-- | remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/theme.xml | 4 | ||||
| -rw-r--r-- | remote/modules/kdm/data/usr/share/desktop/themes/kdm/bwlehrpool/top-bar.png | bin | 5028 -> 3363 bytes | |||
| l--------- | remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service (renamed from remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service) | 0 | ||||
| -rw-r--r-- | remote/modules/nscd/data/etc/systemd/system/nscd.service (renamed from remote/modules/pam/data/etc/systemd/system/nscd.service) | 5 | ||||
| -rw-r--r-- | remote/modules/openbox/openbox.conf.zypper | 6 | ||||
| -rw-r--r-- | remote/modules/pam/data/etc/systemd/system/activate-nss-ldap.service | 4 | ||||
| -rw-r--r-- | remote/modules/pam/pam.build | 3 |
9 files changed, 38 insertions, 6 deletions
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 " 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 +" 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 <normal color="#000000" alpha="0.0"/> <pos anchor="n" x="50%" y="0" width="100%" height="45%"/> <box orientation="vertical" homogeneous="true"> - <item type="pixmap" background="true"> + <item type="pixmap"> <normal file="top-bar.png"/> <pos anchor="n" x="50%" y="0" width="80%" height="50"/> <box orientation="horizontal" homogeneous="true"> <!-- Welcome on ... --> - <item type="label" background="true"> + <item type="label"> <pos anchor="w" x="12%" y="11"/> <normal color="#f0f0f0" font="Sans 11"/> <stock type="welcome-label"/> 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 Binary files differindex fb63c5cc..0c89dbef 100644 --- 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 diff --git a/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service b/remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service index 70066631..70066631 120000 --- a/remote/modules/pam/data/etc/systemd/system/multi-user.target.wants/nscd.service +++ b/remote/modules/nscd/data/etc/systemd/system/basic.target.wants/nscd.service diff --git a/remote/modules/pam/data/etc/systemd/system/nscd.service b/remote/modules/nscd/data/etc/systemd/system/nscd.service index 262bb534..46b7d2e7 100644 --- a/remote/modules/pam/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 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" 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 + 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}" } |
