Changeset View
Changeset View
Standalone View
Standalone View
x11/ly/files/patch-res_config.ini
--- res/config.ini.orig 2019-06-26 21:11:33 UTC | --- res/config.ini.orig 2020-02-03 07:51:05 UTC | ||||
+++ res/config.ini | +++ res/config.ini | ||||
@@ -1,3 +1,5 @@ | @@ -1,3 +1,5 @@ | ||||
+# This is a FreeBSD-ready patched version of the upstream configuration file. | +# This is a FreeBSD-ready patched version of the upstream configuration file. | ||||
+ | + | ||||
# animation enabled | # animation enabled | ||||
#animate = false | #animate = false | ||||
#animate = true | #animate = true | ||||
@@ -52,12 +54,15 @@ | @@ -52,12 +54,14 @@ | ||||
# cookie generator | # cookie generator | ||||
#mcookie_cmd = /usr/bin/mcookie | #mcookie_cmd = /usr/bin/mcookie | ||||
+# startx uses the same replacement for mcookie. | |||||
+mcookie_cmd = /usr/bin/openssl rand -hex 16 | +mcookie_cmd = /usr/bin/openssl rand -hex 16 | ||||
# event timeout in milliseconds | # event timeout in milliseconds | ||||
#min_refresh_delta = 5 | #min_refresh_delta = 5 | ||||
# default path | # default path | ||||
#path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/env | #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin | ||||
0mp: /usr/local should be %%LOCALBASE%%. | |||||
+path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/usr/bin/env | +path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/usr/bin/env | ||||
# command executed when pressing F2 | # command executed when pressing F2 | ||||
#restart_cmd = /sbin/shutdown -r now | #restart_cmd = /sbin/shutdown -r now | ||||
@@ -67,12 +72,14 @@ | @@ -67,12 +71,14 @@ | ||||
# file in which to save and load the default desktop and login | # file in which to save and load the default desktop and login | ||||
#save_file = /etc/ly/save | #save_file = /etc/ly/save | ||||
+save_file = %%ETCDIR%%/save | +save_file = %%ETCDIR%%/save | ||||
# service name (pam needs this set to login) | # service name (pam needs this set to login) | ||||
#service_name = login | #service_name = login | ||||
# command executed when pressing F1 | # command executed when pressing F1 | ||||
#shutdown_cmd = /sbin/shutdown -a now | #shutdown_cmd = /sbin/shutdown -a now | ||||
+shutdown_cmd = /sbin/shutdown -p now | +shutdown_cmd = /sbin/shutdown -p now | ||||
# terminal reset command (tput is faster) | # terminal reset command (tput is faster) | ||||
#term_reset_cmd = /usr/bin/tput reset | #term_reset_cmd = /usr/bin/tput reset | ||||
@@ -80,20 +87,29 @@ | @@ -80,23 +86,32 @@ | ||||
# tty in use | # tty in use | ||||
#tty = 2 | #tty = 2 | ||||
+# vt in use by X or Wayland | +# vt in use by X or Wayland | ||||
+#vt = 9 | +#vt = 9 | ||||
+ | + | ||||
# wayland setup command | # wayland setup command | ||||
#wayland_cmd = /etc/ly/wsetup.sh | #wayland_cmd = /etc/ly/wsetup.sh | ||||
+wayland_cmd = %%ETCDIR%%/wsetup.sh | +wayland_cmd = %%ETCDIR%%/wsetup.sh | ||||
# add wayland specifier to session names | |||||
#wayland_specifier = false | |||||
# wayland desktop environments | # wayland desktop environments | ||||
#waylandsessions = /usr/share/wayland-sessions | #waylandsessions = /usr/share/wayland-sessions | ||||
+waylandsessions = %%LOCALBASE%%/share/wayland-sessions | +waylandsessions = /usr/local/share/wayland-sessions | ||||
0mpUnsubmitted Done Inline Actions%%LOCALBASE%% 0mp: %%LOCALBASE%% | |||||
# xorg server command | # xorg server command | ||||
#x_cmd = /usr/bin/X | #x_cmd = /usr/bin/X | ||||
+x_cmd = %%LOCALBASE%%/bin/X | +x_cmd = %%LOCALBASE%%/bin/X | ||||
# xorg setup command | # xorg setup command | ||||
#x_cmd_setup = /etc/ly/xsetup.sh | #x_cmd_setup = /etc/ly/xsetup.sh | ||||
+x_cmd_setup = %%ETCDIR%%/xsetup.sh | +x_cmd_setup = %%ETCDIR%%/xsetup.sh | ||||
# xorg xauthority edition tool | # xorg xauthority edition tool | ||||
#xauth_cmd = /usr/bin/xauth | #xauth_cmd = /usr/bin/xauth | ||||
+xauth_cmd = %%LOCALBASE%%/bin/xauth | +xauth_cmd = %%LOCALBASE%%/bin/xauth | ||||
# xorg desktop environments | # xorg desktop environments | ||||
#xsessions = /usr/share/xsessions | #xsessions = /usr/share/xsessions | ||||
+xsessions = %%LOCALBASE%%/share/xsessions | +xsessions = %%LOCALBASE%%/share/xsessions |
/usr/local should be %%LOCALBASE%%.