[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. d18821f6378eac9a00723a180eda5145a3ccdc8c

[Steffen Moeller]

The following commit has been merged in the master branch:
commit f71e966ad59c4a0ec54617e368fa54d4e0f4e35e
Merge: 2d001ec988303aa5cfa4e785950d53e471453a35 b0540a23397f647f4a339b249bdec1c39503d907
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Feb 28 13:05:16 2009 +0100

    Merge branch 'addkey'

diff --combined install.sh
index 66f1322,70d68eb..5c2c93e
--- a/install.sh
+++ b/install.sh
@@@ -393,7 -393,7 +393,7 @@@ action_testing () 
  		echo "W: tar does not support gzip archives"
  		echo "Downloading tar package"
  		wget $TAR_PACKAGE -O /tmp/tar.deb
 -		( cd /tmp; ar -x tar.deb data.tar.gz )
 +		( cd /tmp && ar -x tar.deb data.tar.gz )
  		mkdir -p /usr/local
  		gunzip -c /tmp/data.tar.gz | tar -x -C /usr/local/
  		rm -f /tmp/data.tar.gz
@@@ -407,7 -407,7 +407,7 @@@
  			# and then try to install the Debian dosfstools
  			echo "Downloading dosfstools package"
  			wget $DOSFSTOOLS_PACKAGE -O /tmp/dosfstools.deb
 -			( cd /tmp; ar -x dosfstools.deb data.tar.gz )
 +			( cd /tmp && ar -x dosfstools.deb data.tar.gz )
  			tar -xz -C / -f /tmp/data.tar.gz
  			rm -f /tmp/data.tar.gz
  			rm -f /tmp/dosfstools.deb
@@@ -632,7 -632,7 +632,7 @@@ action_debian () 
  
  	echo " * Downloading cdebootstrap package"
  	wget $CDEBOOTSTRAP_PACKAGE -O /tmp/cdebootstrap.deb
 -	( cd /tmp; ar -x cdebootstrap.deb data.tar.gz )
 +	( cd /tmp && ar -x cdebootstrap.deb data.tar.gz )
  	tar -xz -C / -f /tmp/data.tar.gz
  	rm -f /tmp/data.tar.gz
  	rm -f /tmp/cdebootstrap.deb
@@@ -672,7 -672,7 +672,7 @@@
  		--include=$CDEBOOTSTRAP_EXTRA_PACKAGES \
  		--exclude=$CDEBOOTSTRAP_EXCLUDE_PACKAGES sid "$INST_DIR" $INST_MIRROR
  
- 	echo "I: basic Debian system installed"
+ 	echo "I: Basic Debian system installed"
  }
  
  
@@@ -692,11 -692,33 +692,33 @@@ __END_
  	echo " * Install APT recommends by default: $APT_RECOMMENDS"
  	echo "APT::Install-Recommends \"$APT_RECOMMENDS\";" > "$INST_DIR/etc/apt/apt.conf.d/99recommends"
  
+ 	echo " * learning public key for pkg-fso-keyring"
+ 	chroot "$INST_DIR" apt-key add - <<__END__
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+ Version: GnuPG v1.4.6 (GNU/Linux)
+ 
+ mQGiBEicYhYRBACvesYUC+rkRpp0j/PTEimmuPkZqjLuRnpXqlCXV9Y1TZxvPmFl
+ TwoeBHYoh3Uipbj0WypAJ3N989OQPiPo+lyrPNscRYc9+H/k7Q47Oc0ms23EQSWX
+ AdnuhRezNF98cW/bmykVO9uZo+OjA501R9SCrMkhkbuifB57OMdXA0o67wCg0NWM
+ EOAqQ/DCoo9Nqnb5sWotwisD/15dgunBY1BCyz8o7Ky1gn+Cel3LfNaqCIHwgCNf
+ oxdAzHViNHMJa13Hab/nBY1GPpfJ3VIvLNs309JTDoKnYFvUkinvt+OJcY4z/3XN
+ yloHhUoFBOSuZUy/xqB5PVrlQYJ07WKQHOkjvcp5LCH7pTLjCu8ih+YIIr4uipNl
+ ZjBwA/9bCGQysO4xaHCR+qEZcQ1J4tW2A1g6Kr8p2CHxvGVCCQW7hhIRVIVGXF83
+ EViOVobmG8RHZFpAJzdsrJ/jkYBZp62wCs1DTljxLdMfY9vlKzpui3RSPv10fdPX
+ t2iPG4Qc9Qm2H6LkWDfSJx6FLzDKrcj8tmbLTpr+fdJZtehudLRNcGtnLWZzbyBB
+ cmNoaXZlIEF1dG9tYXRpYyBTaWduaW5nIEtleSA8cGtnLWZzby1tYWludEBsaXN0
+ cy5hbGlvdGguZGViaWFuLm9yZz6IZgQTEQIAJgUCSJxiFgIbAwUJAeEzgAYLCQgH
+ AwIEFQIIAwQWAgMBAh4BAheAAAoJEOK53mqOezI7vToAnR+D4n8UEyBKHPc5mqVc
+ KlzsMB1qAKCNHBbdoCuo/b9ZRdbj0d3zCKGOQA==
+ =MfK3
+ -----END PGP PUBLIC KEY BLOCK-----
+ __END__
+ 
  	echo " * Updating APT database"
  	chroot "$INST_DIR" apt-get update
  
  	echo " * Installing pkg-fso keyring"
- 	chroot $INST_DIR apt-get --yes --force-yes $APT_OPTIONS install pkg-fso-keyring
+ 	chroot $INST_DIR apt-get $APT_OPTIONS install pkg-fso-keyring
  
  	echo " * Removing additional packages"
  	chroot "$INST_DIR" /bin/sh -e <<__END_CHROOT__

-- 
Various non-packaged files