summaryrefslogtreecommitdiffstats
path: root/source/x/x11/post-install/xdm.post-install
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11/post-install/xdm.post-install')
-rw-r--r--source/x/x11/post-install/xdm.post-install35
1 files changed, 23 insertions, 12 deletions
diff --git a/source/x/x11/post-install/xdm.post-install b/source/x/x11/post-install/xdm.post-install
index 83dcf7889..73611b47e 100644
--- a/source/x/x11/post-install/xdm.post-install
+++ b/source/x/x11/post-install/xdm.post-install
@@ -1,19 +1,30 @@
mkdir -p $PKG/etc/X11
-( cd $PKG/usr/lib/X11
- mv xdm $PKG/etc/X11
- ln -sf ../../../etc/X11/xdm .
-)
-mv $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsession.orig
-mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0.orig
+mv $PKG/usr/lib/X11/xdm $PKG/etc/X11
+ln -sf ../../../etc/X11/xdm $PKG/usr/lib/X11/xdm
+
+#( cd $PKG/usr/lib/X11
+# mv xdm $PKG/etc/X11
+# ln -sf ../../../etc/X11/xdm .
+#)
+
+mkdir -p $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION
+mv $PKG/etc/X11/xdm/Xsession $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsession.orig
+mv $PKG/etc/X11/xdm/Xsetup_0 $PKG/usr/doc/xdm-$MODULAR_PACKAGE_VERSION/Xsetup_0.orig
+
cp -a $CWD/post-install/xdm/Xsession $PKG/etc/X11/xdm/Xsession
cp -a $CWD/post-install/xdm/Xsetup_0 $PKG/etc/X11/xdm/Xsetup_0
+
chown root:root $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
-chmod 755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
-( cd $PKG/etc/X11/xdm
- mv xdm-config xdm-config.new
- mv Xservers Xservers.new
- mv Xsession Xsession.new
-)
+chmod 0755 $PKG/etc/X11/xdm/Xsession $PKG/etc/X11/xdm/Xsetup_0
+
+for conffile in \
+ Xaccess Xreset Xresources Xservers Xsession Xsetup_0 Xstartup Xwilling \
+ GiveConsole TakeConsole chooser xdm-config ../app-defaults/Chooser ;
+do
+ mv $PKG/etc/X11/xdm/${conffile} $PKG/etc/X11/xdm/${conffile}.new ;
+done
+
mkdir -p $PKG/var/lib/xdm
chown root:root $PKG/var/lib/xdm
chmod 755 $PKG/var/lib/xdm
+