Merge branch 'master' of ssh://home.acritox.de/data/git/kanotix

2 files changed, 20 insertions, 0 deletions

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
new file mode 100755
index 0000000..d648beb
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/01gfxoverlay
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if [ -e /etc/gfxoverlay ]; then
+  overlay="$(echo /root/live/image/gfxoverlay/$(cat /etc/gfxoverlay).*)"
+  if [ -f "$overlay" ]; then
+    #overlay_dev="$(losetup -f)"
+    #losetup "$overlay_dev" "$overlay"
+    mkdir -p /live/gfxoverlay /root/live/gfxoverlay
+    mount -o loop "$overlay" /live/gfxoverlay
+    mount -o remount,add:1:/live/gfxoverlay /root
+    mount -n -o move /live/gfxoverlay /root/live/gfxoverlay
+  fi
+fi
+
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
new file mode 100755
index 0000000..1312363
--- /dev/null
+++ b/config/chroot_local-includes/usr/share/initramfs-tools/scripts/live-bottom/02blacklist
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -e /etc/modprobe.d/initramfs.conf ]; then
+  cp /etc/modprobe.d/initramfs.conf /root/etc/modprobe.d/initramfs.conf
+fi
+