From: Michael Prokop Date: Mon, 26 Nov 2007 14:11:10 +0000 (+0100) Subject: Add class XORG, add X.org packages to GRML_MEDIUM, added /etc/X11/X symlink check X-Git-Tag: 0.0.11~16^2~2 X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=c194b5178a55f199146d670b86508ce6a92da18a Add class XORG, add X.org packages to GRML_MEDIUM, added /etc/X11/X symlink check --- diff --git a/debian/changelog b/debian/changelog index a307084..f6eff5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +grml-live (0.0.11) unstable; urgency=low + + * Add new class XORG. + * Add X.org packages to GRML_MEDIUM. + * Make sure /etc/X11/X is not a symlink to /bin/true. Check and fix + via /etc/grml/fai/config/scripts/GRMLBASE/32-xorg. + + -- Michael Prokop Mon, 26 Nov 2007 15:07:54 +0100 + grml-live (0.0.10) unstable; urgency=low * Do not enable apt-listbugs if the binary is not available. diff --git a/etc/grml/fai/config/package_config/GRML_MEDIUM b/etc/grml/fai/config/package_config/GRML_MEDIUM index 07cbd07..cf95af3 100644 --- a/etc/grml/fai/config/package_config/GRML_MEDIUM +++ b/etc/grml/fai/config/package_config/GRML_MEDIUM @@ -39,6 +39,7 @@ deborphan dhcp3-client dialog diff +dillo dmidecode dmraid dmsetup @@ -50,11 +51,13 @@ e2fsprogs e3 ed eject +eterm ethtool file file-rc findutils firmware-ipw3945 +fluxbox fnord fuse-utils gawk @@ -66,6 +69,7 @@ grml2usb grml-autoconfig grml-debian-keyring grml-debootstrap +grml-desktop grml-docs grml-etc grml-etc-core @@ -80,6 +84,7 @@ grml-shlib grml-small grml-tips grml-usleep +grml-x grub guessnet gzip @@ -186,15 +191,77 @@ unzoo update-inetd usbutils util-linux +vim vlan vlock -vim wget whiptail wipe wireless-tools wpasupplicant +xcursor-themes +xfonts-100dpi +xfonts-75dpi +xfonts-base xfsprogs +xosd-bin +xserver-xorg +xserver-xorg-core +xserver-xorg-input-aiptek +xserver-xorg-input-all +xserver-xorg-input-elo2300 +xserver-xorg-input-elographics +xserver-xorg-input-evdev +xserver-xorg-input-evtouch +xserver-xorg-input-hyperpen +xserver-xorg-input-joystick +xserver-xorg-input-kbd +xserver-xorg-input-mouse +xserver-xorg-input-penmount +xserver-xorg-input-synaptics +xserver-xorg-input-vmmouse +xserver-xorg-input-void +xserver-xorg-input-wacom +xserver-xorg-video-all +xserver-xorg-video-amd +xserver-xorg-video-apm +xserver-xorg-video-ark +xserver-xorg-video-ati +xserver-xorg-video-chips +xserver-xorg-video-cirrus +xserver-xorg-video-cyrix +xserver-xorg-video-dummy +xserver-xorg-video-fbdev +xserver-xorg-video-glint +xserver-xorg-video-i128 +xserver-xorg-video-i740 +xserver-xorg-video-i810 +xserver-xorg-video-imstt +xserver-xorg-video-intel +xserver-xorg-video-ivtv +xserver-xorg-video-mga +xserver-xorg-video-neomagic +xserver-xorg-video-newport +xserver-xorg-video-nsc +xserver-xorg-video-nv +xserver-xorg-video-rendition +xserver-xorg-video-s3 +xserver-xorg-video-s3virge +xserver-xorg-video-savage +xserver-xorg-video-siliconmotion +xserver-xorg-video-sis +xserver-xorg-video-sisusb +xserver-xorg-video-tdfx +xserver-xorg-video-tga +xserver-xorg-video-trident +xserver-xorg-video-tseng +xserver-xorg-video-v4l +xserver-xorg-video-vesa +xserver-xorg-video-vga +xserver-xorg-video-via +xserver-xorg-video-vmware +xserver-xorg-video-voodoo +xterm zip zsh @@ -204,3 +271,4 @@ linux-image-2.6.23-grml aufs-modules-2.6.23-grml grml-kerneladdons-2.6.23 PACKAGES aptitude AMD64 linux-image-2.6.23-grml64 aufs-modules-2.6.23-grml64 +PACKAGES aptitude diff --git a/etc/grml/fai/config/package_config/XORG b/etc/grml/fai/config/package_config/XORG new file mode 100644 index 0000000..3973d43 --- /dev/null +++ b/etc/grml/fai/config/package_config/XORG @@ -0,0 +1,78 @@ +PACKAGES aptitude + +xfonts-100dpi +xfonts-75dpi +xfonts-base +xserver-xorg +xserver-xorg-core +xserver-xorg-input-aiptek +xserver-xorg-input-all +xserver-xorg-input-elo2300 +xserver-xorg-input-elographics +xserver-xorg-input-evdev +xserver-xorg-input-evtouch +xserver-xorg-input-hyperpen +xserver-xorg-input-joystick +xserver-xorg-input-kbd +xserver-xorg-input-mouse +xserver-xorg-input-penmount +xserver-xorg-input-synaptics +xserver-xorg-input-vmmouse +xserver-xorg-input-void +xserver-xorg-input-wacom +xserver-xorg-video-all +xserver-xorg-video-amd +xserver-xorg-video-apm +xserver-xorg-video-ark +xserver-xorg-video-ati +xserver-xorg-video-chips +xserver-xorg-video-cirrus +xserver-xorg-video-cyrix +xserver-xorg-video-dummy +xserver-xorg-video-fbdev +xserver-xorg-video-glint +xserver-xorg-video-i128 +xserver-xorg-video-i740 +xserver-xorg-video-i810 +xserver-xorg-video-imstt +xserver-xorg-video-intel +xserver-xorg-video-ivtv +xserver-xorg-video-mga +xserver-xorg-video-neomagic +xserver-xorg-video-newport +xserver-xorg-video-nsc +xserver-xorg-video-nv +xserver-xorg-video-rendition +xserver-xorg-video-s3 +xserver-xorg-video-s3virge +xserver-xorg-video-savage +xserver-xorg-video-siliconmotion +xserver-xorg-video-sis +xserver-xorg-video-sisusb +xserver-xorg-video-tdfx +xserver-xorg-video-tga +xserver-xorg-video-trident +xserver-xorg-video-tseng +xserver-xorg-video-v4l +xserver-xorg-video-vesa +xserver-xorg-video-vga +xserver-xorg-video-via +xserver-xorg-video-vmware +xserver-xorg-video-voodoo + +# main desktop +fluxbox +# generate X configuration: +grml-x +# configuration for several window managers: +grml-desktop +# osd_cat: +xosd-bin +# Esetroot: +eterm +# x-terminal: +xterm +# small X browser: +dillo +# smooth cursor themes: +xcursor-themes diff --git a/etc/grml/fai/config/scripts/GRMLBASE/32-xorg b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg index 60d61dc..01597f5 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/32-xorg +++ b/etc/grml/fai/config/scripts/GRMLBASE/32-xorg @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Sun Sep 16 23:17:08 CEST 2007 [mika] +# Latest change: Mon Nov 26 15:10:25 CET 2007 [mika] ################################################################################ set -u @@ -14,5 +14,10 @@ if [ -r "$target/etc/X11/xorg.conf" ] ; then mv -f "$target"/etc/X11/xorg.conf "$target"/etc/X11/xorg.conf.debian fi +if [ "$(readlinke $target/etc/X11/X)" = "/bin/true" ] ; then + echo "Warning: /etc/X11/X is a symlink to /bin/true - fixing for you">&2 + ln -sf /usr/bin/Xorg $target/etc/X11/X +fi + ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3