summaryrefslogtreecommitdiff
path: root/scripts/build/clean
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-09-07 15:11:20 +0200
committerDaniel Baumann <daniel@debian.org>2010-09-07 15:11:48 +0200
commit493c4488bfb24e9553e79ba84441167d5757a3e1 (patch)
tree25be3b96127e122c9f1448f6155dea6b03293248 /scripts/build/clean
parentec77afa94f35e2acb4da77d027b7040aa0fb7114 (diff)
downloadvyos-live-build-493c4488bfb24e9553e79ba84441167d5757a3e1.tar.gz
vyos-live-build-493c4488bfb24e9553e79ba84441167d5757a3e1.zip
Updating internal variables from lh to lb scheme, should be the last piece to finish the live-helper to live-build rename.
Diffstat (limited to 'scripts/build/clean')
-rwxr-xr-xscripts/build/clean28
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/build/clean b/scripts/build/clean
index 280de865c..f734a50b0 100755
--- a/scripts/build/clean
+++ b/scripts/build/clean
@@ -11,7 +11,7 @@
set -e
# Including common functions
-. "${LH_BASE:-/usr/share/live/build}"/scripts/build.sh
+. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
# Read meta config
if [ "${1}" != "noauto" ] && [ -x auto/clean ]
@@ -68,30 +68,30 @@ do
;;
--cache)
- ${LH_ROOT_COMMAND} rm -rf cache
+ ${LB_ROOT_COMMAND} rm -rf cache
;;
--chroot)
Echo_message "Cleaning chroot"
- ${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/var/lib/dpkg > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/var/lib/dpkg > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/binary.tmp > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} umount -f chroot/dev.tmp/pts > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/binary.tmp > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f chroot/dev.tmp/pts > /dev/null 2>&1 || true
- ${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
+ ${LB_ROOT_COMMAND} rm -rf chroot chroot.tmp
rm -f .stage/chroot*
;;
--binary)
- ${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
+ ${LB_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
rm -rf binary.tmp binary.deb binary.udeb
rm -f binary*.iso
rm -f binary*.img