[SCM] live-boot branch, debian-next, updated. debian/3.0_a28-1-2-ga06ca09

Daniel Baumann daniel at debian.org
Tue Jun 5 12:15:55 UTC 2012


The following commit has been merged in the debian-next branch:
commit a06ca09f284e1a58c9796c626d02642b2cd5bfce
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 5 14:15:54 2012 +0200

    Starting initramfs-tools specific subdirectory within the source-tree.

diff --git a/Makefile b/Makefile
index 1ea0a36..f19ebb3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
+SCRIPTS = bin/* initramfs-tools/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
 
 all: build
 
@@ -48,8 +48,9 @@ install:
 	mkdir -p $(DESTDIR)/usr/share/live-boot
 	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
+	mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks
+	cp initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live
+	cp -r scripts $(DESTDIR)/usr/share/initramfs-tools
 
 	# Installing docs
 	mkdir -p $(DESTDIR)/usr/share/doc/live-boot
diff --git a/hooks/live b/initramfs-tools/live.hook
similarity index 100%
rename from hooks/live
rename to initramfs-tools/live.hook

-- 
live-boot



More information about the debian-live-changes mailing list