# HG changeset patch # User Paul Boddie # Date 1269131678 -3600 # Node ID 9c1ab8d6c81767cd511801a4c4a4dec816c4bf25 # Parent 31111194d6e64636ab7bbc5ec330b2d07c93ced9 Introduced common fakechroot options. Updated the copyright information. diff -r 31111194d6e6 -r 9c1ab8d6c817 docs/COPYING.txt --- a/docs/COPYING.txt Sun Mar 21 01:28:59 2010 +0100 +++ b/docs/COPYING.txt Sun Mar 21 01:34:38 2010 +0100 @@ -1,7 +1,7 @@ Licence Agreement for userinstall --------------------------------- -Copyright (C) 2007 Paul Boddie +Copyright (C) 2007, 2008, 2009, 2010 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 diff -r 31111194d6e6 -r 9c1ab8d6c817 user-apt-get --- a/user-apt-get Sun Mar 21 01:28:59 2010 +0100 +++ b/user-apt-get Sun Mar 21 01:34:38 2010 +0100 @@ -11,4 +11,4 @@ exit 1 fi -fakeroot fakechroot --use-system-libs chroot $PACKAGEROOT apt-get $* +fakeroot fakechroot $FAKECHROOT_OPTIONS chroot $PACKAGEROOT apt-get $* diff -r 31111194d6e6 -r 9c1ab8d6c817 user-dpkg-i --- a/user-dpkg-i Sun Mar 21 01:28:59 2010 +0100 +++ b/user-dpkg-i Sun Mar 21 01:34:38 2010 +0100 @@ -35,4 +35,4 @@ export PPACKAGEFILE=$PERSONAL/$PACKAGEFILE cp $1 $PPACKAGEFILE -fakeroot fakechroot --use-system-libs chroot $PACKAGEROOT dpkg -i $PPACKAGEFILE +fakeroot fakechroot $FAKECHROOT_OPTIONS chroot $PACKAGEROOT dpkg -i $PPACKAGEFILE diff -r 31111194d6e6 -r 9c1ab8d6c817 user-enter --- a/user-enter Sun Mar 21 01:28:59 2010 +0100 +++ b/user-enter Sun Mar 21 01:34:38 2010 +0100 @@ -11,4 +11,4 @@ exit 1 fi -fakeroot fakechroot chroot $PACKAGEROOT +fakeroot fakechroot $FAKECHROOT_OPTIONS chroot $PACKAGEROOT diff -r 31111194d6e6 -r 9c1ab8d6c817 user-setup --- a/user-setup Sun Mar 21 01:28:59 2010 +0100 +++ b/user-setup Sun Mar 21 01:34:38 2010 +0100 @@ -22,8 +22,8 @@ exit 1 fi -fakeroot fakechroot --use-system-libs debootstrap --variant=fakechroot --include=gnupg,$KEYRING $USERINSTALL_CODENAME $PACKAGEROOT $1 +fakeroot fakechroot $FAKECHROOT_OPTIONS debootstrap --variant=fakechroot --include=gnupg,$KEYRING $USERINSTALL_CODENAME $PACKAGEROOT $1 echo echo "Don't forget to run the following before installing packages:" echo -echo "apt-get update" +echo "user-apt-get update" diff -r 31111194d6e6 -r 9c1ab8d6c817 userinstall-defaults --- a/userinstall-defaults Sun Mar 21 01:28:59 2010 +0100 +++ b/userinstall-defaults Sun Mar 21 01:34:38 2010 +0100 @@ -8,6 +8,12 @@ export USERINSTALL_ID=$DISTRIB_ID export USERINSTALL_CODENAME=$DISTRIB_CODENAME +# These definitions may need changing for certain combinations of distributions: + +export FAKECHROOT_OPTIONS= +#export FAKECHROOT_OPTIONS=--use-system-libs +#export FAKECHROOT_OPTIONS=--use-some-system-libs + # Configuration details for building and using a personal package manager. export PACKAGEROOT=$HOME/.userinstall