r41537 - in /desktop/experimental/gdm3/debian: gdm3.postinst gdm3.prerm
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sun Apr 27 08:54:18 UTC 2014
Author: joss
Date: Sun Apr 27 08:54:18 2014
New Revision: 41537
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41537
Log:
Fix the logic for the systemd symlink.
Modified:
desktop/experimental/gdm3/debian/gdm3.postinst
desktop/experimental/gdm3/debian/gdm3.prerm
Modified: desktop/experimental/gdm3/debian/gdm3.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.postinst?rev=41537&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.postinst [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.postinst [utf-8] Sun Apr 27 08:54:18 2014
@@ -39,18 +39,21 @@
fi
fi
+DEFAULT_SERVICE=/etc/systemd/system/display-manager.service
# set default-display-manager systemd service link according to our config
if [ "$1" = configure ] && [ -d /etc/systemd/system/ ]; then
if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
SERVICE=/lib/systemd/system/$(basename $(cat "$DEFAULT_DISPLAY_MANAGER_FILE")).service
- if [ -e "$SERVICE" ]; then
- ln -sf "$SERVICE" /etc/systemd/system/display-manager.service
+ if [ -h "$DEFAULT_SERVICE" ] && [ $(readlink "$DEFAULT_SERVICE") = /dev/null ]; then
+ echo "Display manager service is masked" >&2
+ elif [ -e "$SERVICE" ]; then
+ ln -sf "$SERVICE" "$DEFAULT_SERVICE"
else
echo "WARNING: $SERVICE is the selected default display manager but does not exist" >&2
- rm -f /etc/systemd/system/display-manager.service
+ rm -f "$DEFAULT_SERVICE"
fi
else
- rm -f /etc/systemd/system/display-manager.service
+ rm -f "$DEFAULT_SERVICE"
fi
fi
Modified: desktop/experimental/gdm3/debian/gdm3.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gdm3/debian/gdm3.prerm?rev=41537&op=diff
==============================================================================
--- desktop/experimental/gdm3/debian/gdm3.prerm [utf-8] (original)
+++ desktop/experimental/gdm3/debian/gdm3.prerm [utf-8] Sun Apr 27 08:54:18 2014
@@ -43,19 +43,21 @@
fi
fi
fi
+
+ DEFAULT_SERVICE=/etc/systemd/system/display-manager.service
# set default-display-manager systemd service link according to our config
- if [ -d /etc/systemd/system/ ]; then
- if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
- SERVICE=/lib/systemd/system/$(basename $(cat "$DEFAULT_DISPLAY_MANAGER_FILE")).service
- if [ -e "$SERVICE" ]; then
- ln -sf "$SERVICE" /etc/systemd/system/display-manager.service
- else
- echo "WARNING: $SERVICE is the selected default display manager but does not exist" >&2
- rm -f /etc/systemd/system/display-manager.service
- fi
+ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+ SERVICE=/lib/systemd/system/$(basename $(cat "$DEFAULT_DISPLAY_MANAGER_FILE")).service
+ if [ -h "$DEFAULT_SERVICE" ] && [ $(readlink "$DEFAULT_SERVICE") = /dev/null ]; then
+ echo "Display manager service is masked" >&2
+ elif [ -e "$SERVICE" ]; then
+ ln -sf "$SERVICE" "$DEFAULT_SERVICE"
else
- rm -f /etc/systemd/system/display-manager.service
+ echo "WARNING: $SERVICE is the selected default display manager but does not exist" >&2
+ rm -f "$DEFAULT_SERVICE"
fi
+ else
+ rm -f "$DEFAULT_SERVICE"
fi
fi
More information about the pkg-gnome-commits
mailing list