Rewrite MBP 16": AMD Radeon statt Nvidia, NetworkManager, Retina-Fix
Erkenntnisse vom MBP 15" Mid 2014 Setup: - GPU ist AMD Radeon R9 M370X (nicht Nvidia!) - Radeon/amdgpu blacklisten statt Nvidia-Module - Kein nomodeset noetig — i915 laeuft ohne - xfce4-display-settings per dpkg-divert deaktivieren (oeffnet sich sonst in Endlosschleife bei fehlender dGPU) - Display-Skalierung 2x / DPI 168 fuer Retina - NetworkManager statt netplan fuer WLAN - systemd-networkd-wait-online deaktivieren (Boot haengt sonst) - INSTALL.md komplett aktualisiert mit neuen Troubleshooting-Eintraegen
This commit is contained in:
parent
4f75cd598c
commit
484a1f0262
2 changed files with 94 additions and 52 deletions
102
setup-base.sh
102
setup-base.sh
|
|
@ -21,7 +21,7 @@ else
|
|||
echo ""
|
||||
echo "Welches MacBook Pro?"
|
||||
echo " 13 = MBP 13\" Late 2013"
|
||||
echo " 16 = MBP 16\" Mid 2014 (Intel + Nvidia)"
|
||||
echo " 16 = MBP 16\" Mid 2014 (Intel + AMD Radeon)"
|
||||
read -rp "Modell [13/16]: " MODEL
|
||||
[[ "$MODEL" != "13" && "$MODEL" != "16" ]] && err "Ungültiges Modell: $MODEL"
|
||||
fi
|
||||
|
|
@ -33,17 +33,17 @@ echo " setup-base.sh für MBP $MODEL\" startet"
|
|||
echo "════════════════════════════════════════════"
|
||||
|
||||
# ── 0. Sleep/Suspend verhindern während Installation ─────────────────────
|
||||
echo -e "\n=== 0/9 Sleep verhindern ==="
|
||||
echo -e "\n=== 0/10 Sleep verhindern ==="
|
||||
systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target 2>/dev/null || true
|
||||
ok "Sleep/Suspend deaktiviert (für Installation)"
|
||||
|
||||
# ── 1. System aktualisieren ──────────────────────────────────────────────
|
||||
echo -e "\n=== 1/9 System aktualisieren ==="
|
||||
echo -e "\n=== 1/10 System aktualisieren ==="
|
||||
apt update && apt upgrade -y
|
||||
ok "System aktuell"
|
||||
|
||||
# ── 2. Pakete installieren ───────────────────────────────────────────────
|
||||
echo -e "\n=== 2/9 Pakete installieren ==="
|
||||
echo -e "\n=== 2/10 Pakete installieren ==="
|
||||
apt install -y \
|
||||
xubuntu-desktop \
|
||||
bcmwl-kernel-source \
|
||||
|
|
@ -71,25 +71,24 @@ ok "Pakete installiert (apt)"
|
|||
|
||||
# FreeCAD via Snap (nicht in Ubuntu 24.04 Repos verfügbar)
|
||||
snap install freecad 2>/dev/null || warn "FreeCAD Snap übersprungen (chroot)"
|
||||
ok "FreeCAD installiert (snap)"
|
||||
|
||||
# ── 3. Nvidia blacklisten (MBP 16") ─────────────────────────────────────
|
||||
# ── 3. GPU-Konfiguration ────────────────────────────────────────────────
|
||||
if [[ "$MODEL" == "16" ]]; then
|
||||
echo -e "\n=== 3/9 Nvidia blacklisten (MBP 16\") ==="
|
||||
cat > /etc/modprobe.d/blacklist-nvidia.conf <<NVEOF
|
||||
blacklist nouveau
|
||||
blacklist nvidia
|
||||
blacklist nvidia_drm
|
||||
blacklist nvidia_modeset
|
||||
NVEOF
|
||||
ok "Nvidia-Module komplett geblockt"
|
||||
echo -e "\n=== 3/10 AMD Radeon blacklisten (MBP 16\") ==="
|
||||
# MBP 15" Mid 2014 hat Intel HD 5200 + AMD Radeon R9 M370X
|
||||
# Radeon verursacht Grafikartefakte — nur Intel-GPU nutzen
|
||||
cat > /etc/modprobe.d/blacklist-radeon.conf <<AMDEOF
|
||||
blacklist radeon
|
||||
blacklist amdgpu
|
||||
AMDEOF
|
||||
ok "AMD Radeon geblockt — nur Intel i915 aktiv"
|
||||
else
|
||||
echo -e "\n=== 3/9 Nvidia (MBP 13\") — übersprungen ==="
|
||||
ok "Kein Nvidia auf MBP 13\""
|
||||
echo -e "\n=== 3/10 GPU (MBP 13\") — keine Änderung ==="
|
||||
ok "MBP 13\" hat nur Intel-GPU"
|
||||
fi
|
||||
|
||||
# ── 4. Brave Browser ─────────────────────────────────────────────────────
|
||||
echo -e "\n=== 4/9 Brave Browser ==="
|
||||
echo -e "\n=== 4/10 Brave Browser ==="
|
||||
curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg \
|
||||
https://brave-keyring.s3.brave.com/brave-browser-archive-keyring.gpg
|
||||
echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=amd64] \
|
||||
|
|
@ -99,7 +98,7 @@ apt update && apt install -y brave-browser
|
|||
ok "Brave installiert"
|
||||
|
||||
# ── 5. Konfigurationsdateien ─────────────────────────────────────────────
|
||||
echo -e "\n=== 5/9 Systemkonfigurationen ==="
|
||||
echo -e "\n=== 5/10 Systemkonfigurationen ==="
|
||||
|
||||
# Tastaturbelegung
|
||||
tee /etc/default/keyboard > /dev/null <<EOF
|
||||
|
|
@ -120,22 +119,17 @@ cp /tmp/mbpfan.conf /etc/mbpfan.conf
|
|||
wget -q -O /usr/local/bin/temp-watch.sh "$SETUP_RAW/temp-watch.sh"
|
||||
chmod +x /usr/local/bin/temp-watch.sh
|
||||
|
||||
# GRUB: nomodeset für MBP 16" (Nvidia/GPU-Probleme verhindern)
|
||||
if [[ "$MODEL" == "16" ]]; then
|
||||
sed -i 's/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="quiet splash nomodeset"/' /etc/default/grub
|
||||
update-grub 2>/dev/null || true
|
||||
ok "GRUB: nomodeset gesetzt (MBP 16\")"
|
||||
fi
|
||||
|
||||
update-initramfs -u
|
||||
ok "Systemkonfigurationen gesetzt"
|
||||
|
||||
# ── 6. XFCE Compositor deaktivieren (MBP 16") ────────────────────────────
|
||||
# ── 6. XFCE-Konfiguration (MBP 16": Compositor aus, Display-Skalierung) ─
|
||||
if [[ "$MODEL" == "16" ]]; then
|
||||
echo -e "\n=== 6/9 XFCE Compositor deaktivieren ==="
|
||||
XFWM4_DIR="/home/rene/.config/xfce4/xfconf/xfce-perchannel-xml"
|
||||
mkdir -p "$XFWM4_DIR"
|
||||
cat > "$XFWM4_DIR/xfwm4.xml" <<XFEOF
|
||||
echo -e "\n=== 6/10 XFCE-Konfiguration (MBP 16\") ==="
|
||||
XFCE_XML_DIR="/home/rene/.config/xfce4/xfconf/xfce-perchannel-xml"
|
||||
mkdir -p "$XFCE_XML_DIR"
|
||||
|
||||
# Compositor deaktivieren (verursacht Probleme ohne GPU-Beschleunigung)
|
||||
cat > "$XFCE_XML_DIR/xfwm4.xml" <<XFEOF
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<channel name="xfwm4" version="1.0">
|
||||
<property name="general" type="empty">
|
||||
|
|
@ -143,14 +137,46 @@ if [[ "$MODEL" == "16" ]]; then
|
|||
</property>
|
||||
</channel>
|
||||
XFEOF
|
||||
|
||||
# Display-Skalierung für Retina (2x, DPI 168)
|
||||
cat > "$XFCE_XML_DIR/xsettings.xml" <<XSEOF
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<channel name="xsettings" version="1.0">
|
||||
<property name="Gdk" type="empty">
|
||||
<property name="WindowScalingFactor" type="int" value="2"/>
|
||||
</property>
|
||||
<property name="Xft" type="empty">
|
||||
<property name="DPI" type="int" value="168"/>
|
||||
</property>
|
||||
</channel>
|
||||
XSEOF
|
||||
|
||||
# xfce4-display-settings deaktivieren (öffnet sich sonst in Endlosschleife)
|
||||
dpkg-divert --local --rename --divert /usr/bin/xfce4-display-settings.real /usr/bin/xfce4-display-settings
|
||||
ln -sf /usr/bin/true /usr/bin/xfce4-display-settings
|
||||
|
||||
chown -R 1000:1000 /home/rene/.config/xfce4
|
||||
ok "XFCE Compositor deaktiviert (MBP 16\")"
|
||||
ok "XFCE: Compositor aus, Retina-Skalierung, Display-Settings deaktiviert"
|
||||
else
|
||||
echo -e "\n=== 6/9 XFCE Compositor — beibehalten (MBP 13\") ==="
|
||||
echo -e "\n=== 6/10 XFCE-Konfiguration — Standard (MBP 13\") ==="
|
||||
fi
|
||||
|
||||
# ── 7. Energieeinstellungen (systemd) ────────────────────────────────────
|
||||
echo -e "\n=== 7/9 Energieeinstellungen ==="
|
||||
# ── 7. Netzwerk: NetworkManager statt netplan ─────────────────────────────
|
||||
echo -e "\n=== 7/10 Netzwerk ==="
|
||||
cat > /etc/netplan/01-network-manager.yaml <<NMEOF
|
||||
network:
|
||||
version: 2
|
||||
renderer: NetworkManager
|
||||
NMEOF
|
||||
# Cloud-init netplan-Config entfernen (blockiert NetworkManager)
|
||||
rm -f /etc/netplan/50-cloud-init.yaml
|
||||
# Boot nicht auf Netzwerk warten lassen
|
||||
systemctl disable systemd-networkd-wait-online.service 2>/dev/null || true
|
||||
systemctl enable NetworkManager-wait-online.service 2>/dev/null || true
|
||||
ok "NetworkManager als Netzwerk-Renderer"
|
||||
|
||||
# ── 8. Energieeinstellungen (systemd) ────────────────────────────────────
|
||||
echo -e "\n=== 8/10 Energieeinstellungen ==="
|
||||
|
||||
tee /etc/systemd/sleep.conf > /dev/null <<EOF
|
||||
[Sleep]
|
||||
|
|
@ -164,15 +190,15 @@ EOF
|
|||
|
||||
ok "Energieeinstellungen gesetzt"
|
||||
|
||||
# ── 8. Lokalisierung ────────────────────────────────────────────────────
|
||||
echo -e "\n=== 8/9 Lokalisierung ==="
|
||||
# ── 9. Lokalisierung ────────────────────────────────────────────────────
|
||||
echo -e "\n=== 9/10 Lokalisierung ==="
|
||||
locale-gen de_DE.UTF-8
|
||||
update-locale LANG=de_DE.UTF-8 LC_ALL=de_DE.UTF-8
|
||||
timedatectl set-timezone Europe/Berlin 2>/dev/null || ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime
|
||||
ok "Lokalisierung: Deutsch / Berlin"
|
||||
|
||||
# ── 9. Services aktivieren ──────────────────────────────────────────────
|
||||
echo -e "\n=== 9/9 Services aktivieren ==="
|
||||
# ── 10. Services aktivieren ──────────────────────────────────────────────
|
||||
echo -e "\n=== 10/10 Services aktivieren ==="
|
||||
systemctl enable mbpfan
|
||||
systemctl enable thermald
|
||||
systemctl enable tlp
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue