josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check in fixes for apt authentication on 0.8 and updates for Ubuntu maverick config

Browse source 
git-svn-id: http://emdebian.org/svn/current@7502 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
wookey 2010-10-01 01:42:06 +00:00
parent 756c3be9a9
commit cc1f6a57db
5 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cross/setcrossarch.sh
View file

@ -26,6 +26,11 @@ if [ -z "$dir" ]; then
exit 1 exit 1
fi fi
#run chroot script to ensure no unwanted system interactions (e.g. startup scripts)
if [ -x /usr/share/multistrap/chroot.sh ]; then
/usr/share/multistrap/chroot.sh $dir $hostarch
fi
cfg="/etc/pdebuild-cross/pdebuild-cross.rc" cfg="/etc/pdebuild-cross/pdebuild-cross.rc"
if [ -f $cfg ]; then if [ -f $cfg ]; then
. $cfg . $cfg

8
debian/changelog vendored
View file

@ -7,10 +7,16 @@ multistrap (2.1.8) experimental; urgency=low
* Add more synopsis information to manual page. (Closes: #592621) * Add more synopsis information to manual page. (Closes: #592621)
* Aim 2.1.8 at experimental as squeeze is frozen and this version * Aim 2.1.8 at experimental as squeeze is frozen and this version
includes possibly disruptive changes. includes possibly disruptive changes.
* Add support for 'flat' apt-ftparchive-style URLs
-- Neil Williams <codehelp@debian.org> Wed, 25 Aug 2010 22:59:47 +0100 -- Neil Williams <codehelp@debian.org> Wed, 25 Aug 2010 22:59:47 +0100
* Add support for 'flat' apt-ftparchive-style URLs
* Include chroot.sh preventing services being started during chroot creation
* Always use the host apt keyring when bootstrapping, since we don't
have one yet in the target root.
-- Wookey <wookey@debian.org> Fri, 30 Sep 2010 02:21:21 +0100
multistrap (2.1.6) unstable; urgency=low multistrap (2.1.6) unstable; urgency=low
* [INTL:fr] French manpage translation update (Closes: #584679) * [INTL:fr] French manpage translation update (Closes: #584679)

1
debian/multistrap.install vendored
View file

@ -10,6 +10,7 @@ examples/grip-squeeze.conf ./usr/share/multistrap/
examples/grip-lenny.conf ./usr/share/multistrap/ examples/grip-lenny.conf ./usr/share/multistrap/
examples/setup.sh ./usr/share/doc/multistrap/examples/ examples/setup.sh ./usr/share/doc/multistrap/examples/
examples/config.sh ./usr/share/doc/multistrap/examples/ examples/config.sh ./usr/share/doc/multistrap/examples/
examples/chroot.sh ./usr/share/multistrap/
check-deps.sh ./usr/share/multistrap/ check-deps.sh ./usr/share/multistrap/
device-table.pl ./usr/share/multistrap/ device-table.pl ./usr/share/multistrap/
update-rc.d ./usr/share/multistrap/ update-rc.d ./usr/share/multistrap/

2
examples/maverick.conf
View file

@ -24,4 +24,4 @@ aptsources=Ubuntu
packages=apt packages=apt
source=http://archive.ubuntu.com/ubuntu source=http://archive.ubuntu.com/ubuntu
keyring=ubuntu-keyring keyring=ubuntu-keyring
suite=maverick suite=maverick universe

4
multistrap
View file

@ -279,6 +279,8 @@ if (defined $k) {
$config_str = ''; $config_str = '';
$config_str .= " -o Apt::Architecture=$arch"; $config_str .= " -o Apt::Architecture=$arch";
$config_str .= " -o Dir::Etc::TrustedParts=/etc/apt/trusted.gpg.d";
$config_str .= " -o Dir::Etc::Trusted=/etc/apt/trusted.gpg";
$config_str .= " -o Apt::Get::AllowUnauthenticated=true" $config_str .= " -o Apt::Get::AllowUnauthenticated=true"
if (defined $noauth); if (defined $noauth);
$config_str .= " -o Apt::Get::Download-Only=true"; $config_str .= " -o Apt::Get::Download-Only=true";
@ -669,7 +671,7 @@ sub native {
} }
# reinstall set # reinstall set
foreach my $reinst (sort @reinstall) { foreach my $reinst (sort @reinstall) {
system ("$str $env chroot $dir apt-get --reinstall -y install $reinst"); system ("$str $env chroot $dir apt-get --reinstall -y $forceyes install $reinst");
} }
} }