# HG changeset patch # User Paul Boddie # Date 1421353592 -3600 # Node ID 4f1585450740d641950c1f4d56ad0621d50808be # Parent bcc54eac43e9f24ce3a9624b6767a2a15bb91823 Attempt to provide suitable repository definitions for multistrapped systems. diff -r bcc54eac43e9 -r 4f1585450740 user-postsetup --- a/user-postsetup Thu Jan 15 21:25:08 2015 +0100 +++ b/user-postsetup Thu Jan 15 21:26:32 2015 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2010, 2011, 2012, 2013 Paul Boddie +# Copyright (C) 2010, 2011, 2012, 2013, 2014 Paul Boddie # # 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 @@ -59,9 +59,10 @@ if [ "$USERINSTALL_CODENAME" = "$DISTRIB_CODENAME" ]; then $AS_USER cp /etc/apt/sources.list "$PACKAGEROOT/etc/apt/" -# Otherwise, attempt to make a new sources list. +# Otherwise, attempt to make a new sources list, if necessary. -else +elif [ ! -e "$PACKAGEROOT/etc/apt/sources.list.d/multistrap-"*".list" ]; then + echo "Attempting to generate a repository definition for $USERINSTALL_CODENAME." 1>&2 $AS_USER USERINSTALL_ID="$USERINSTALL_ID" USERINSTALL_CODENAME="$USERINSTALL_CODENAME" \ "$THIS_DIR/user-makesources" "$PACKAGEROOT/etc/apt/sources.list" "$COUNTRY"