X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-chroot/blobdiff_plain/a98c9dba94d44ada3a7e7f3b4ce8b6df6911a2d2..308158fc1072d43254e2ea210f52374ea4711515:/bin/chroot-maint diff --git a/bin/chroot-maint b/bin/chroot-maint index 5b63037..2f91e9c 100755 --- a/bin/chroot-maint +++ b/bin/chroot-maint @@ -618,7 +618,8 @@ def mkdir_p(dir, mode = 0777): Unlike `OS.makedirs', this doesn't fail if DIR already exists. """ - d = "" + if dir.startswith("/"): d = "/"; dir = dir[1:] + else: d = "" for p in dir.split("/"): d = OS.path.join(d, p) if d == "": continue @@ -1476,6 +1477,12 @@ with toplevel_handler(): C = Config() CREATE = Tag("CREATE") FORCE = Tag("FORCE") +DEBCONF_TWEAKS = """ + DEBIAN_FRONTEND=noninteractive; export DEBIAN_FRONTEND + DEBIAN_PRIORITY=critical export DEBIAN_PRIORITY + DEBCONF_NONINTERACTIVE_SEEN=true; export DEBCONF_NONINTERACTIVE_SEEN +""" + def check_fresh(fresh, update): """ Compare a refresh mode FRESH against an UPDATE time. @@ -2221,7 +2228,8 @@ class ChrootJob (BaseJob): ## Finishing touches. progress("finishing touches") - run_schroot_source(dist, arch, ["eatmydata", "sh", "-e", "-c", """ + run_schroot_source(dist, arch, ["eatmydata", "sh", "-e", "-c", + DEBCONF_TWEAKS + """ apt-get update apt-get -y upgrade apt-get -y install "$@" @@ -2239,7 +2247,8 @@ class ChrootJob (BaseJob): with Cleanup() as clean: dist, arch = me._dist, me._arch clean.enter(lockfile(chroot_src_lockfile(dist, arch))) - run_schroot_source(dist, arch, ["eatmydata", "sh", "-e", "-c", """ + run_schroot_source(dist, arch, ["eatmydata", "sh", "-e", "-c", + DEBCONF_TWEAKS + """ apt-get update apt-get -y dist-upgrade apt-get -y autoremove @@ -2310,7 +2319,8 @@ class CrossToolsJob (BaseJob): ## Make sure the donor tree is up-to-date, and install the extra ## packages we need. progress("install tools packages") - run_schroot_session(session, ["eatmydata", "sh", "-e", "-c", """ + run_schroot_session(session, ["eatmydata", "sh", "-e", "-c", + DEBCONF_TWEAKS + """ apt-get update apt-get -y upgrade apt-get -y install "$@"