e9ec1693c7
X session finishes, slim goes to restart X, but if the machine is being halted, slim gets a SIGTERM, and the signal handler tries to kill the X server without checking if is has been restarted yet. Boom. While here, fix xauth path.
58 lines
2.3 KiB
Plaintext
58 lines
2.3 KiB
Plaintext
$OpenBSD: patch-slim_conf,v 1.4 2009/11/05 19:05:12 landry Exp $
|
|
--- slim.conf.orig Fri Sep 26 02:54:15 2008
|
|
+++ slim.conf Thu Nov 5 19:02:22 2009
|
|
@@ -1,17 +1,18 @@
|
|
# 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
|
|
+default_path ./:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin
|
|
+default_xserver ${X11BASE}/bin/X
|
|
+xserver_arguments vt05
|
|
|
|
+
|
|
# Commands for halt, login, etc.
|
|
-halt_cmd /sbin/shutdown -h now
|
|
+halt_cmd /sbin/shutdown -ph 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"
|
|
+console_cmd ${X11BASE}/bin/xterm -C -fg white -bg black +sb -T "Console login" -e /bin/sh -c "/usr/bin/head -1 /etc/motd; exec /usr/bin/login"
|
|
#suspend_cmd /usr/sbin/suspend
|
|
|
|
# Full path to the xauth binary
|
|
-xauth_path /usr/bin/xauth
|
|
+xauth_path ${X11BASE}/bin/xauth
|
|
|
|
# Xauth file for server
|
|
authfile /var/run/slim.auth
|
|
@@ -32,8 +33,8 @@ authfile /var/run/slim.auth
|
|
# 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 -l ~/.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
|
|
@@ -54,7 +55,7 @@ login_cmd exec /bin/bash -login ~/.xinitrc %
|
|
sessions xfce4,icewm,wmaker,blackbox
|
|
|
|
# Executed when pressing F11 (requires imagemagick)
|
|
-screenshot_cmd import -window root /slim.png
|
|
+screenshot_cmd import -window root /tmp/slim.png
|
|
|
|
# welcome message. Available variables: %host, %domain
|
|
welcome_msg Welcome to %host
|
|
@@ -84,7 +85,7 @@ reboot_msg The system is rebooting...
|
|
current_theme default
|
|
|
|
# Lock file
|
|
-lockfile /var/run/slim.lock
|
|
+lockfile /var/run/slim.pid
|
|
|
|
# Log file
|
|
logfile /var/log/slim.log
|