iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix lid close, other improvements
[automated-distro-installer]
/
fai
/
config
/
scripts
/
IANK
/
11-iank
diff --git
a/fai/config/scripts/IANK/11-iank
b/fai/config/scripts/IANK/11-iank
index 1ffb74d575cb0000e6fe836299e1994b296f9ea0..262e5599e439e51ed6235ffa57ed5d996004c0da 100755
(executable)
--- a/
fai/config/scripts/IANK/11-iank
+++ b/
fai/config/scripts/IANK/11-iank
@@
-24,14
+24,16
@@
fi
# -r = recursive
# -i = ignore non-matching class warnings, always exit 0
# -B = no backup files
# -r = recursive
# -i = ignore non-matching class warnings, always exit 0
# -B = no backup files
-fcopy -riB
M
/boot
+fcopy -riB /boot
# this is also done by FAIBASE/10-misc by default (without B)
# this is also done by FAIBASE/10-misc by default (without B)
-fcopy -riBM /usr/local/bin
+fcopy -riB /usr/local/bin
+
+fcopy -riB /etc/apt/logind.conf.d
# this gets done by fai, but just happens too often that
# I add sources due to new distros, whatever.
# this gets done by fai, but just happens too often that
# I add sources due to new distros, whatever.
-fcopy -riB
M
/etc/apt/preferences.d
-fcopy -riB
M
/etc/apt/sources.list.d
+fcopy -riB /etc/apt/preferences.d
+fcopy -riB /etc/apt/sources.list.d
src=$FAI/distro-install-common/shadow
src=$FAI/distro-install-common/shadow
@@
-52,7
+54,7
@@
$FAI/distro-install-common/end
tmpfile1=$(mktemp)
# this can fail if we need an apt update
chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile1 ||:
tmpfile1=$(mktemp)
# this can fail if we need an apt update
chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile1 ||:
-fcopy -riB
M
/etc/apt
+fcopy -riB /etc/apt
tmpfile2=$(mktemp)
chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile2
tmpfile2=$(mktemp)
chroot $FAI_ROOT /usr/bin/apt-cache policy >$tmpfile2
@@
-143,7
+145,9
@@
esac
# xorg stopped load nouveau
# https://www.linuxquestions.org/questions/slackware-14/kernel-modules-conflicting-with-nouveau-driver-4175623867/
# https://nouveau.freedesktop.org/InstallNouveau.html
# xorg stopped load nouveau
# https://www.linuxquestions.org/questions/slackware-14/kernel-modules-conflicting-with-nouveau-driver-4175623867/
# https://nouveau.freedesktop.org/InstallNouveau.html
-if lspci|grep -q 'GeForce GTX 6[0-9][0-9]\]'; then
+# And now in t11, things got worse with a newer card also not loading
+# nouveau when it did in t10.
+if lspci|grep -q 'VGA compatible controller: NVIDIA'; then
mkdir -p $target/etc/X11/xorg.conf.d/
cat >$target/etc/X11/xorg.conf.d/10-nouveau.conf <<'EOF'
Section "Device"
mkdir -p $target/etc/X11/xorg.conf.d/
cat >$target/etc/X11/xorg.conf.d/10-nouveau.conf <<'EOF'
Section "Device"