live-config [patch]: fails to configure xserver-xorg in Lenny images
Hi,
as I explained on IRC: Lenny's dexconf wants every
xserver-xorg/config/inputdevice/keyboard/* setting to be configured as
soon as one is. Else it aborts and XOrg ends up unconfigured.
The following patch workaround this by reverting to use
dpkg-reconfigure instead of dexconf on Lenny.
Bye,
--
intrigeri <intrigeri@boum.org>
| GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
| OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr-fingerprint.asc
| If you must label the absolute, use it's proper name: Temporary.
>From 129c985f6c352b6475a33b7e94b575688d4db6f1 Mon Sep 17 00:00:00 2001
From: amnesia <amnesia@boum.org>
Date: Tue, 10 Aug 2010 12:09:27 +0200
Subject: [PATCH 2/2] Reverting to use dpkg-reconfigure instead of dexconf on Lenny.
Lenny's dexconf wants every xserver-xorg/config/inputdevice/keyboard/* setting
to be configured as soon as one is. Workaround this by not using it.
---
scripts/config/116-xserver-xorg | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index ff56cfd..8985e6c 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -75,12 +75,16 @@ Configure_xserver_xorg ()
debconf-set-selections < /tmp/debconf.live
rm -f /tmp/debconf.live
- dexconf
-
-# dpkg-reconfigure -f non-interactive -p critical \
-# xserver-xorg 2>&1 \
-# | grep -v "overwriting possibly-customised configuration" \
-# | grep -v "file; backup in /etc/X11/xorg.conf"
+ DEBIAN_MAJOR="$(head -c 1 /etc/debian_version)"
+ if [ "${DEBIAN_MAJOR}" = "5" ]
+ then
+ dpkg-reconfigure -f noninteractive -p critical \
+ xserver-xorg 2>&1 \
+ | grep -v "overwriting possibly-customised configuration" \
+ | grep -v "file; backup in /etc/X11/xorg.conf"
+ else
+ dexconf
+ fi
# Creating state file
touch /var/lib/live/config/xserver-xorg
--
1.7.1
Reply to: