diff mbox

[OSSTEST,07/16] Debian.pm: use sysvinit-core on stretch

Message ID 20171020103840.32762-8-wei.liu2@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wei Liu Oct. 20, 2017, 10:38 a.m. UTC 
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 Osstest/Debian.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ian Jackson Oct. 20, 2017, 10:57 a.m. UTC | #1 
Wei Liu writes ("[OSSTEST PATCH 07/16] Debian.pm: use sysvinit-core on stretch"):
...
> diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
> index 845027a..24bc260 100644
> --- a/Osstest/Debian.pm
> +++ b/Osstest/Debian.pm
> @@ -827,7 +827,7 @@ sub preseed_base ($$$;@) {
>  
>      # Systemd doesn't honor osstest-confirm-booted service, which
>      # breaks ts-leak-check.  Fall back to SysV init for now.
> -    if ( $suite =~ /jessie/ ) {
> +    if ( $suite =~ /jessie|stretch/ ) {
>         preseed_hook_command($ho, 'late_command', $sfx, <<END)
>  in-target apt-get install -y sysvinit-core

I think we should probably recognise that this is not going to change,
and switch this from a workaround to a policy decision.  Ie,

  if ... !~ m/squeeze/

Ian.
diff mbox

Patch

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 845027a..24bc260 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -827,7 +827,7 @@  sub preseed_base ($$$;@) {
 
     # Systemd doesn't honor osstest-confirm-booted service, which
     # breaks ts-leak-check.  Fall back to SysV init for now.
-    if ( $suite =~ /jessie/ ) {
+    if ( $suite =~ /jessie|stretch/ ) {
        preseed_hook_command($ho, 'late_command', $sfx, <<END)
 in-target apt-get install -y sysvinit-core
 END