--- trunk/mlivecdbuild/profiles/alx-0_7_branch/prepare_custom	2014/01/03 07:45:49	2317
+++ trunk/mlivecdbuild/profiles/alx-0_7_branch/prepare_custom	2014/07/03 09:18:13	2661
@@ -8,8 +8,8 @@
 install -m 0644 $(get_profile boot-duration.livecd) ${CDCHROOTDIR}/var/lib/plymouth/boot-duration || die
 
 # install mnt-cdrom mount service, should be provided by alxinstall-ng
-install -m 0644 $(get_profile mnt-cdrom.mount) ${CDCHROOTDIR}/usr/lib/systemd/system/mnt-cdrom.mount || die
-ln -snf ../mnt-cdrom.mount ${CDCHROOTDIR}/usr/lib/systemd/system/local-fs.target.wants/mnt-cdrom.mount || die
+#install -m 0644 $(get_profile mnt-cdrom.mount) ${CDCHROOTDIR}/usr/lib/systemd/system/mnt-cdrom.mount || die
+#ln -snf ../mnt-cdrom.mount ${CDCHROOTDIR}/usr/lib/systemd/system/local-fs.target.wants/mnt-cdrom.mount || die
 
 # disable splash X11 vt change and set splash to be always verbose
 #if [[ -f ${CDCHROOTDIR}/etc/splash/splash.conf ]]
@@ -19,6 +19,22 @@
 #		${CDCHROOTDIR}/etc/splash/splash.conf
 #fi
 
+# setup de keymap and locales
+if [ -f ${CDCHROOTDIR}/etc/vconsole.conf ]
+then
+	cat > ${CDCHROOTDIR}/etc/vconsole.conf || die << EOF
+KEYMAP=de
+KEYMAP_TOGGLE=
+FONT=lat9w-16
+FONT_MAP=8859-1_to_uni
+FONT_UNIMAP=
+EOF
+fi
+if [ -f ${CDCHROOTDIR}/etc/locale.conf ]
+then
+	sed "s:^\(LANG=\).*:\1\"de_DE.utf8\":" ${CDCHROOTDIR}/etc/locale.conf || die
+fi
+
 # stop here if the user don't want to create the install tarball
 [[ ! -z ${SKIP_CREATE_INSTALL_TARBALL} ]] && exit 0