[Piuparts-commits] [piuparts] 08/08: p.conf: separate flags-*-lenny from flags-*-squeeze
Holger Levsen
holger at layer-acht.org
Sat Aug 5 17:55:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit e1667490a728c20e38537bfef127fa152c664fff
Author: Andreas Beckmann <anbe at debian.org>
Date: Sat Aug 5 05:09:37 2017 +0200
p.conf: separate flags-*-lenny from flags-*-squeeze
Signed-off-by: Andreas Beckmann <anbe at debian.org>
Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
instances/piuparts.conf-template.pejacevic | 7 +++++--
instances/piuparts.conf.anbe | 9 ++++++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/instances/piuparts.conf-template.pejacevic b/instances/piuparts.conf-template.pejacevic
index a5e9196..162ba82 100644
--- a/instances/piuparts.conf-template.pejacevic
+++ b/instances/piuparts.conf-template.pejacevic
@@ -96,8 +96,11 @@ flags-end-squeeze =
flags-start-lenny =
# dpkg --force-unsafe-io was added in squeeze
--dpkg-noforce-unsafe-io
-# same flags needed as in squeeze
- %(flags-start-squeeze)s
+# up to squeeze a non-empty /etc/shells was shipped, actually installing
+# and removing a shell would remove its entry from /etc/shells
+ -i /etc/shells
+# lenny has been archived
+ --no-check-valid-until
[global]
diff --git a/instances/piuparts.conf.anbe b/instances/piuparts.conf.anbe
index 3c3338d..d819461 100644
--- a/instances/piuparts.conf.anbe
+++ b/instances/piuparts.conf.anbe
@@ -45,8 +45,8 @@ flags-end-wheezy =
--scriptsdir /etc/piuparts/scripts-wheezy
flags-start-squeeze =
- -i /etc/shells
--no-check-valid-until
+ -i /etc/shells
flags-end-squeeze =
--warn-on-debsums-errors
--warn-on-install-over-symlink
@@ -54,10 +54,13 @@ flags-end-squeeze =
flags-start-lenny =
--dpkg-noforce-unsafe-io
- %(flags-start-squeeze)s
+ --no-check-valid-until
+ -i /etc/shells
flags-end-lenny =
--skip-cronfiles-test
- %(flags-end-squeeze)s
+ --warn-on-debsums-errors
+ --warn-on-install-over-symlink
+ --scriptsdir /etc/piuparts/scripts-squeeze
-i /etc/udev/
-i /etc/udev/rules.d/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git
More information about the Piuparts-commits
mailing list