summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmake_slackware_live.sh2
-rw-r--r--xdm/xdm-config18
2 files changed, 11 insertions, 9 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 1bc297b..61a8ac1 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -773,6 +773,8 @@ mkdir -p ${LIVE_ROOTDIR}/etc/X11/xdm/liveslak-xdm
cp -a ${LIVE_TOOLDIR}/xdm/* ${LIVE_ROOTDIR}/etc/X11/xdm/liveslak-xdm/
# Point xdm to the custom /etc/X11/xdm/liveslak-xdm/xdm-config:
sed -i ${LIVE_ROOTDIR}/etc/rc.d/rc.4 -e 's,bin/xdm -nodaemon,& -config /etc/X11/xdm/liveslak-xdm/xdm-config,'
+# Adapt xdm configuration to target architecture:
+sed -i "s/@LIBDIR@/lib${DIRSUFFIX}/g" ${LIVE_ROOTDIR}/etc/X11/xdm/liveslak-xdm/xdm-config
if [ -f ${LIVE_ROOTDIR}/etc/rc.d/rc.networkmanager ]; then
# Enable NetworkManager if present:
diff --git a/xdm/xdm-config b/xdm/xdm-config
index 5ab90f2..135b211 100644
--- a/xdm/xdm-config
+++ b/xdm/xdm-config
@@ -1,25 +1,25 @@
DisplayManager.authDir: /var/lib/xdm
DisplayManager.errorLogFile: /var/log/xdm.log
DisplayManager.pidFile: /var/run/xdm.pid
-DisplayManager.keyFile: /usr/lib64/X11/xdm/xdm-keys
-DisplayManager.servers: /usr/lib64/X11/xdm/Xservers
-DisplayManager.accessFile: /usr/lib64/X11/xdm/Xaccess
+DisplayManager.keyFile: /usr/@LIBDIR@/X11/xdm/xdm-keys
+DisplayManager.servers: /usr/@LIBDIR@/X11/xdm/Xservers
+DisplayManager.accessFile: /usr/@LIBDIR@/X11/xdm/Xaccess
DisplayManager*resources: /etc/X11/xdm/liveslak-xdm/Xresources
-DisplayManager.willing: su nobody -c /usr/lib64/X11/xdm/Xwilling
+DisplayManager.willing: su nobody -c /usr/@LIBDIR@/X11/xdm/Xwilling
! All displays should use authorization, but we cannot be sure
! X terminals may not be configured that way, so they will require
! individual resource settings.
DisplayManager*authorize: true
!
-DisplayManager*chooser: /usr/lib64/X11/xdm/chooser
-DisplayManager*startup: /usr/lib64/X11/xdm/Xstartup
-DisplayManager*session: /usr/lib64/X11/xdm/Xsession
-DisplayManager*reset: /usr/lib64/X11/xdm/Xreset
+DisplayManager*chooser: /usr/@LIBDIR@/X11/xdm/chooser
+DisplayManager*startup: /usr/@LIBDIR@/X11/xdm/Xstartup
+DisplayManager*session: /usr/@LIBDIR@/X11/xdm/Xsession
+DisplayManager*reset: /usr/@LIBDIR@/X11/xdm/Xreset
DisplayManager*authComplain: true
! The following three resources set up display :0 as the console.
DisplayManager._0.setup: /etc/X11/xdm/liveslak-xdm/Xsetup
DisplayManager._0.startup: /etc/X11/xdm/liveslak-xdm/Xstartup
-DisplayManager._0.reset: /usr/lib64/X11/xdm/TakeConsole
+DisplayManager._0.reset: /usr/@LIBDIR@/X11/xdm/TakeConsole
DisplayManager*loginmoveInterval: 10