Re: [Cooker] Break in x11-server upgrade

Colin Guthrie wrote:
> Colin Guthrie wrote:
>> I'll post a followup in a moment or two once I do the actual upgrade....
>
> OK, post upgrade, I get:

OK, it seems I've gotten half way to the bottom of the problem.

After running the script required it seemed my /usr/X11R6 remained a
symlink to "..//usr/" which means it was /usr.

The x11-server-common script does not check for this error condition,
and then hits the followign code path:

if [ -d /usr/X11R6/lib/X11 ]; then
         mkdir -p /usr/lib64/X11
         rm -f /usr/X11R6/lib/X11/fs # old symlink, already on the
target dir
         mv -f /usr/X11R6/lib/X11/* /usr/lib64/X11/ 2> /dev/null

         rm -rf /usr/X11R6/lib/X11

fi

With the knowledge of the symlink or /usr/X11R6 being to /usr this can
be read as:

if [ -d /usr/lib/X11 ]; then
         mkdir -p /usr/X11
         rm -f /usr/lib/X11/fs # old symlink, already on the target dir
         mv -f /usr/lib/X11/* /usr/lib64/X11/ 2> /dev/null
         rm -rf /usr/lib/X11
fi

Urk! Bad things happen!!!!

This conditional check in the x11-server-common RPM must be updated to
check for the /usr/X11R6 being a symlink case:
if [ -L /etc/X11 ] || [ -L /usr/lib/X11 ]; then
         echo "/etc/X11 or /usr/lib/X11 is a symbolic link. You must run
the"
         echo "script in http://wiki.mandriva.com/en/CookerX11Upgrade 
before"
         echo "continuing."

         exit 1

fi



After a lot of manual tweaks, I now seem to have a fairly stable install:

[root@jimmy ~]# ll /etc/X11 /usr/lib/X11 /usr/X11R6 -ld
drwxr-xr-x 10 root root 4096 2008-06-19 22:58 /etc/X11/
drwxr-xr-x  3 root root 4096 2008-06-20 11:38 /usr/lib/X11/
drwxr-xr-x  3 root root 4096 2008-06-20 11:42 /usr/X11R6/
[root@jimmy ~]# urpmf /usr/lib/X11/| cut -d':' -f1 |sort -u | xargs rpm
-V | grep -vE "^package.*not installed$"
[root@jimmy ~]# urpmf /usr/X11R6| cut -d':' -f1 |sort -u | xargs rpm -V
| grep -vE "^package.*not installed$"
[root@jimmy ~]# urpmf /usr/lib64/X11/| cut -d':' -f1 |sort -u | xargs
rpm -V | grep -vE "^package.*not installed$"
.......T    /usr/lib64/X11/AuErrorDB

[root@jimmy ~]# rpm -qf /usr/lib64/X11/AuErrorDB

lib64nas2-1.9a-1mdv2009.0

[root@jimmy ~]# rpm -q lib{,64}nas2
libnas2-1.9a-1mdv2009.0
lib64nas2-1.9a-1mdv2009.0

I expect the time difference on one of
/usr/lib64/X11/AuErrorDB or /usr/lib/X11/AuErrorDB I have both arch
versions installed and the file has the same md5 sum but the packages
will have different file times. So this is OK.


[root@jimmy ~]# urpmf /etc/X11/| cut -d':' -f1 |sort -u | xargs rpm -V |
grep -vE "^package.*not installed$"

This gives quite a few bad results, but it's not worrying. Most are
expected and some are just hangovers from earlier cockups I'd imagine.
I'll fix these ones up later.


S.5....T  c /etc/bluetooth/hcid.conf

S.5....T  c /etc/bluetooth/rfcomm.conf

.M......  c /etc/rc.d/init.d/bluetooth

.M......  c /etc/rc.d/init.d/dund

.M......  c /etc/rc.d/init.d/hidd

.M......  c /etc/rc.d/init.d/pand

SM5....T  c /etc/sysconfig/compositing-server

SM5....T  c /etc/sysconfig/compositing-wm

S.5....T  c /etc/sysconfig/firstboot

.M.....T    /usr/share/autostart/net_applet.desktop

missing     /etc/X11/fontpath.d/ttf-decoratives:pri=50

missing     /etc/X11/fontpath.d/ttf-dejavu:pri=50

missing     /etc/X11/fontpath.d/ttf-latex:pri=50

missing     /etc/X11/fontpath.d/ttf-liberation:pri=50

missing     /etc/X11/fontpath.d/ttf-west_european:pri=50

S.5....T  c /etc/X11/gdm/custom.conf

.M......    /etc/rc.d/init.d/harddrake

SM5....T  c /etc/sysconfig/harddrake2/kernel

S.5....T  c /etc/sysconfig/harddrake2/previous_hw

SM5....T  c /etc/X11/imwheel/startup.conf

..5....T  c /etc/inittab

S.5....T  c /etc/modules

......G.    /etc/ppp/peers

.M......    /etc/rc.d/init.d/dm

.M......    /etc/rc.d/init.d/functions

.M......    /etc/rc.d/init.d/halt

.M......    /etc/rc.d/init.d/killall

.M......    /etc/rc.d/init.d/mandrake_everytime

.M......    /etc/rc.d/init.d/mandrake_firstime
.M......    /etc/rc.d/init.d/netconsole
.M......    /etc/rc.d/init.d/netfs
.M......    /etc/rc.d/init.d/network
.M......    /etc/rc.d/init.d/network-up
.M......    /etc/rc.d/init.d/partmon
.M......    /etc/rc.d/init.d/single
S.5....T  c /etc/sysctl.conf
....L...    /etc/X11/fontpath.d/java:pri=50
missing     /etc/X11/fontpath.d/lilypond:pri=50
.M.....T    /usr/share/autostart/mandriva-mdvonline.desktop
missing     /etc/X11/dm/Sessions/fvwmi.desktop
missing     /etc/X11/dm/Sessions/mini-fvwmi.desktop
missing     /etc/X11/dm/Sessions/opale.desktop
.M......  c /etc/rc.d/init.d/numlock
missing     /etc/X11/fontpath.d/type1-urw-fonts-adobestd35:pri=50
missing     /etc/X11/fontpath.d/type1-urw-fonts:pri=50
missing     /usr/share/X11/fontpath.d/100dpi:unscaled:pri=30
missing     /usr/share/X11/fontpath.d/75dpi:unscaled:pri=20
missing     /usr/share/X11/fontpath.d/OTF:pri=40
missing     /usr/share/X11/fontpath.d/Speedo:pri=40
missing     /usr/share/X11/fontpath.d/TTF:pri=40
missing     /usr/share/X11/fontpath.d/Type1:pri=40
missing     /usr/share/X11/fontpath.d/cyrillic:pri=40
missing     /usr/share/X11/fontpath.d/misc:unscaled:pri=10
S.5....T    /usr/share/fonts/100dpi/fonts.dir
S.5....T    /usr/share/fonts/100dpi/fonts.scale
S.5....T    /usr/share/fonts/75dpi/fonts.dir
S.5....T    /usr/share/fonts/75dpi/fonts.scale
S.5....T    /usr/share/fonts/OTF/fonts.dir
S.5....T    /usr/share/fonts/OTF/fonts.scale
S.5....T    /usr/share/fonts/Speedo/fonts.dir
S.5....T    /usr/share/fonts/Speedo/fonts.scale
S.5....T    /usr/share/fonts/TTF/fonts.dir
S.5....T    /usr/share/fonts/TTF/fonts.scale
S.5....T    /usr/share/fonts/Type1/fonts.dir
S.5....T    /usr/share/fonts/Type1/fonts.scale
S.5....T    /usr/share/fonts/cyrillic/fonts.dir
S.5....T    /usr/share/fonts/cyrillic/fonts.scale
S.5....T    /usr/share/fonts/misc/fonts.dir
S.5....T    /usr/share/fonts/misc/fonts.scale
missing     /etc/X11/X
.......T  c /etc/X11/app-defaults/XScreenSaver







--

+--------------------------+
|      Colin Guthrie       |
+--------------------------+
| cguthrie(at)mandriva.org |
|  http://colin.guthr.ie/  |
+--------------------------+