--- trunk/mlivecdbuild/profiles/alx-0_7_branch/prepare_custom	2013/05/15 12:06:33	2119
+++ trunk/mlivecdbuild/profiles/alx-0_7_branch/prepare_custom	2014/07/03 11:07:29	2662
@@ -7,6 +7,10 @@
 install -d ${CDCHROOTDIR}/var/lib/plymouth || die
 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
+
 # disable splash X11 vt change and set splash to be always verbose
 #if [[ -f ${CDCHROOTDIR}/etc/splash/splash.conf ]]
 #then
@@ -15,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 -i "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
 
@@ -42,6 +62,9 @@
 # add user station with empty password
 chroot ${LIVECDROOT}/install-temp adduser -G users -h /home/station -s /bin/bash -D station
 
+# install xinitrc
+echo 'exec startfluxbox' > ${LIVECDROOT}/install-temp/home/station/.xinitrc
+
 # fix hostname and hosts file
 echo "alx-i486" > ${LIVECDROOT}/install-temp/etc/hostname
 echo "127.0.0.1 localhost alx-i486.magellan-linux.de alx-i486" > ${LIVECDROOT}/install-temp/etc/hosts