summaryrefslogtreecommitdiff
path: root/multistrap
diff options
context:
space:
mode:
authorJohannes Schauer <josch@debian.org>2016-12-03 18:04:41 +0100
committerJohannes Schauer <josch@debian.org>2016-12-03 18:04:41 +0100
commitc8bfd170a115d53f4f3ecf2c3301a9ebb2e7715d (patch)
tree71941f5b1ac6bdb6b19e70156a59b7083cfe6a9c /multistrap
parentc54073bbf5fd8e8d126083a4f0a9e3e8f291edfd (diff)
Stop creating /etc/dpkg/dpkg.cfg.d/multiarch (closes: #819103)
Diffstat (limited to 'multistrap')
-rwxr-xr-xmultistrap20
1 files changed, 5 insertions, 15 deletions
diff --git a/multistrap b/multistrap
index f112a01..c913b52 100755
--- a/multistrap
+++ b/multistrap
@@ -202,22 +202,12 @@ if (not -d "${dir}dev") {
mkdir_fatal ("${dir}dev");
}
if (($olddpkg == 0) and (scalar (@foreignarches) > 0)) {
- if (not -d "${dir}etc/dpkg/dpkg.cfg.d/") {
- system_fatal ("mkdir -p " . shellescape("${dir}etc/dpkg/dpkg.cfg.d/"));
- }
- if (not -f "${dir}etc/dpkg/dpkg.cfg.d/multiarch") {
- open (MA, ">${dir}etc/dpkg/dpkg.cfg.d/multiarch");
- foreach my $farch (@foreignarches) {
- print MA "foreign-architecture $farch\n";
- }
- close (MA);
- open (VMA, ">${dir}${dpkgdir}arch");
- print VMA "$host\n";
- foreach my $farch (@foreignarches) {
- print VMA "$farch\n";
- }
- close (VMA);
+ open (VMA, ">${dir}${dpkgdir}arch");
+ print VMA "$host\n";
+ foreach my $farch (@foreignarches) {
+ print VMA "$farch\n";
}
+ close (VMA);
}
&guard_lib64($dir);