Splitting out a first bunch of functions out to /live/live/boot/.

grml · Jun 5, 2012 · c48696a · c48696a
1 parent fea4312
commit c48696a
Show file tree

Hide file tree

Showing 14 changed files with 1,487 additions and 1,469 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = bin/* initramfs-tools/hooks/* initramfs-tools/scripts/live initramfs-tools/scripts/live-functions initramfs-tools/scripts/live-helpers initramfs-tools/scripts/*/* scripts/*
+SCRIPTS = bin/* initramfs-tools/hooks/* initramfs-tools/scripts/live initramfs-tools/scripts/live-functions initramfs-tools/scripts/live-helpers initramfs-tools/scripts/*/* scripts/*.sh scripts/*/*
 
 all: build
 
@@ -43,7 +43,7 @@ build:
 install:
 	# Installing scripts
 	mkdir -p $(DESTDIR)/lib/live
-	cp -r scripts/boot.sh $(DESTDIR)/lib/live
+	cp -r scripts/boot.sh scripts/boot $(DESTDIR)/lib/live
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/sbin

diff --git a/initramfs-tools/hooks/live b/initramfs-tools/hooks/live
@@ -52,7 +52,7 @@ fi
 [ "${QUIET}" ] || echo -n " "core
 
 mkdir -p "${DESTDIR}/lib/live"
-cp -a /lib/live/boot.sh "${DESTDIR}/lib/live"
+cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live"
 
 # Configuration
 if [ -e /usr/share/live-boot/languagelist ]