# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1421353622 -3600
# Node ID 6e63e2716ee2e64d319ec57b59fa027233330c85
# Parent  4f1585450740d641950c1f4d56ad0621d50808be
Insist on explicit mirrors for multistrapped systems.

diff -r 4f1585450740 -r 6e63e2716ee2 user-setup
--- a/user-setup	Thu Jan 15 21:26:32 2015 +0100
+++ b/user-setup	Thu Jan 15 21:27:02 2015 +0100
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2007, 2008, 2010, 2011, 2012, 2013 Paul Boddie <paul@boddie.org.uk>
+# Copyright (C) 2007, 2008, 2010, 2011, 2012, 2013, 2014 Paul Boddie <paul@boddie.org.uk>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free Software
@@ -27,7 +27,7 @@
 
 if [ "$1" = "--help" ]; then
         cat 1>&2 <<EOF
-Usage: `basename $0` [ --root [ --multistrap [ -f <config> ] ] ] [ <mirror> ]
+Usage: `basename $0` [ --root [ --multistrap [ -f <config> ] <mirror> ] ] [ <mirror> ]
 
 Examples:
 
@@ -62,6 +62,12 @@
 fi
 
 MIRROR="$1"
+
+if [ "$USE_MULTISTRAP" ] && [ ! "$MIRROR" ]; then
+	echo "Multistrap usage requires that a mirror be specified." 1>&2
+	exit 1
+fi
+
 PATH=$PATH${PATH:+:}/usr/sbin:/sbin
 
 # For multistrap, make a configuration file and use it to invoke multistrap.
@@ -78,7 +84,7 @@
 aptsources=Debian
 
 [Debian]
-packages=gnupg
+packages=apt
 source=$MIRROR
 keyring=$ARCHIVE_KEYRING
 suite=$USERINSTALL_CODENAME