summaryrefslogtreecommitdiff
path: root/x11/kdebase4-workspace/files/patch-kdm::kfrontend::genkdmconf.c
blob: d520f23414ba7536ea59497433fb9dbc7b22f13c (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
--- kdm/kfrontend/genkdmconf.c.orig	Mon Nov  5 21:40:03 2001
+++ kdm/kfrontend/genkdmconf.c	Sat Jan  5 23:49:40 2002
@@ -212,7 +212,7 @@
  */
 
 #ifndef HALT_CMD
-# ifdef BSD
+# if defined(BSD) || defined(__FreeBSD__)
 #  define HALT_CMD	"/sbin/shutdown -h now"
 #  define REBOOT_CMD	"/sbin/shutdown -r now"
 # elif defined(__SVR4)
@@ -1605,8 +1605,8 @@
 "chown $USER /dev/console\n"
 #endif
 "\n"
-"#exec sessreg -a -l $DISPLAY "
-#ifdef BSD
+"exec sessreg -a -l $DISPLAY "
+#if defined(BSD) || defined(__FreeBSD__)
 "-x " KDMCONF "/Xservers "
 #endif
 "$USER\n"
@@ -1627,8 +1627,8 @@
 "chmod 622 /dev/console\n"
 #endif
 "\n"
-"#exec sessreg -d -l $DISPLAY "
-#ifdef BSD
+"exec sessreg -d -l $DISPLAY "
+#if defined(BSD) || defined(__FreeBSD__)
 "-x " KDMCONF "/Xservers "
 #endif
 "$USER\n"
@@ -1781,7 +1781,7 @@
     }
     addKdePath ("UserPath", DEF_USER_PATH);
     addKdePath ("SystemPath", DEF_SYSTEM_PATH);
-    ASPrintf (&newkdmrc, "%s/kdmrc", newdir);
+    ASPrintf (&newkdmrc, "%s/kdmrc.dist", newdir);
     f = Create (newkdmrc, kdmrcmode);
     wrconf (f);
     fclose (f);