diff --git a/debian/changelog b/debian/changelog index 962d576..62d1450 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ multistrap (2.1.10) experimental; urgency=low * Fix typo in sysvinit chroot.sh script. + * run preinst scripts install command instead of upgrade + (Closes: #611744) + * Run the preinst scripts ahead of calling configure -a in native + mode. Thanks to Daniel Baumann for spotting it. - -- Neil Williams Tue, 01 Feb 2011 22:09:40 +0000 + -- Neil Williams Tue, 01 Feb 2011 22:25:59 +0000 multistrap (2.1.9) experimental; urgency=low diff --git a/multistrap b/multistrap index 571036e..8d9f3b1 100755 --- a/multistrap +++ b/multistrap @@ -707,19 +707,19 @@ sub native { system ("$str $env chroot $dir debconf-set-selections /tmp/preseeds/$s"); } } - system ("$str $env chroot $dir dpkg --configure -a"); opendir (PRI, "${dir}/var/lib/dpkg/info") or return; my @preinsts=grep(/\.preinst$/, readdir PRI); closedir (PRI); - printf (_g("I: Running preinst scripts with 'upgrade' argument.\n")); + printf (_g("I: Running preinst scripts with 'install' argument.\n")); my $f = join (" ", @reinstall); foreach my $script (sort @preinsts) { my $t = $script; $t =~ s/\.preinst//; next if ($t =~ /$f/); next if ($script =~ /bash/); - system ("$str $env chroot $dir /var/lib/dpkg/info/$script upgrade"); + system ("$str $env chroot $dir /var/lib/dpkg/info/$script install"); } + system ("$str $env chroot $dir dpkg --configure -a"); # reinstall set foreach my $reinst (sort @reinstall) { system ("$str $env chroot $dir apt-get --reinstall -y install $reinst");