summaryrefslogtreecommitdiffstats
path: root/initramfs/distro-specs/debian/functions-default
diff options
context:
space:
mode:
Diffstat (limited to 'initramfs/distro-specs/debian/functions-default')
-rw-r--r--initramfs/distro-specs/debian/functions-default27
1 files changed, 12 insertions, 15 deletions
diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index e5454861..4af35da2 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -193,28 +193,25 @@ sed -e "s,LANG=.*,LANG=\"${LANG}\" # set within initramfs," \
# configure gdm as display manager
config_gdm () {
ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
-if [ "x$late_dm" = "xyes" ] ; then
- ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/S01gdm
-else
- echo -e "\t/etc/${D_INITDIR}/gdm start >${LOGFILE} 2>&1\n\
- \t( sleep 120; ln -sf /etc/${D_INITDIR}/gdm /etc/rc3.d/S01gdm \
- >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx
+ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/S01gdm
+# check for gdm user in passwd file and add it if not present
+if ! grep "gdm:" /etc/passwd >/dev/null 2>&1; then
+ echo "gdm:x:113:">>/mnt/etc/group
+ echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" \
+ >>/mnt/etc/passwd
fi
- # check for gdm user in passwd and group files
- # fixme!!
-# echo "gdm:x:113:">>/mnt/etc/group
-# echo "gdm:x:106:113:Gnome Display Manager:/var/lib/gdm:/bin/false" \
-# >>/mnt/etc/passwd
+# fixme: any directory with certain permissions needed?
+# testmkd /mnt/var/lib/gdm/.fontconfig
+# echo -e "\tchown gdm:gdm /var/lib/gdm/.fontconfig\n\t\chown root:gdm \
+#/var/lib/gdm" >> /mnt/etc/${D_INITDIR}/boot.slx
}
# configure kdm as display manager
config_kdm () {
# first define directories for kdm
-kdmrcdir=/etc/kde3/kdm
-xdmdir=/etc/kde3/kdm
-
+local kdmrcdir=/etc/kde3/kdm
+local xdmdir=/etc/kde3/kdm
testmkd /mnt/${kdmrcdir}
-
ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/S20kdm