Hi Andreas, hi Mike, On Sun, Jan 05, 2020 at 12:41:32AM +0100, Andreas Beckmann wrote: > Are you trying to use dpkg-divert on conffiles? That does not work ... [..] > PS: If you tell me what exactly you want to achieve, I might think about it ... ;-) The vanilla lightdm.conf file should be replaced with a custom one inside the thin client chroot. I figure that this can be done by shipping a file, say lightdm.conf.tce, and then do some tweaking. In a git copy I did: 'minidesktop/etc/lightdm.conf minidesktop/etc/lightdm.conf.tce' Then I changed some files like this: diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install index 27b6033..37a2900 100644 --- a/debian/x2gothinclient-minidesktop.install +++ b/debian/x2gothinclient-minidesktop.install @@ -1,7 +1,7 @@ management/share/etc/x2gothinclient-minidesktop_start etc/x2go/ management/share/etc/x2gothinclient-minidesktop_background.svg usr/share/backgrounds/x2go/ management/share/etc/x2gothinclient_init.d/95* etc/x2go/x2gothinclient_init.d/ -minidesktop/etc/lightdm.conf etc/lightdm/ +minidesktop/etc/lightdm.conf.tce etc/lightdm/ minidesktop/etc/restart.lightdm etc/lightdm/ minidesktop/desktop/x2gothinclient-*.desktop usr/share/applications/ minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/ diff --git a/debian/x2gothinclient-minidesktop.postinst b/debian/x2gothinclient-minidesktop.postinst index b446610..172747c 100755 --- a/debian/x2gothinclient-minidesktop.postinst +++ b/debian/x2gothinclient-minidesktop.postinst @@ -26,6 +26,10 @@ case "$1" in desktop-background \ /usr/share/backgrounds/x2go/x2gothinclient-minidesktop_background.svg 72 + if [ -f /etc/lightdm/lightdm.conf ]; then + mv /etc/lightdm/lightdm.conf /etc/lightdm/lightdm.conf.disabled-by-x2gotce + fi + cp /etc/lightdm/lightdm.conf.tce /etc/lightdm/lightdm.conf ;; abort-upgrade|abort-remove|abort-deconfigure) ;; diff --git a/debian/x2gothinclient-minidesktop.postrm b/debian/x2gothinclient-minidesktop.postrm index 02ccc76..4be986b 100755 --- a/debian/x2gothinclient-minidesktop.postrm +++ b/debian/x2gothinclient-minidesktop.postrm @@ -24,8 +24,9 @@ case "$1" in if dpkg-divert --list | grep usr/lib/x2go/x2goclient 1>/dev/null 2>/dev/null; then dpkg-divert --package x2gothinclient-minidesktop --rename --remove /usr/bin/x2goclient fi - if dpkg-divert --list | grep lightdm.conf.disabled-by-x2gotce 1>/dev/null 2>/dev/null; then - dpkg-divert --package x2gothinclient-minidesktop --rename --remove /etc/lightdm/lightdm.conf + if [ -f /etc/lightdm/lightdm.conf.disabled-by-x2gotce ]; then + rm /etc/lightdm/lightdm.conf + mv /etc/lightdm/lightdm.conf.disabled-by-x2gotce /etc/lightdm/lightdm.conf fi ;; upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) diff --git a/debian/x2gothinclient-minidesktop.preinst b/debian/x2gothinclient-minidesktop.preinst index 5bfb315..b7c6f26 100755 --- a/debian/x2gothinclient-minidesktop.preinst +++ b/debian/x2gothinclient-minidesktop.preinst @@ -26,9 +26,6 @@ case "$1" in if ! dpkg-divert --list | grep usr/lib/x2go/x2goclient 1>/dev/null 2>/dev/null; then dpkg-divert --add --rename --package x2gothinclient-minidesktop --divert /usr/lib/x2go/x2goclient /usr/bin/x2goclient fi - if ! dpkg-divert --list | grep lightdm.conf.disabled-by-x2gotce 1>/dev/null 2>/dev/null; then - dpkg-divert --add --rename --package x2gothinclient-minidesktop --divert /etc/lightdm/lightdm.conf.disabled-by-x2gotce /etc/lightdm/lightdm.conf - fi ;; abort-upgrade) ;; diff --git a/debian/x2gothinclient-minidesktop.prerm b/debian/x2gothinclient-minidesktop.prerm index 0f7c483..07d975a 100755 --- a/debian/x2gothinclient-minidesktop.prerm +++ b/debian/x2gothinclient-minidesktop.prerm @@ -29,7 +29,10 @@ fi case "$1" in remove) - : + if [ -f /etc/lightdm/lightdm.conf.disabled-by-x2gotce ]; then + rm /etc/lightdm/lightdm.conf + mv /etc/lightdm/lightdm.conf.disabled-by-x2gotce /etc/lightdm/lightdm.conf + fi ;; deconfigure|upgrade|failed-upgrade) : The x2gothinclient-minidesktop package built with these changes seems to work ok, but maybe I have missed some tests; please check. Wolfgang
Attachment:
signature.asc
Description: PGP signature