--- trunk/installer-simple/Makefile	2014/04/02 11:23:56	2640
+++ trunk/installer-simple/Makefile	2014/07/03 08:01:05	2653
@@ -15,7 +15,8 @@
 VERSION = $(shell $(CAT) VERSION)
 SYSTEMDUNITDIR = $(shell $(PKGCONFIG) --variable=systemdsystemunitdir systemd)
 INSTALLER_TTY = tty1
-INSTALLER_IMAGEROOT = /run/initramfs/live/system
+INSTALLER_LIVEROOT = /run/initramfs/live
+INSTALLER_IMAGEROOT = $(INSTALLER_LIVEROOT)/system
 INSTALLER_INSTALLROOT = /mnt/magellan
 LOCALE =
 
@@ -28,9 +29,12 @@
 	$(SED) -e 's:%INSTALLER_TTY%:$(INSTALLER_TTY):g' \
 		-e 's:%BINDIR%:$(BINDIR):g' \
 		-e 's:%LOCALE%:$(LOCALE):g' \
+		-e 's:%INSTALLER_LIVEROOT%:$(INSTALLER_LIVEROOT):g' \
+		-e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \
 		systemd/installer.service.in \
 		> systemd/installer.service
-	$(SED) -e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \
+	$(SED) -e 's:%INSTALLER_LIVEROOT%:$(INSTALLER_LIVEROOT):g' \
+		-e 's:%INSTALLER_INSTALLROOT%:$(INSTALLER_INSTALLROOT):g' \
 		-e 's:%INSTALLER_IMAGEROOT%:$(INSTALLER_IMAGEROOT):g' \
 		conf/installer.conf.in \
 		> conf/installer.conf
@@ -58,8 +62,6 @@
 	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)
 	$(INSTALL) -m 0644 systemd/installer.service $(DESTDIR)/$(SYSTEMDUNITDIR)
 	$(INSTALL) -d $(DESTDIR)/$(SYSTEMDUNITDIR)/local-fs.target.wants
-	$(INSTALL) -m 0644 systemd/mnt-cdrom.mount $(DESTDIR)/$(SYSTEMDUNITDIR)
-	$(LN_S) ../mnt-cdrom.mount $(DESTDIR)/$(SYSTEMDUNITDIR)/local-fs.target.wants/mnt-cdrom.mount
 
 install: create-dirs install-files install-systemd install-mo