From 7219c490cccf332837753690c6e21bfc8041ed0c Mon Sep 17 00:00:00 2001 From: Devrandom Date: Thu, 4 Jun 2015 12:46:20 -0700 Subject: [PATCH] make bootstrap-fixup idempotent --- target-bin/bootstrap-fixup.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-bin/bootstrap-fixup.in b/target-bin/bootstrap-fixup.in index 5d77cf2..54dc75e 100755 --- a/target-bin/bootstrap-fixup.in +++ b/target-bin/bootstrap-fixup.in @@ -12,11 +12,11 @@ echo '127.0.1.1 gitian' >> /etc/hosts # If LXC if grep /lxc/gitian /proc/1/cgroup > /dev/null; then adduser --disabled-password --gecos ubuntu --quiet ubuntu || true - apt-get remove -y rsyslog + apt-get remove -y rsyslog || true dpkg-divert --local --rename --add /sbin/initctl - ln -s /bin/true /sbin/initctl + ln -sf /bin/true /sbin/initctl dpkg-divert --local --rename --add /usr/bin/ischroot - ln -s /bin/true /usr/bin/ischroot + ln -sf /bin/true /usr/bin/ischroot # Prevent interaction with init during upgrades dpkg-divert --local --rename --add /usr/sbin/policy-rc.d echo 'exit 101' > /usr/sbin/policy-rc.d