diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-06-24 21:29:10 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-06-24 21:33:51 +0200 |
| commit | 0aa07bd386f516176364e710e8b9132036c72986 (patch) | |
| tree | 27e39d4b1a7deedad4adb8b6e62cc01e44c58bc5 | |
| parent | 9bb62c8a50e9e92b0e0d637c624d364be6a911ca (diff) | |
| download | live-boot-0aa07bd386f516176364e710e8b9132036c72986.tar.gz live-boot-0aa07bd386f516176364e710e8b9132036c72986.zip | |
Reorganizing frontend in source tree.
| -rw-r--r-- | Makefile | 12 | ||||
| -rwxr-xr-x | backend/dracut/live.script | 2 | ||||
| -rwxr-xr-x | backend/initramfs-tools/live.hook | 6 | ||||
| -rwxr-xr-x | backend/initramfs-tools/live.script | 2 | ||||
| -rwxr-xr-x | frontend/live-boot (renamed from scripts/boot.sh) | 0 | ||||
| -rwxr-xr-x | frontend/live-swapfile (renamed from bin/live-swapfile) | 0 |
6 files changed, 14 insertions, 8 deletions
@@ -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 index 67585f9..67585f9 100755 --- a/scripts/boot.sh +++ b/frontend/live-boot diff --git a/bin/live-swapfile b/frontend/live-swapfile index 745fa87..745fa87 100755 --- a/bin/live-swapfile +++ b/frontend/live-swapfile |