diff options
Diffstat (limited to '')
| -rwxr-xr-x | debootstrap | 12 | ||||
| -rw-r--r-- | debootstrap.8 | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/debootstrap b/debootstrap index 1d6ddaa..4658e0f 100755 --- a/debootstrap +++ b/debootstrap @@ -100,7 +100,7 @@ usage() archive --variant=X use variant X of the bootstrap scripts (currently supported variants: buildd, fakechroot, - scratchbox, minbase) + minbase) --merged-usr make /{bin,sbin,lib}/ symlinks to /usr/ --keyring=K check Release files against keyring K --no-check-gpg avoid checking Release file signatures @@ -464,16 +464,6 @@ fi if [ "$TARGET" = "/" ]; then CHROOT_CMD="" -elif doing_variant scratchbox; then - for config in ~/.scratchbox2/*/sb2.config; - do - export `grep ^SBOX_TARGET_ROOT= $config` - if [ "x$SBOX_TARGET_ROOT" = "x$TARGET" ]; then - SB2_TARGET=$(basename $(dirname $config)) - fi - done - [ "x$SB2_TARGET" != "x" ] || error 1 SBOXTARGETREQ "No scratchbox target configured for $TARGET" - CHROOT_CMD="sb2 -eR -t $SB2_TARGET" else CHROOT_CMD="chroot $TARGET" fi diff --git a/debootstrap.8 b/debootstrap.8 index f39709f..e802003 100644 --- a/debootstrap.8 +++ b/debootstrap.8 @@ -71,15 +71,13 @@ or apt, and that it is far better to specify the entire base system than rely on this option. With this option set, this behaviour is disabled. .IP -.IP "\fB\-\-variant=minbase|buildd|fakechroot|scratchbox\fP" +.IP "\fB\-\-variant=minbase|buildd|fakechroot\fP" Name of the bootstrap script variant to use. Currently, the variants supported are minbase, which only includes essential packages and apt; buildd, which installs the build-essential packages into .IR TARGET ; and fakechroot, which installs the packages without root privileges. -Finally there is variant scratchbox, which is for creating targets -for scratchbox usage. The default, with no \fB\-\-variant=X\fP argument, is to create a base Debian installation in .IR TARGET . |