From aa7084f1842446a22d29d6ff74a5f0f109710ac3 Mon Sep 17 00:00:00 2001 From: Andreas Loibl Date: Fri, 18 May 2012 00:50:33 +0200 Subject: moved gfxoverlay-code to debian-package gfxoverlay --- .../usr/share/initramfs-tools/hooks/pcidetect | 21 -------- .../initramfs-tools/scripts/init-top/pcidetect | 63 ---------------------- .../scripts/live-bottom/01gfxoverlay | 26 --------- .../scripts/live-bottom/02blacklist | 6 --- .../scripts/live-bottom/03rpmfirmware | 16 ------ config/lists/base | 4 ++ 6 files changed, 4 insertions(+), 132 deletions(-) delete mode 100755 config/chroot_local-includes/usr/share/initramfs-tools/hooks/pcidetect delete mode 100755 config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/pcidetect delete mode 100755 config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/01gfxoverlay delete mode 100755 config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/02blacklist delete mode 100755 config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/03rpmfirmware diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/hooks/pcidetect b/config/chroot_local-includes/usr/share/initramfs-tools/hooks/pcidetect deleted file mode 100755 index aad0ec8..0000000 --- a/config/chroot_local-includes/usr/share/initramfs-tools/hooks/pcidetect +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -. /usr/share/initramfs-tools/hook-functions - -copy_exec /usr/bin/lspci /bin diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/pcidetect b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/pcidetect deleted file mode 100755 index 7d453d3..0000000 --- a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/init-top/pcidetect +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh - -PREREQ="" - -prereqs() -{ - echo "$PREREQ" -} - -case $1 in -# get pre-requisites -prereqs) - prereqs - exit 0 - ;; -esac - -if [ "$gfx" = "auto" -o "$gfx" = "on" ]; then -lspci -n | while read x class card x -do - VENDOR=${card%:*} - DEVICE=${card#*:} - overlay= - case $class in - 0300:) - case $VENDOR in - 1002) - case $DEVICE in - 6700|6701|6702|6703|6704|6705|6706|6707|6708|6709|6718|6719|671c|671d|671f|6720|6721|6722|6723|6724|6725|6726|6727|6728|6729|6738|6739|673e|6740|6741|6742|6743|6744|6745|6746|6747|6748|6749|674a|6750|6751|6758|6759|675b|675d|675f|6760|6761|6762|6763|6764|6765|6766|6767|6768|6770|6772|6778|6779|677b|6780|6784|6798|6799|679a|6820|6821|6824|6825|6827|682d|682f|6830|6831|6838|6839|683b|683d|683f|6840|6841|6842|6843|6849|6850|6858|6859|6880|6888|6889|688a|688c|688d|6890|6898|6899|689b|689c|689d|689e|68a0|68a1|68a8|68a9|68b0|68b1|68b8|68b9|68ba|68be|68bf|68c0|68c1|68c7|68c8|68c9|68d0|68d1|68d8|68d9|68da|68de|68e0|68e1|68e4|68e5|68e8|68e9|68f0|68f1|68f2|68f8|68f9|68fa|68fe|9400|9401|9402|9403|9405|940a|940b|940f|9440|9441|9442|9443|9444|9446|9447|944a|944b|944c|944e|944f|9450|9451|9452|9456|945a|945b|945e|9460|9462|946a|946b|947a|947b|9480|9487|9488|9489|948a|948f|9490|9491|9495|9498|949c|949e|949f|94a0|94a1|94a3|94b1|94b3|94b4|94b5|94c0|94c1|94c3|94c4|94c5|94c6|94c7|94c8|94c9|94cb|94cc|9500|9501|9504|9505|9506|9507|9508|9509|950f|9511|9513|9515|9517|9519|9540|9541|9542|954e|954f|9552|9553|9555|9557|955f|9580|9581|9583|9586|9587|9588|9589|958a|958b|958c|958d|958e|958f|9590|9591|9593|9595|9596|9597|9598|9599|959b|95c0|95c2|95c4|95c5|95c6|95c7|95c9|95cc|95cd|95ce|95cf|9610|9611|9612|9613|9614|9615|9616|9640|9641|9642|9643|9644|9645|9647|9648|9649|964a|964b|964c|964e|964f|9710|9711|9712|9713|9714|9715|9802|9803|9804|9805|9806|9807|9808|9809|9900|9901|9903|9904|990f|9990|9991) - export gfx="fglrx-*"; $0; exit;; - esac - ;; - 10de|12d2) - case $DEVICE in - 0008|0009|0010|0018|0019) continue;; - 0020|0028|0029|002c|002d|00a0|0100|0101|0103|0150|0151|0152|0153) continue;; - 0110|0111|0112|0113|0170|0171|0172|0173|0174|0175|0176|0177|0178|0179|017a|017c|017d|0181|0182|0183|0185|0188|018a|018b|018c|01a0|01f0|0200|0201|0202|0203|0250|0251|0253|0258|0259|025b|0280|0281|0282|0286|0288|0289|028c) - export gfx="nvidia-9*"; $0; exit;; - 00fa|00fb|00fc|00fd|00fe|0301|0302|0308|0309|0311|0312|0314|031a|031b|031c|0320|0321|0322|0323|0324|0325|0326|0327|0328|032a|032b|032c|032d|0330|0331|0332|0333|0334|0338|033f|0341|0342|0343|0344|0347|0348|034c|034e) - export gfx="nvidia-1*"; $0; exit;; - *) - export gfx="nvidia-2*"; $0; exit;; - esac - ;; - esac - ;; - esac -done -fi - -case "$gfx" in -fglrx*) - echo "blacklist radeon" >> /etc/modprobe.d/pcidetect.conf - ;; -nvidia*) - echo "blacklist nouveau" >> /etc/modprobe.d/pcidetect.conf - ;; -*) - gfx= - ;; -esac -[ "$gfx" ] && echo "$gfx" > /etc/gfxoverlay - diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/01gfxoverlay b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/01gfxoverlay deleted file mode 100755 index e78ede8..0000000 --- a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/01gfxoverlay +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -[ ! -f /etc/gfxoverlay ] && exit 0 - -gfx="$(cat /etc/gfxoverlay)" -bit=32 -[ "$(uname -m)" = "x86_64" ] && bit=64 - -mkdir -p /live/gfxoverlay /root/live/gfxoverlay -for overlay in /root/live/image/gfxoverlay/overlay.* /root/live/image/gfxoverlay/$gfx.* /root/live/image/gfxoverlay.* -do - [ ! -e "$overlay" ] && continue - mount -o loop "$overlay" /live/gfxoverlay - for dir in /live/gfxoverlay/overlay$bit-$gfx /live/gfxoverlay/$gfx /live/gfxoverlay - do - if [ -d $dir/lib ]; then - mount -o remount,add:1:$dir /root - mount -n -o move /live/gfxoverlay /root/live/gfxoverlay - echo "$gfx" > /root/live/gfxoverlay.active - exit 0 - fi - done - umount /live/gfxoverlay -done -rmdir /live/gfxoverlay /root/live/gfxoverlay - diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/02blacklist b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/02blacklist deleted file mode 100755 index 1312363..0000000 --- a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/02blacklist +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ -e /etc/modprobe.d/initramfs.conf ]; then - cp /etc/modprobe.d/initramfs.conf /root/etc/modprobe.d/initramfs.conf -fi - diff --git a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/03rpmfirmware b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/03rpmfirmware deleted file mode 100755 index b1ead30..0000000 --- a/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/03rpmfirmware +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -img=/root/live/image/boot.efi.img - -cd /root -if [ -e "$img" ]; then - mkdir -p live/efipart - mount -o loop "$img" live/efipart - for file in live/efipart/*firmware*rpm - do - [ -e "$file" ] && /bin/chroot . rpm2cpio "/$file" | cpio -i - done - umount live/efipart - rmdir live/efipart -fi - diff --git a/config/lists/base b/config/lists/base index 872e4a7..ac130d0 100644 --- a/config/lists/base +++ b/config/lists/base @@ -24,6 +24,10 @@ efibootmgr syslinux #endif +#if KANOTIX_GFXOVERLAYS true +gfxoverlay +#endif + # multimedia sox alsa-oss -- cgit v1.0