From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Mon, 24 Jun 2013 19:29:10 +0000 (+0200)
Subject: Reorganizing frontend in source tree.
X-Git-Tag: debian/4.0_a14-1~20
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=0aa07bd386f516176364e710e8b9132036c72986;hp=9bb62c8a50e9e92b0e0d637c624d364be6a911ca

Reorganizing frontend in source tree.
---

diff --git a/Makefile b/Makefile
index 16ad560..28709cc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = $(shell cd manpages/po && ls)
 
-SCRIPTS = backend/*/* bin/* scripts/*.sh scripts/*/*-*
+SCRIPTS = backend/*/* frontend/* scripts/*/*-*
 
 all: build
 
@@ -43,7 +43,7 @@ build:
 install:
 	# Installing scripts
 	mkdir -p $(DESTDIR)/lib/live
-	cp -r scripts/boot.sh scripts/boot $(DESTDIR)/lib/live
+	cp scripts/boot/* $(DESTDIR)/lib/live
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks
@@ -51,6 +51,9 @@ install:
 	mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts
 	cp backend/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live
 
+	mkdir -p $(DESTDIR)/bin
+	cp frontend/* $(DESTDIR)/bin
+
 	# Installing docs
 	mkdir -p $(DESTDIR)/usr/share/doc/live-boot
 	cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot
@@ -73,8 +76,9 @@ install:
 
 uninstall:
 	# Uninstalling executables
-	rm -f $(DESTDIR)/sbin/live-swapfile
-	rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin > /dev/null 2>&1 || true
+	rm -f $(DESTDIR)/bin/live-boot
+	rm -f $(DESTDIR)/bin/live-swapfile
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/bin > /dev/null 2>&1 || true
 
 	rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
 	rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/live
diff --git a/backend/dracut/live.script b/backend/dracut/live.script
index 223f355..0774bfb 100755
--- a/backend/dracut/live.script
+++ b/backend/dracut/live.script
@@ -2,7 +2,7 @@
 
 #set -e
 
-. /lib/live/boot.sh
+. /bin/live-boot
 
 DRACUT_FIXME ()
 {
diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook
index 1814211..560dd0f 100755
--- a/backend/initramfs-tools/live.hook
+++ b/backend/initramfs-tools/live.hook
@@ -17,7 +17,7 @@ do
 done
 
 # Checking live-boot
-if [ ! -e /lib/live/boot ]
+if [ ! -e /bin/live-boot ]
 then
 	echo
 	echo "W: live-boot-initramfs-tools (backend) installed without live-boot,"
@@ -27,8 +27,10 @@ fi
 
 [ "${QUIET}" ] || echo -n " core"
 
+mkdir -p "${DESTDIR}/bin"
+cp -a /bin/live-boot /lib/live/boot "${DESTDIR}/bin"
 mkdir -p "${DESTDIR}/lib/live"
-cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live"
+cp -a /lib/live/boot "${DESTDIR}/lib/live"
 
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
diff --git a/backend/initramfs-tools/live.script b/backend/initramfs-tools/live.script
index 9646274..ff2915a 100755
--- a/backend/initramfs-tools/live.script
+++ b/backend/initramfs-tools/live.script
@@ -2,7 +2,7 @@
 
 #set -e
 
-. /lib/live/boot.sh
+. /bin/live-boot
 
 . /scripts/functions
 
diff --git a/scripts/boot.sh b/frontend/live-boot
similarity index 100%
rename from scripts/boot.sh
rename to frontend/live-boot
diff --git a/bin/live-swapfile b/frontend/live-swapfile
similarity index 100%
rename from bin/live-swapfile
rename to frontend/live-swapfile