config tweaks

13 files changed, 25 insertions, 29 deletions

diff --git a/edid/1024x768.bin b/edid/1024x768.bin
new file mode 100644
index 0000000..bae478c
--- /dev/null
+++ b/edid/1024x768.bin
diff --git a/edid/1280x1024.bin b/edid/1280x1024.bin
new file mode 100644
index 0000000..b4d1634
--- /dev/null
+++ b/edid/1280x1024.bin
diff --git a/edid/1280x720.bin b/edid/1280x720.bin
new file mode 100644
index 0000000..1c12f58
--- /dev/null
+++ b/edid/1280x720.bin
diff --git a/edid/1600x1200.bin b/edid/1600x1200.bin
new file mode 100644
index 0000000..f2048c8
--- /dev/null
+++ b/edid/1600x1200.bin
diff --git a/edid/1680x1050.bin b/edid/1680x1050.bin
new file mode 100644
index 0000000..3b2a3b0
--- /dev/null
+++ b/edid/1680x1050.bin
diff --git a/edid/1920x1080.bin b/edid/1920x1080.bin
new file mode 100644
index 0000000..e90256c
--- /dev/null
+++ b/edid/1920x1080.bin
diff --git a/edid/2560x1440.bin b/edid/2560x1440.bin
new file mode 100644
index 0000000..984385d
--- /dev/null
+++ b/edid/2560x1440.bin
diff --git a/edid/2880x1800.bin b/edid/2880x1800.bin
new file mode 100644
index 0000000..58b13d9
--- /dev/null
+++ b/edid/2880x1800.bin
diff --git a/edid/3840x2160.bin b/edid/3840x2160.bin
new file mode 100644
index 0000000..ef63be7
--- /dev/null
+++ b/edid/3840x2160.bin
diff --git a/edid/800x600.bin b/edid/800x600.bin
new file mode 100644
index 0000000..a344ac1
--- /dev/null
+++ b/edid/800x600.bin
diff --git a/scripts/config-blacklist-module.sh b/scripts/config-blacklist-module.sh
new file mode 100755
index 0000000..e490a83
--- /dev/null
+++ b/scripts/config-blacklist-module.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+image="$1"
+module="$2"
+
+if test "$image" = ""; then
+	echo "usage: $0 <image> <module>"
+	exit 1
+fi
+
+set -ex
+virt-customize -a "$image" --no-network \
+	--edit "/boot/extlinux/extlinux.conf:s/append/append rd.driver.blacklist=${module}/" \
+	--write "/etc/modprobe.d/blacklist-${module}.conf:blacklist ${module}"
diff --git a/scripts/config-edid-fixup.sh b/scripts/config-edid-fixup.sh
index 5bd725c..9b80559 100755
--- a/scripts/config-edid-fixup.sh
+++ b/scripts/config-edid-fixup.sh
@@ -1,26 +1,18 @@
 #!/bin/sh
+
 image="$1"
+edid="${2-1920x1080.bin}"
+
 if test "$image" = ""; then
-	echo "usage: $0 <image>"
+	echo "usage: $0 <image> [ <edid> ]"
 	exit 1
 fi
 
 base="$(dirname $0)"
-edid="ACER-G226HQL-fixed.edid"
 file="${base}/../edid/$edid"
 
-WORK="${TMPDIR-/tmp}/${0##*/}-$$"
-mkdir "$WORK" || exit 1
-trap 'rm -rf "$WORK"' EXIT
-
-cat <<EOF > "$WORK/script"
-
-mkdir	/lib/firmware/edid
-copy-in	$file /lib/firmware/edid
-
-command "sed -i 's|append|append drm_kms_helper.edid_firmware=edid/$file| /boot/extlinux/extlinux.conf"
-
-EOF
-
 set -ex
-virt-customize -a "$image" --no-network --commands-from-file "$WORK/script"
+virt-customize -a "$image" --no-network		\
+	--mkdir "/lib/firmware/edid"		\
+	--copy-in "$file:/lib/firmware/edid"	\
+	--write "/etc/modprobe.d/edid-fixup.conf:options drm_kms_helper edid_firmware=edid/$edid"
diff --git a/scripts/config-no-initial-setup.sh b/scripts/config-no-initial-setup.sh
index f65e4d3..33dce21 100755
--- a/scripts/config-no-initial-setup.sh
+++ b/scripts/config-no-initial-setup.sh
@@ -5,17 +5,7 @@ if test "$image" = ""; then
 	exit 1
 fi
 
-WORK="${TMPDIR-/tmp}/${0##*/}-$$"
-mkdir "$WORK" || exit 1
-trap 'rm -rf "$WORK"' EXIT
-
-cat <<EOF > "$WORK/script"
-
-# turn off initial-setup
-delete /etc/systemd/system/multi-user.target.wants/initial-setup.service
-delete /etc/systemd/system/graphical.target.wants/initial-setup.service
-
-EOF
-
 set -ex
-virt-customize -a "$image" --no-network --commands-from-file "$WORK/script"
+virt-customize -a "$image" --no-network \
+	--delete /etc/systemd/system/multi-user.target.wants/initial-setup.service \
+	--delete /etc/systemd/system/graphical.target.wants/initial-setup.service