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

* 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.

Browse source 
git-svn-id: http://emdebian.org/svn/current@7734 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-02-01 22:27:22 +00:00
parent 3669f13b11
commit 257b921038
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,8 +1,12 @@
multistrap (2.1.10) experimental; urgency=low multistrap (2.1.10) experimental; urgency=low
* Fix typo in sysvinit chroot.sh script. * 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 <codehelp@debian.org> Tue, 01 Feb 2011 22:09:40 +0000 -- Neil Williams <codehelp@debian.org> Tue, 01 Feb 2011 22:25:59 +0000
multistrap (2.1.9) experimental; urgency=low multistrap (2.1.9) experimental; urgency=low

6
multistrap
View file

@ -707,19 +707,19 @@ sub native {
system ("$str $env chroot $dir debconf-set-selections /tmp/preseeds/$s"); 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; opendir (PRI, "${dir}/var/lib/dpkg/info") or return;
my @preinsts=grep(/\.preinst$/, readdir PRI); my @preinsts=grep(/\.preinst$/, readdir PRI);
closedir (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); my $f = join (" ", @reinstall);
foreach my $script (sort @preinsts) { foreach my $script (sort @preinsts) {
my $t = $script; my $t = $script;
$t =~ s/\.preinst//; $t =~ s/\.preinst//;
next if ($t =~ /$f/); next if ($t =~ /$f/);
next if ($script =~ /bash/); 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 # 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 install $reinst");