[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.48-79-gdf94975

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 17e1f08adfe428d4240972a4822be34a9939fe19
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sat Dec 1 19:33:29 2012 +0100

    p.conf: ignore modifications of /etc/shells
    
    handling of /etc/shells has changed with wheezy, now a minimal file
    is installed and all shell providers register themselves properly
    
    for tests starting with squeeze or lenny a large default list was
    shipped that might get modified if one of the shells in there is
    actually registered and later deregistered by a piuparts test
    
    we use the -i option instead of adding the file to the builtin list
    to restrict this to a few older distros while the newer distros get
    checked for handling /etc/shells properly
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/instances/piuparts.conf.goldwasser b/instances/piuparts.conf.goldwasser
index 9d58cd3..f902c36 100644
--- a/instances/piuparts.conf.goldwasser
+++ b/instances/piuparts.conf.goldwasser
@@ -58,7 +58,7 @@ log-file = wheezy.log
 
 [squeeze2wheezy]
 description = Debian main: package installation in squeeze and dist-upgrade to wheezy, then removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge --no-eatmydata --dpkg-noforce-unsafe-io
+piuparts-flags = --warn-on-leftovers-after-purge --no-eatmydata --dpkg-noforce-unsafe-io -i /etc/shells
 distro = squeeze
 upgrade-test-distros = squeeze wheezy
 upgrade-test-chroot-tgz = squeeze.tar.gz
diff --git a/instances/piuparts.conf.piatti b/instances/piuparts.conf.piatti
index 53b663c..17bb8ef 100644
--- a/instances/piuparts.conf.piatti
+++ b/instances/piuparts.conf.piatti
@@ -67,7 +67,7 @@ log-file = wheezy.log
 [squeeze2wheezy]
 precedence = 3
 description = Debian main: package installation in squeeze and dist-upgrade to wheezy, then removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge --no-eatmydata
+piuparts-flags = --warn-on-leftovers-after-purge --no-eatmydata -i /etc/shells
 distro = squeeze
 upgrade-test-distros = squeeze wheezy
 upgrade-test-chroot-tgz = squeeze.tar.gz
@@ -78,7 +78,7 @@ log-file = squeeze2wheezy.log
 [squeeze]
 precedence = 5
 description = Debian squeeze / main: package installation, removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge --no-eatmydata --scriptsdir /etc/piuparts/scripts-squeeze
+piuparts-flags = --warn-on-leftovers-after-purge --no-eatmydata --scriptsdir /etc/piuparts/scripts-squeeze -i /etc/shells
 distro = squeeze
 chroot-tgz = squeeze.tar.gz
 max-reserved = 50
@@ -91,7 +91,7 @@ log-file = squeeze.log
 max-reserved = 0
 precedence = 99
 description = Debian main: package installation in lenny and dist-upgrade to squeeze, then removal and purge test.
-piuparts-flags = --warn-on-leftovers-after-purge --dpkg-noforce-unsafe-io --no-eatmydata --scriptsdir /etc/piuparts/scripts-squeeze
+piuparts-flags = --warn-on-leftovers-after-purge --dpkg-noforce-unsafe-io --no-eatmydata --scriptsdir /etc/piuparts/scripts-squeeze -i /etc/shells
 distro = lenny
 upgrade-test-distros = lenny squeeze
 upgrade-test-chroot-tgz = lenny.tar.gz

-- 
piuparts git repository