From 4b440a0e016f8a9a3c16635abfba9f7b8ac1a5e3 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Fri, 13 Sep 2019 12:37:28 +0200 Subject: [PATCH] allow messing with s-s-d in hooks Presently, mmdebstrap fails hard if e.g. a --setup-hook removes start-stop-daemon.REAL. --- mmdebstrap | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mmdebstrap b/mmdebstrap index cd9f96b..f3a64ba 100755 --- a/mmdebstrap +++ b/mmdebstrap @@ -861,7 +861,7 @@ sub run_chroot(&$) { chmod 0755, "$options->{root}/usr/sbin/policy-rc.d" or error "cannot chmod policy-rc.d: $!"; } - { + if (-e "$options->{root}/sbin/start-stop-daemon") { move("$options->{root}/sbin/start-stop-daemon", "$options->{root}/sbin/start-stop-daemon.REAL") or error "cannot move start-stop-daemon: $!"; open my $fh, '>', "$options->{root}/sbin/start-stop-daemon" or error "cannot open start-stop-daemon: $!"; print $fh "#!/bin/sh\n"; @@ -873,7 +873,9 @@ sub run_chroot(&$) { &{$cmd}(); # cleanup - move("$options->{root}/sbin/start-stop-daemon.REAL", "$options->{root}/sbin/start-stop-daemon") or error "cannot move start-stop-daemon: $!"; + if (-e "$options->{root}/sbin/start-stop-daemon.REAL") { + move("$options->{root}/sbin/start-stop-daemon.REAL", "$options->{root}/sbin/start-stop-daemon") or error "cannot move start-stop-daemon: $!"; + } unlink "$options->{root}/usr/sbin/policy-rc.d" or error "cannot unlink policy-rc.d: $!"; };