3 files changed, 3 insertions, 77 deletions

diff --git a/remote/modules/systemd/data/etc/systemd/system/debug-shell.service b/remote/modules/systemd/data/etc/systemd/system/debug-shell.service
index f702064d..fedd138d 100644
--- a/remote/modules/systemd/data/etc/systemd/system/debug-shell.service
+++ b/remote/modules/systemd/data/etc/systemd/system/debug-shell.service
@@ -12,8 +12,7 @@ DefaultDependencies=no
 IgnoreOnIsolate=yes
 
 [Service]
-Environment=TERM=linux
-EnvironmentPath=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin
+Environment=TERM=linux PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin
 ExecStart=/bin/sh
 Restart=always
 RestartSec=0
diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index 2b116784..b5e8370d 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -2,7 +2,7 @@ VERSION=systemd-197
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
 LIBKMOD_VERSION="kmod-12"
 LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz"
-REQUIRED_DEPENDENCIES="	intltool
+REQUIRED_INSTALLED_PACKAGES="	intltool
 			gperf
 			dbus
 			pkg-config
diff --git a/remote/modules/systemd/systemd.conf.zypper b/remote/modules/systemd/systemd.conf.zypper
index 8fd38a30..de89399e 100644
--- a/remote/modules/systemd/systemd.conf.zypper
+++ b/remote/modules/systemd/systemd.conf.zypper
@@ -1,82 +1,9 @@
 VERSION=systemd-201
 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
-REQUIRED_DEPENDENCIES="	intltool
+REQUIRED_INSTALLED_PACKAGES="	intltool
 			gperf
 			pkg-config
 			libcap-devel
 			libudev-devel
 			dbus-1-devel
 			libxslt-tools"
-REQUIRED_BINARIES="	hostnamectl
-			journalctl
-			localectl
-			loginctl
-			systemctl
-			systemd-analyze
-			systemd-ask-password
-			systemd-cat
-			systemd-cgls
-			systemd-cgtop
-			systemd-coredumpctl
-			systemd-delta
-			systemd-detect-virt
-			systemd-inhibit
-			systemd-machine-id-setup
-			systemd-notify
-			systemd-nspawn
-			systemd-stdio-bridge
-			systemd-tmpfiles
-			systemd-tty-ask-password-agent
-			timedatectl
-			udevadm
-			systemd
-			systemd-ac-power
-			systemd-binfmt
-			systemd-bootchart
-			systemd-cgroups-agent
-			systemd-coredump
-			systemd-fsck
-			systemd-hostnamed
-			systemd-initctl
-			systemd-journald
-			systemd-localed
-			systemd-logind
-			systemd-modules-load
-			systemd-multi-seat-x
-			systemd-quotacheck
-			systemd-random-seed
-			systemd-readahead
-			systemd-remount-fs
-			systemd-reply-password
-			systemd-shutdown
-			systemd-shutdownd
-			systemd-sleep
-			systemd-sysctl
-			systemd-timedated
-			systemd-timestamp
-			systemd-udevd
-			systemd-update-utmp
-			systemd-user-sessions
-			systemd-vconsole-setup
-			systemd-fstab-generator
-			systemd-getty-generator
-			systemd-rc-local-generator
-			systemd-system-update-generator
-			accelerometer
-			ata_id
-			cdrom_id
-			collect
-			keymap
-			mtd_probe
-			scsi_id
-			v4l_id"
-REQUIRED_DIRECTORIES="	/etc
-			/usr/lib
-			/usr/include
-			/usr/share/dbus-1
-			/usr/share/polkit-1
-			/usr/lib/udev/rules.d"
-REQUIRED_FILES="	/usr/bin/systemd-analyze
-			/usr/share/systemd/kbd-model-map
-			/usr/lib/udev/findkeyboards
-			/usr/lib/udev/keyboard-force-release.sh"