fixes

19 files changed, 14 insertions, 224 deletions

diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/backgrounds/ubuntu.jpg b/remote/tools/ldm-gtk-greeter/data/usr/share/backgrounds/ubuntu.jpg
deleted file mode 100644
index 004b2646..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/backgrounds/ubuntu.jpg
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/GdmGreeterTheme.desktop b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/GdmGreeterTheme.desktop
deleted file mode 100644
index a9234c7f..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/GdmGreeterTheme.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[GdmGreeterTheme]
-Encoding=UTF-8
-Greeter=theme.xml
-Name=Uni KDM theme
-Description=Uni Theme based on Daemonic KDM theme for FreeBSD
-Author=aceph <aceph@ventcore.net> and modified by MJanc
-Copyright=Creative Commons
-Screenshot=screenshot.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/KdmGreeterTheme.desktop b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/KdmGreeterTheme.desktop
deleted file mode 100644
index 36242be4..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/KdmGreeterTheme.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[KdmGreeterTheme]
-Encoding=UTF-8
-Greeter=theme.xml
-Name=Uni KDM theme
-Description=Uni Theme based on Daemonic KDM theme for FreeBSD
-Author=aceph <aceph@ventcore.net> and modified by MJanc
-Copyright=Creative Commons
-Screenshot=screenshot.png
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/color.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/color.png
deleted file mode 100644
index c2e998e5..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/color.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/enter.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/enter.png
deleted file mode 100644
index b646e851..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/enter.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/enter_inactive.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/enter_inactive.png
deleted file mode 100644
index e12cfb8e..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/enter_inactive.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/environment.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/environment.png
deleted file mode 100644
index b9682822..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/environment.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/main-runner.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/main-runner.png
deleted file mode 100644
index 5b3cf656..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/main-runner.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/rz-logo.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/rz-logo.png
deleted file mode 100644
index 08ec2fe8..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/rz-logo.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/sessions.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/sessions.png
deleted file mode 100644
index 00d05f29..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/sessions.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/sessions_inactive.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/sessions_inactive.png
deleted file mode 100644
index 86bbe642..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/sessions_inactive.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/system.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/system.png
deleted file mode 100644
index f7b9e71f..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/system.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/system_inactive.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/system_inactive.png
deleted file mode 100644
index c3e1719b..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/system_inactive.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/theme.xml b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/theme.xml
deleted file mode 100644
index 1ffe1207..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/theme.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE greeter SYSTEM "greeter.dtd">
-<greeter>
-	<!-- main pic, login pic -->
-	<item type="pixmap">
-		<normal file="color.png"/>
-		<pos x="0" y="0" width="100%" height="100%"/>
-		<item type="rect">
-			<normal color="#000000" alpha="0.0"/>
-			<pos anchor="n" x="50%" y="0" width="100%" height="40%"/>
-			
-			<item type="pixmap">
-				<normal file="welcome-time-shadowed.png"/>
-				<pos anchor="n" x="50%" y="0" width="80%" height="44"/>
-				
-				<!-- Welcome on ... -->
-				<item type="label">
-					<pos anchor="w" x="5%" y="33%"/>
-					<normal color="#f0f0f0" font="Sans 12"/>
-					<!-- <stock type="welcome-label"/> -->
-					<text>OpenSLX Workstation (%h)</text>
-				</item>
-				
-				<!-- clock -->
-				<item type="label" id="clock">
-					<normal color="#f0f0f0" font="Sans 12"/>
-					<pos anchor="e" x="95%" y="33%"/>
-					<text>%c</text>
-				</item>
-				
-			</item>
-			
-			<item type="pixmap">
-				<normal file="uni-logo.png"/>
-				<pos anchor="n" x="50%" y="30%" height="50%"/>
-			</item>
-			
-		</item>
-		
-		<item type="pixmap">
-			<normal file="main-runner.png"/>
-			<pos anchor="c" x="50%" y="50%" width="100%" height="160"/>
-			
-			<item type="rect">
-				<normal color="#000000" alpha="0.0"/>
-				<pos anchor="w" x="0" y="50%" width="35%" height="100%"/>
-				
-				<item type="rect">
-					<normal color="#000000" alpha="0.0"/>
-					<pos anchor="w" x="0" y="50%" width="120" height="100%"/>
-					<item type="pixmap">
-						<normal file="rz-logo.png"/>
-						<pos anchor="e" x="100%" y="50%"/>
-					</item>
-				</item>
-				
-				<item type="rect">
-					<normal color="#000000" alpha="0.0"/>
-					<pos anchor="e" x="-140" y="50%" width="100%" height="100%"/>
-					
-					<!-- username-label -->
-					<item type="label">
-						<pos anchor="e" x="-5" y="40%"/>
-						<normal color="#f0f0f0" font="Sans 11"/>
-						<stock type="username-label"/>
-					</item>
-					
-					<!-- password-label -->
-					<item type="label">
-						<pos anchor="e" x="-5" y="60%"/>
-						<normal color="#f0f0f0" font="Sans 11"/>
-						<stock type="password-label"/>
-					</item>
-					
-				</item>
-				
-				<item type="rect">
-					<normal color="#000000" alpha="0.0"/>
-					<pos anchor="e" x="100%" y="50%" width="140" height="100%"/>
-					
-					<!-- username-entry -->
-					<item type="entry" id="user-entry">
-						<pos anchor="w" x="0" y="40%" height="22" width="114"/>
-					</item>
-					
-					<!-- password-entry -->
-					<item type="entry" id="pw-entry">
-						<pos anchor="w" x="0" y="60%" height="22" width="114"/>
-					</item>
-					
-					<item type="pixmap" button="true" id="login_button">
-						<pos anchor="e" x="100%" y="60%" height="22" width="22"/>
-						<normal file="enter_inactive.png"/>
-						<prelight file="enter.png"/>
-					</item>
-					
-				</item>
-				
-			</item>
-			
-			<item type="rect">
-				<normal color="#ff0000" alpha="0.0"/>
-				<pos anchor="c" x="50%" y="50%" width="30%" height="160"/>
-				
-				<!-- capslock-warning -->
-				<item type="pixmap" id="caps-lock-warning">
-					<normal file="error.png"/>
-					<pos anchor="c" x="50%" y="22" width="100%" height="70"/>
-					<item type="rect" id="caps-lock-warning">
-						<normal color="#000000" alpha="0.4"/>
-						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
-						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
-							<item type="label">
-								<normal color="#ff8b00" font="Sans 11"/>
-								<pos x="50%" anchor="n"/>
-								<stock type="caps-lock-warning"/>
-							</item>
-						</box>
-					</item>
-				</item>
-				
-				<item type="pixmap">
-					<normal file="environment.png"/>
-					<pos anchor="c" x="50%" y="50%" width="186" height="100"/>
-				</item>
-				
-				<!-- Login-Error -->
-				<item type="pixmap" id="pam-error">
-					<normal file="error.png"/>
-					<pos anchor="c" x="50%" y="-22" width="100%" height="70"/>
-					<item type="rect">
-						<normal color="#000000" alpha="0.4"/>
-						<pos anchor="c" x="50%" y="50%" width="100%" height="box"/>
-						<box orientation="vertical" xpadding="10" ypadding="5" spacing="0">
-							<item type="label">
-								<normal color="#ff8b00" font="Sans 11"/>
-								<pos anchor="n" x="50%"/>
-								<text>Login failed!</text>
-								<text xml:lang="en">Login failed!</text>
-								<text xml:lang="de">Login fehlgeschlagen!</text>
-							</item>
-						</box>
-					</item>
-				</item>
-				
-			</item>
-			
-			<!-- icons and text on the left -->
-			<item type="rect">
-				<normal color="#000000" alpha="0.0"/>
-				<pos anchor="e" x="100%" y="50%" width="35%" height="100%"/>
-				
-				<!-- session-button -->
-				<item type="rect" id="session_button" button="true">
-					<normal color="#000000" alpha="0.0"/>
-					<pos anchor="se" x="80%" y="50%" width="160" height="50%"/>
-					
-					<item type="pixmap" id="session_button" button="true">
-						<normal file="sessions_inactive.png"/>
-						<prelight file="sessions.png"/>
-						<pos anchor="se" x="94%" y="-8" width="48" height="48"/>
-					</item>
-					
-					<item type="label">
-						<normal color="#bbbbbb" font="Sans 11"/>
-						<prelight color="#f0f0f0" font="Sans 11"/>
-						<active color="#ff8b00" font="Sans 11"/>
-						<pos anchor="e" x="-70" y="-32"/>
-						<text>Session</text>
-						<text xml:lang="en">Session</text>
-						<text xml:lang="de">Sitzung</text>
-					</item>
-					
-				</item>
-				
-				<!-- menu-button -->
-				<item type="rect" id="system_button" button="true">
-					<show modes="console" type="system"/>
-					<normal color="#000000" alpha="0.0"/>
-					<pos anchor="ne" x="80%" y="50%" width="160" height="50%"/>
-					<item type="pixmap" id="system_button" button="true">
-						<normal file="system_inactive.png"/>
-						<prelight file="system.png"/>
-						<pos anchor="ne" x="94%" y="8" width="48" height="48"/>
-					</item>
-					<item type="label">
-						<normal color="#bbbbbb" font="Sans 11"/>
-						<prelight color="#f0f0f0" font="Sans 11"/>
-						<active color="#ff8b00" font="Sans 11"/>
-						<pos anchor="e" x="-70" y="32"/>
-						<text>System Menu</text>
-						<text xml:lang="en">System Menu</text>
-						<text xml:lang="de">System Menü</text>
-					</item>
-				</item>
-				
-			</item>
-			
-		</item>
-        <!--
-        <item type="label">
-            <pos anchor="nw" x="1%" y="97%"/>
-            <normal color="#f0f0f0" font="Sans 14"/>
-            <text>Auf diesem Rechner werden Berechnungen im Hintergrund duchgeführt (Rosetta@home). Bei Problemem kann Neustart erfolgen (3-5 Sek. Power-Button drücken)</text>
-        </item>
-        -->
-	</item>
-</greeter>
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/uni-logo.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/uni-logo.png
deleted file mode 100644
index 45cef30e..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/uni-logo.png
+++ /dev/null
diff --git a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/welcome-time-shadowed.png b/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/welcome-time-shadowed.png
deleted file mode 100644
index 8fd4fa65..00000000
--- a/remote/tools/ldm-gtk-greeter/data/usr/share/themes/uni-legacy/welcome-time-shadowed.png
+++ /dev/null
diff --git a/remote/tools/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service b/remote/tools/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service
new file mode 120000
index 00000000..c7aaa65a
--- /dev/null
+++ b/remote/tools/ldm/data/etc/systemd/system/graphical.target.wants/lightdm.service
@@ -0,0 +1 @@
+../lightdm.service
\ No newline at end of file
diff --git a/remote/tools/ldm/data/etc/systemd/system/lightdm.service b/remote/tools/ldm/data/etc/systemd/system/lightdm.service
new file mode 100644
index 00000000..99911bff
--- /dev/null
+++ b/remote/tools/ldm/data/etc/systemd/system/lightdm.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=LightDM Display Manager
+Requires=dev-tty7.device
+After=dev-tty7.device systemd-user-sessions.service
+
+[Service]
+ExecStart=/sbin/lightdm
+
+[Install]
+WantedBy=graphical.target
diff --git a/remote/tools/ldm/ldm.build b/remote/tools/ldm/ldm.build
index 0b18124f..67b62a3a 100644
--- a/remote/tools/ldm/ldm.build
+++ b/remote/tools/ldm/ldm.build
@@ -49,5 +49,8 @@ post_copy() {
 	[ ! -d ${INIT_DIR}/var/lib/lightdm ] && mkdir -p ${INIT_DIR}/var/lib/lightdm
 	touch ${INIT_DIR}/var/lib/lightdm/.Xauthority
 	chown -R lightdm:lightdm ${INIT_DIR}/var/lib/lightdm/
+	#copyi static data files
+	cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR}
+
 }