1.1 --- a/docs/COPYING.txt Sun Mar 21 01:28:59 2010 +0100
1.2 +++ b/docs/COPYING.txt Sun Mar 21 01:34:38 2010 +0100
1.3 @@ -1,7 +1,7 @@
1.4 Licence Agreement for userinstall
1.5 ---------------------------------
1.6
1.7 -Copyright (C) 2007 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2007, 2008, 2009, 2010 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
2.1 --- a/user-apt-get Sun Mar 21 01:28:59 2010 +0100
2.2 +++ b/user-apt-get Sun Mar 21 01:34:38 2010 +0100
2.3 @@ -11,4 +11,4 @@
2.4 exit 1
2.5 fi
2.6
2.7 -fakeroot fakechroot --use-system-libs chroot $PACKAGEROOT apt-get $*
2.8 +fakeroot fakechroot $FAKECHROOT_OPTIONS chroot $PACKAGEROOT apt-get $*
3.1 --- a/user-dpkg-i Sun Mar 21 01:28:59 2010 +0100
3.2 +++ b/user-dpkg-i Sun Mar 21 01:34:38 2010 +0100
3.3 @@ -35,4 +35,4 @@
3.4 export PPACKAGEFILE=$PERSONAL/$PACKAGEFILE
3.5
3.6 cp $1 $PPACKAGEFILE
3.7 -fakeroot fakechroot --use-system-libs chroot $PACKAGEROOT dpkg -i $PPACKAGEFILE
3.8 +fakeroot fakechroot $FAKECHROOT_OPTIONS chroot $PACKAGEROOT dpkg -i $PPACKAGEFILE
4.1 --- a/user-enter Sun Mar 21 01:28:59 2010 +0100
4.2 +++ b/user-enter Sun Mar 21 01:34:38 2010 +0100
4.3 @@ -11,4 +11,4 @@
4.4 exit 1
4.5 fi
4.6
4.7 -fakeroot fakechroot chroot $PACKAGEROOT
4.8 +fakeroot fakechroot $FAKECHROOT_OPTIONS chroot $PACKAGEROOT
5.1 --- a/user-setup Sun Mar 21 01:28:59 2010 +0100
5.2 +++ b/user-setup Sun Mar 21 01:34:38 2010 +0100
5.3 @@ -22,8 +22,8 @@
5.4 exit 1
5.5 fi
5.6
5.7 -fakeroot fakechroot --use-system-libs debootstrap --variant=fakechroot --include=gnupg,$KEYRING $USERINSTALL_CODENAME $PACKAGEROOT $1
5.8 +fakeroot fakechroot $FAKECHROOT_OPTIONS debootstrap --variant=fakechroot --include=gnupg,$KEYRING $USERINSTALL_CODENAME $PACKAGEROOT $1
5.9 echo
5.10 echo "Don't forget to run the following before installing packages:"
5.11 echo
5.12 -echo "apt-get update"
5.13 +echo "user-apt-get update"
6.1 --- a/userinstall-defaults Sun Mar 21 01:28:59 2010 +0100
6.2 +++ b/userinstall-defaults Sun Mar 21 01:34:38 2010 +0100
6.3 @@ -8,6 +8,12 @@
6.4 export USERINSTALL_ID=$DISTRIB_ID
6.5 export USERINSTALL_CODENAME=$DISTRIB_CODENAME
6.6
6.7 +# These definitions may need changing for certain combinations of distributions:
6.8 +
6.9 +export FAKECHROOT_OPTIONS=
6.10 +#export FAKECHROOT_OPTIONS=--use-system-libs
6.11 +#export FAKECHROOT_OPTIONS=--use-some-system-libs
6.12 +
6.13 # Configuration details for building and using a personal package manager.
6.14
6.15 export PACKAGEROOT=$HOME/.userinstall