--- trunk/installer-simple/systemd/installer.service.in	2014/01/08 15:03:16	2506
+++ tags/installer-simple-0_4_91_20160616_1/systemd/installer.service.in	2016/06/16 08:46:14	2953
@@ -1,7 +1,8 @@
 [Unit]
 Description=System Installer
-After=syslog.target network.target mnt-cdrom.mount systemd-user-sessions.service getty@%INSTALLER_TTY% plymouth-quit-wait.service
-ConditionPathExists=/mnt/cdrom/system
+Conflicts=getty@%INSTALLER_TTY%.service
+After=syslog.target network.target systemd-user-sessions.service getty@%INSTALLER_TTY%.service plymouth-quit-wait.service
+ConditionPathExists=%INSTALLER_IMAGEROOT%
 ConditionPathExists=/dev/tty0
 
 [Service]
@@ -21,7 +22,7 @@
 
 # Unset locale for the console getty since the console has problems
 # displaying some internationalized messages.
-Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
+Environment=LANG=%LOCALE% LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
 
 [Install]
 WantedBy=multi-user.target