diff options
| -rw-r--r-- | iw/mouse_gui.py | 6 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 171 | ||||
| -rw-r--r-- | xf86config.py | 4 |
3 files changed, 92 insertions, 89 deletions
diff --git a/iw/mouse_gui.py b/iw/mouse_gui.py index 500ea75fe..6896bb070 100644 --- a/iw/mouse_gui.py +++ b/iw/mouse_gui.py @@ -87,7 +87,11 @@ class MouseWindow (InstallWindow): cur = self.getCurrentKey() (gpm, xdev, device, emulate) = self.availableMice[cur] - curmouse = xmouse.get() + try: + curmouse = xmouse.get() + except RuntimeError: + # ignore errors when switching mice + return None curmouse[0] = "/dev/" + device # XXX # IntelliMouse requires a full mouse reinit - X does not diff --git a/scripts/upd-instroot b/scripts/upd-instroot index 3fcf28727..4bb7205ea 100755 --- a/scripts/upd-instroot +++ b/scripts/upd-instroot @@ -115,7 +115,8 @@ fi # xpm is missing # Some packages are listed twice, but that's okay -PACKAGESGR="XFree86-libs imlib libpng libtiff libjpeg XFree86-S3 +PACKAGESGR="anaconda + XFree86-libs imlib libpng libtiff libjpeg XFree86-S3 XFree86-S3V XFree86-FBDev XFree86-I128 XFree86-3DLabs XFree86-VGA16 XFree86-75dpi-fonts XFree86-ISO8859-2-75dpi-fonts glib gtk+ @@ -221,63 +222,46 @@ bin/mv bin/ping bin/ps bin/rm +bin/rpm bin/sed bin/sync bin/tar bin/touch bin/umount bin/zcat +etc/gtk/gtkrc* +etc/im_palette.pal +etc/imrc +lib/libnss_dns* +lib/libproc* +lib/libutil* +sbin/depmod sbin/e2fsck sbin/fsck sbin/fsck.ext2 sbin/ifconfig -sbin/modprobe -sbin/depmod -sbin/lsmod sbin/insmod +sbin/lsmod +sbin/modprobe sbin/rmmod sbin/route -lib/libproc* -lib/libutil* -lib/libnss_dns* -bin/rpm -usr/lib/rpm/rpmpopt -etc/im_palette.pal -etc/imrc -usr/lib/libesd* -usr/lib/libaudio* -usr/lib/libImlib* -usr/lib/gdkimlib* -usr/lib/libimlib-pnm* -usr/lib/libimlib-xpm* -usr/lib/libimlib-png* -usr/lib/libncurses* -usr/lib/libpng* -usr/lib/libtiff* -usr/lib/libjpeg* -usr/lib/libzvt* -usr/sbin/gnome-pty-helper -usr/X11R6/lib/libICE* -usr/X11R6/lib/libSM* -usr/X11R6/lib/libX11* -usr/X11R6/lib/libXi* -usr/X11R6/lib/libXext* -usr/X11R6/bin/setxkbmap usr/X11R6/bin/XF86_3DLabs -usr/X11R6/bin/XFree86 -usr/X11R6/bin/XF86_I128 usr/X11R6/bin/XF86_FBDev +usr/X11R6/bin/XF86_I128 usr/X11R6/bin/XF86_Mach32 usr/X11R6/bin/XF86_Mach64 -usr/X11R6/bin/XF86_SVGA usr/X11R6/bin/XF86_S3 usr/X11R6/bin/XF86_S3V -usr/X11R6/bin/XF86_VGA16 +usr/X11R6/bin/XF86_SVGA usr/X11R6/bin/XF86_TGA -usr/X11R6/bin/XsunMono +usr/X11R6/bin/XF86_VGA16 +usr/X11R6/bin/XFree86 usr/X11R6/bin/Xsun usr/X11R6/bin/Xsun24 +usr/X11R6/bin/XsunMono usr/X11R6/bin/Xtest +usr/X11R6/bin/setxkbmap +usr/X11R6/lib/X11/XKeysymDB usr/X11R6/lib/X11/fonts/75dpi/cour* usr/X11R6/lib/X11/fonts/75dpi/fonts* usr/X11R6/lib/X11/fonts/75dpi/helv* @@ -293,58 +277,22 @@ usr/X11R6/lib/X11/fonts/misc/fonts* usr/X11R6/lib/X11/fonts/misc/jis* usr/X11R6/lib/X11/fonts/misc/k14* usr/X11R6/lib/X11/fonts/misc/olcursor* -usr/X11R6/lib/X11/xserver/SecurityPolicy -usr/X11R6/lib/modules/* -usr/share/fonts/ISO8859-2/75dpi/cour* -usr/share/fonts/ISO8859-2/75dpi/fonts* -usr/share/fonts/ISO8859-2/75dpi/helv* -usr/share/fonts/ISO8859-2/75dpi/tim* -usr/share/fonts/ISO8859-2/misc/6x* -usr/share/fonts/ISO8859-2/misc/9x* -usr/share/fonts/ISO8859-2/misc/fonts* -usr/share/fonts/ISO8859-9/75dpi/tr*cour* -usr/share/fonts/ISO8859-9/75dpi/tr*helv* -usr/share/fonts/ISO8859-9/75dpi/tr*tim* -usr/share/fonts/ISO8859-9/75dpi/fonts* -usr/share/fonts/ISO8859-9/misc/tr*6x* -usr/share/fonts/ISO8859-9/misc/tr*9x* -usr/share/fonts/ISO8859-9/misc/fonts* usr/X11R6/lib/X11/locale/* -usr/X11R6/lib/X11/xkb/* usr/X11R6/lib/X11/rgb* -usr/X11R6/lib/X11/XKeysymDB +usr/X11R6/lib/X11/xkb/* +usr/X11R6/lib/X11/xserver/SecurityPolicy +usr/X11R6/lib/libICE* +usr/X11R6/lib/libSM* +usr/X11R6/lib/libX11* +usr/X11R6/lib/libXext* +usr/X11R6/lib/libXi* usr/X11R6/lib/libXpm* -usr/lib/libglib* -usr/lib/libthread* -etc/gtk/gtkrc* -usr/lib/gconv/* -usr/lib/libgtk* -usr/lib/libgdk* -usr/lib/libart* -usr/lib/libgnome* -usr/lib/libgmodule* -usr/lib/libgthread* -usr/lib/libgnomesupport* -usr/lib/libgnomeui* -usr/lib/libgnorba* -usr/lib/libgnorbagtk* -usr/lib/libgtkxmhtml* -usr/lib/libreadline* -usr/share/pixmaps/gnome-default-dlg.png -usr/share/pixmaps/gnome-error.png -usr/share/pixmaps/gnome-info.png -usr/share/pixmaps/gnome-question.png -usr/share/pixmaps/gnome-warning.png -usr/share/pixmaps/no.xpm -usr/share/pixmaps/yes.xpm -usr/share/terminfo/l/linux -usr/share/zoneinfo/zone.tab -usr/share/locale/* +usr/X11R6/lib/modules/* usr/bin/chattr* -usr/bin/lsattr* usr/bin/ftp usr/bin/head usr/bin/less +usr/bin/lsattr* usr/bin/mattrib usr/bin/mbadblocks usr/bin/mcd @@ -358,10 +306,10 @@ usr/bin/minfo usr/bin/mlabel usr/bin/mmd usr/bin/mmount +usr/bin/mmove usr/bin/mpartition usr/bin/mrd usr/bin/mread -usr/bin/mmove usr/bin/mren usr/bin/mshowfat usr/bin/mtools @@ -373,16 +321,67 @@ usr/bin/pico usr/bin/rcp usr/bin/rlogin usr/bin/rsh -usr/bin/tail usr/bin/tac +usr/bin/tail usr/bin/uniq +usr/lib/anaconda/iw +usr/lib/gconv/* +usr/lib/gdkimlib* +usr/lib/libImlib* +usr/lib/libart* +usr/lib/libaudio* +usr/lib/libesd* +usr/lib/libgdk* +usr/lib/libglib* +usr/lib/libgmodule* +usr/lib/libgnome* +usr/lib/libgnomesupport* +usr/lib/libgnomeui* +usr/lib/libgnorba* +usr/lib/libgnorbagtk* +usr/lib/libgthread* +usr/lib/libgtk* +usr/lib/libgtkxmhtml* +usr/lib/libimlib-png* +usr/lib/libimlib-pnm* +usr/lib/libimlib-xpm* +usr/lib/libjpeg* +usr/lib/libncurses* +usr/lib/libpng* +usr/lib/libreadline* +usr/lib/libthread* +usr/lib/libtiff* +usr/lib/libzvt* +usr/lib/rpm/rpmpopt usr/sbin/chroot +usr/sbin/gnome-pty-helper usr/sbin/traceroute -usr/lib/anaconda/iw -usr/share/locale/*/LC_MESSAGES/anaconda.mo usr/share/anaconda/* -usr/share/anaconda/help/*/* -usr/share/anaconda/pixmaps/* +usr/share/fonts/ISO8859-2/75dpi/cour* +usr/share/fonts/ISO8859-2/75dpi/fonts* +usr/share/fonts/ISO8859-2/75dpi/helv* +usr/share/fonts/ISO8859-2/75dpi/tim* +usr/share/fonts/ISO8859-2/misc/6x* +usr/share/fonts/ISO8859-2/misc/9x* +usr/share/fonts/ISO8859-2/misc/fonts* +usr/share/fonts/ISO8859-9/75dpi/fonts* +usr/share/fonts/ISO8859-9/75dpi/tr*cour* +usr/share/fonts/ISO8859-9/75dpi/tr*helv* +usr/share/fonts/ISO8859-9/75dpi/tr*tim* +usr/share/fonts/ISO8859-9/misc/fonts* +usr/share/fonts/ISO8859-9/misc/tr*6x* +usr/share/fonts/ISO8859-9/misc/tr*9x* +usr/share/locale/* +usr/share/locale/*/LC_MESSAGES/anaconda.mo +usr/share/pixmaps/gnome-default-dlg.png +usr/share/pixmaps/gnome-error.png +usr/share/pixmaps/gnome-info.png +usr/share/pixmaps/gnome-question.png +usr/share/pixmaps/gnome-warning.png +usr/share/pixmaps/no.xpm +usr/share/pixmaps/yes.xpm +usr/share/terminfo/l/linux +usr/share/zoneinfo/zone.tab EOF TIMEZONES=" diff --git a/xf86config.py b/xf86config.py index da68eb070..1839cbfd8 100644 --- a/xf86config.py +++ b/xf86config.py @@ -1002,7 +1002,7 @@ Section "Screen" def Version4Config(self): data = { "mouseProto" : self.mouse.info['XMOUSETYPE'], - "mouseDevice" : 'mouse', + "mouseDevice" : self.mouse.device, "cardsOptions" : self.vidCards[self.primary].get ("LINE", " # no known options"), @@ -1010,7 +1010,7 @@ Section "Screen" "cardVendor" : self.vidCards[self.primary]["NAME"], "cardBoardName": self.vidCards[self.primary]["NAME"] } - self.vidCards[self.primary]["DRIVER"] = "vga" +# self.vidCards[self.primary]["DRIVER"] = "vga" if self.vidCards[self.primary].has_key ("DRIVER"): data["cardDriver"] = self.vidCards[self.primary]["DRIVER"] else: |