Moving testroot into lb wrapper itself.

frontend/cli/lb

@@ -18,6 +18,13 @@ DESCRIPTION="$(Echo 'utility to build live systems')"
 HELP="FIXME"
 USAGE="FIXME"
 
+# Checking user account
+if [ "$(id -u)" -ne "0" ]
+then
+       Echo_error "need root privileges"
+       exit 1
+fi
+
 case "${1}" in
 	-h|--help)
 		if [ -x "$(which man 2>/dev/null)" ]

scripts/build/chroot_devpts

@@ -20,9 +20,6 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 
 Arguments "${@}"
 
-# Ensure that a system is built as root
-lb testroot
-
 # Reading configuration files
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults

scripts/build/chroot_proc

@@ -20,9 +20,6 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 
 Arguments "${@}"
 
-# Ensure that a system is built as root
-lb testroot
-
 # Reading configuration files
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults

scripts/build/chroot_selinuxfs

@@ -20,9 +20,6 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 
 Arguments "${@}"
 
-# Ensure that a system is built as root
-lb testroot
-
 # Reading configuration files
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults

scripts/build/chroot_sysfs

@@ -20,9 +20,6 @@ USAGE="${PROGRAM} {install|remove} [--force]"
 
 Arguments "${@}"
 
-# Ensure that a system is built as root
-lb testroot
-
 # Reading configuration files
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults

scripts/build/testroot

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'ensure that a system is built as root')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Checking user account
-if [ "$(id -u)" -ne "0" ]
-then
-	Echo_error "need root privileges"
-	exit 1
-fi