aboutsummaryrefslogtreecommitdiffstats
path: root/x11/slim/files/patch-slim.conf
blob: c23a5453ea8ae4fec8b66bcfe2ae13dee9617700 (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
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
--- slim.conf.orig  2013-10-01 18:38:05.000000000 -0400
+++ slim.conf   2014-08-28 21:35:07.000000000 -0400
@@ -1,17 +1,20 @@
 # Path, X server and arguments (if needed)
 # Note: -xauth $authfile is automatically appended
-default_path        /bin:/usr/bin:/usr/local/bin
-default_xserver     /usr/bin/X
-#xserver_arguments   -dpi 75
+# Use default path from /etc/login.conf
+default_path        /sbin:/bin:/usr/sbin:/usr/bin:/usr/games:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin
+default_xserver     %%LOCALBASE%%/bin/X
+# The X server needs to be started on an unused virtual terminal,
+# for FreeBSD in a default configuration, the first one of those is #09
+xserver_arguments   -nolisten tcp vt09
 
 # Commands for halt, login, etc.
-halt_cmd            /sbin/shutdown -h now
+halt_cmd            /sbin/shutdown -p now
 reboot_cmd          /sbin/shutdown -r now
-console_cmd         /usr/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/issue; exec /bin/login"
-#suspend_cmd        /usr/sbin/suspend
+console_cmd         %%LOCALBASE%%/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/bin/cat /etc/motd; exec /usr/bin/login"
+suspend_cmd        /usr/sbin/acpiconf -s 3
 
 # Full path to the xauth binary
-xauth_path         /usr/bin/xauth 
+xauth_path         %%LOCALBASE%%/bin/xauth
 
 # Xauth file for server
 authfile           /var/run/slim.auth
@@ -32,8 +35,8 @@
 # NOTE: if your system does not have bash you need
 # to adjust the command according to your preferred shell,
 # i.e. for freebsd use:
-# login_cmd           exec /bin/sh - ~/.xinitrc %session
-login_cmd           exec /bin/bash -login ~/.xinitrc %session
+login_cmd           exec /bin/sh - ~/.xinitrc %session
+#login_cmd           exec /bin/bash -login ~/.xinitrc %session
 
 # Commands executed when starting and exiting a session.
 # They can be used for registering a X11 session with
@@ -47,11 +50,16 @@
 # options "-d" and "-nodaemon"
 # daemon   yes
 
-# Available sessions (first one is the default).
-# The current chosen session name is replaced in the login_cmd
-# above, so your login command can handle different sessions.
-# see the xinitrc.sample file shipped with slim sources
-sessions            xfce4,icewm-session,wmaker,blackbox
+# Option "sessions" is no longer supported.
+# Now you need to put session files in the directory specified
+# by option "sessiondir".
+# sessions            xfce4,icewm-session,wmaker,blackbox
+
+# Directory of session files.
+# They should be xdg-style .desktop files.
+# The "Name" entry in the session file would be used as session name.
+# The "Exec" entry would replace %session in login_cmd.
+sessiondir     %%LOCALBASE%%/share/xsessions
 
 # Executed when pressing F11 (requires imagemagick)
 screenshot_cmd      import -window root /slim.png
@@ -63,7 +71,7 @@
 # session_msg         Session: 
 
 # shutdown / reboot messages
-shutdown_msg       The system is halting...
+shutdown_msg       The system is powering down...
 reboot_msg         The system is rebooting...
 
 # default user, leave blank or remove this line
@@ -84,7 +92,7 @@
 current_theme       default
 
 # Lock file
-lockfile            /var/run/slim.lock
+lockfile            /var/run/slim.pid
 
 # Log file
 logfile             /var/log/slim.log