Moving testroot into lb wrapper itself.

6 files changed, 7 insertions, 44 deletions

diff --git a/frontend/cli/lb b/frontend/cli/lb
index a57577f94..a476640eb 100755
--- a/frontend/cli/lb
+++ b/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)" ]
diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts
index a7359b796..1e411c4c7 100755
--- a/scripts/build/chroot_devpts
+++ b/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
diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc
index 87e968c26..40a7d6fba 100755
--- a/scripts/build/chroot_proc
+++ b/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
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs
index f0a36ce6a..be6d3c8b0 100755
--- a/scripts/build/chroot_selinuxfs
+++ b/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
diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs
index af2e53f26..904d2da79 100755
--- a/scripts/build/chroot_sysfs
+++ b/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
diff --git a/scripts/build/testroot b/scripts/build/testroot
deleted file mode 100755
index 97d87674f..000000000
--- a/scripts/build/testroot
+++ /dev/null
@@ -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