From: Ulrich Dangel <mru@grml.org>
Date: Mon, 5 Dec 2011 22:48:51 +0000 (+0100)
Subject: Install hook instead of specifying modules.d
X-Git-Tag: v3.0_a24-1+grml.1~11
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=016159a394b9dbaf1dc31c1ea7baad8fe37efe12

Install hook instead of specifying modules.d
---

diff --git a/debian/patches/32_add_kms.patch b/debian/patches/32_add_kms.patch
index 0bf162f..ef2f35a 100644
--- a/debian/patches/32_add_kms.patch
+++ b/debian/patches/32_add_kms.patch
@@ -1,17 +1,28 @@
---- a/Makefile
-+++ b/Makefile
-@@ -49,7 +49,7 @@
- 	cp bin/live-preseed bin/live-reconfigure local/languagelist $(DESTDIR)/usr/share/live-boot
- 
- 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools
--	cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
-+	cp -r hooks scripts modules.d $(DESTDIR)/usr/share/initramfs-tools
- 
- 	# Installing docs
- 	mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml
 --- /dev/null
-+++ b/modules.d/kms
-@@ -0,0 +1,3 @@
-+i915
-+nouveau
-+radeon
++++ b/hooks/kms
+@@ -0,0 +1,25 @@
++#!/bin/sh
++# hook for adding kms modules
++
++set -e
++
++# initramfs-tools header
++
++PREREQ=""
++prereqs()
++{
++	echo "${PREREQ}"
++}
++
++case "${1}" in
++	prereqs)
++		prereqs
++		exit 0
++		;;
++esac
++
++. /usr/share/initramfs-tools/hook-functions
++
++for module in i915 radeon nouveau ; do
++	manual_add_modules $module
++done
diff --git a/debian/rules b/debian/rules
index 710e6fa..41a057a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 build:
 	# this is needed because dpatch doesn't do file modes on diffs.
 	chmod a+rx scripts/live-bottom/*
+	chmod a+rx hooks/*
 	# regular build.
 	dh build