[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH] fix handling of /etc/X11/X symlink




	Hi

Recent changes to the xserver-xorg.postinst mean that on a fresh install the server symlink points to /bin/true. This patch should remove rest of the checksum/roster cruft, especially from the preinst where the link is created.

This is what I came up with, ok to commit?

diff --git a/debian/xserver-xorg.postinst.in b/debian/xserver-xorg.postinst.in
index b46e186..a604c81 100644
--- a/debian/xserver-xorg.postinst.in
+++ b/debian/xserver-xorg.postinst.in
@@ -1650,13 +1650,11 @@ xresprobeint() {
   db_go
 }

-# register this package as a (potential) handler of the X server symlink and
+# register this package as a (potential) handler of the
 # X.Org X server configuration file
-for ROSTER in "$SERVER_SYMLINK_ROSTER" "$XORGCONFIG_ROSTER"; do
-  if ! fgrep -qsx "$THIS_PACKAGE" "$ROSTER"; then
-    echo "$THIS_PACKAGE" >> "$ROSTER"
-  fi
-done
+if ! fgrep -qsx "$THIS_PACKAGE" "$XORGCONFIG_ROSTER"; then
+  echo "$THIS_PACKAGE" >> "$XORGCONFIG_ROSTER"
+fi

diff --git a/debian/xserver-xorg.preinst.in b/debian/xserver-xorg.preinst.in
index 696537d..89059d3 100644
--- a/debian/xserver-xorg.preinst.in
+++ b/debian/xserver-xorg.preinst.in
@@ -122,14 +122,6 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
   # if performing a fresh install, place config files under management if they
   # do *not* already exist
   if [ "$1" = "install" ]; then
-    # first, create and checksum the X server symlink; only do this if it
-    # both does not exist and is not a symbolic link
-    if ! [ -e "$SERVER_SYMLINK" ] && ! [ -L "$SERVER_SYMLINK" ]; then
-      # set the target to the unconfigured default
-      ln -s "$UNCONFIGURED_LINK_TARGET" "$SERVER_SYMLINK"
-      readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
-    fi
-    # next, xorg.conf
     if ! [ -e "$XORGCONFIG" ]; then



Reply to: