From 35919637afca7890c183930418f1d0580361f5dc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 4 Nov 2013 13:00:12 +0100 Subject: Moving testroot into lb wrapper itself. --- scripts/build/chroot_devpts | 3 --- scripts/build/chroot_proc | 3 --- scripts/build/chroot_selinuxfs | 3 --- scripts/build/chroot_sysfs | 3 --- scripts/build/testroot | 32 -------------------------------- 5 files changed, 44 deletions(-) delete mode 100755 scripts/build/testroot (limited to 'scripts/build') 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 -## -## 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 -- cgit v1.2.3