Commit fa9bbcbb authored by Sophie Brun's avatar Sophie Brun Committed by Lorenzo Faletra

Import Debian version 1.56+nmu1kali1

init-system-helpers (1.56+nmu1kali1) kali-dev; urgency=medium

  * Sync with Debian

init-system-helpers (1.56+nmu1) unstable; urgency=medium

  * Non-maintainer upload.
  * Add `runit-init' as alternative pre-dependency (Closes: #838480)

init-system-helpers (1.56kali1) kali-dev; urgency=medium

  * Sync with Debian

init-system-helpers (1.56) unstable; urgency=medium

  * update-rc.d: If systemctl is available, use it in make_systemd_links.
    To not create an endless loop, we set SYSTEMCTL_SKIP_SYSV=1 which is
    respected by systemd-sysv-install since v228. Add a versioned Breaks
    against systemd accordingly.
  * man: Fix name field of update-rc.d man page
  * man: Stop mentioning file-rc in invoke-rc.d man page.
    The file-rc package has been removed from the archive.
  * man: Stop mentioning bum and sysv-rc-conf in update-rc.d man page
  * man: Update bugtracker URLs.
    invoke-rc.d and update-rc.d are provided by init-system-helpers
    nowadays. Keep a reference to sysv-rc, for the sysvinit related bits.

init-system-helpers (1.55kali1) kali-dev; urgency=medium

  * Sync with Debian

init-system-helpers (1.55) unstable; urgency=medium

  [ Ondřej Nový ]
  * d/control: Deprecating priority extra as per policy 4.0.1

  [ Benda Xu ]
  * s/update-rc.d: let OpenRC run after sysv_{insserv,plain}
    Refactorization in 6cb72b59a0a1898939b818d8d2 made rc-update from
    OpenRC run *before* sysv_{insserv,plain}.  OpenRC needs to
    sychronize with /etc/rc?.d links to maintain consistency and
    administrator configurations, therefore it has to be executed after
    them. (Closes: #910444)

  [ Felipe Sateler ]
  * Fix manpage listings in d/copyright for rst manual pages.
    The names were not changed correctly when the manpages were rewritten in
    rst.
  * Bump Standards-Version (no changes needed)
parent 8921e32f
This diff is collapsed.
Source: init-system-helpers
Section: admin
Priority: extra
Priority: optional
Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org>
Uploaders: Michael Biebl <biebl@debian.org>,
Martin Pitt <mpitt@debian.org>,
......@@ -8,7 +8,7 @@ Uploaders: Michael Biebl <biebl@debian.org>,
Build-Depends: debhelper (>= 11),
perl:any,
python3-docutils
Standards-Version: 4.2.0
Standards-Version: 4.2.1
Vcs-Git: https://salsa.debian.org/debian/init-system-helpers.git
Vcs-Browser: https://salsa.debian.org/debian/init-system-helpers
......@@ -25,7 +25,7 @@ Replaces: sysv-rc (<< 2.88dsf-59.3~),
# sysv-rc now pre-depends on us and if we break them we get:
# E: This installation run will require temporarily removing the essential package sysvinit-utils:amd64 due to a Conflicts/Pre-Depends loop. This is often bad, but if you really want to do it, activate the APT::Force-LoopBreak option.
#Breaks: sysv-rc (<< 2.88dsf-59.3~)
Breaks: systemd (<< 44-12),
Breaks: systemd (<< 228),
sysvinit-utils (<< 2.88dsf-59.3~),
Conflicts: file-rc (<< 0.8.17~),
openrc (<= 0.18.3-1),
......
......@@ -8,16 +8,16 @@ Files: debian/*
Copyright: 2013 Michael Stapelberg <stapelberg@debian.org>
License: BSD-3-clause
Files: script/service man8/service.8
Files: script/service man8/service.rst
Copyright: 2006 Red Hat, Inc
2008 Canonical Ltd
License: GPL-2+
Files: script/invoke-rc.d man8/invoke-rc.d.8.rst
Files: script/invoke-rc.d man8/invoke-rc.d.rst
Copyright: 2000,2001 Henrique de Moraes Holschuh <hmh@debian.org>
License: GPL-2+
Files: script/update-rc.d man8/update-rc.d.8.rst
Files: script/update-rc.d man8/update-rc.d.rst
Copyright: 1997-2005 Miquel van Smoorenburg <miquels@cistron.nl>
Members of the pkg-sysvinit project
License: GPL-2+
......
......@@ -30,7 +30,7 @@ SBIN = debian/init-system-helpers/usr/sbin
override_dh_install-indep:
dh_install
mv $(SBIN)/update-rc.d $(SBIN)/debian-update-rc.d
cp script/parrot-update-rc.d $(SBIN)/update-rc.d
cp script/kali-update-rc.d $(SBIN)/update-rc.d
[ ! -d debian/init-system-helpers ] || sed -i 's/__VERSION__/$(DEB_VERSION)/' debian/init-system-helpers/usr/sbin/service
......@@ -38,7 +38,7 @@ override_dh_gencontrol:
if dpkg-vendor --derives-from ubuntu; then \
dh_gencontrol -- -Valt:sysvinit=""; \
else \
dh_gencontrol -- -Valt:sysvinit="| sysvinit-core"; \
dh_gencontrol -- -Valt:sysvinit="| sysvinit-core | runit-init"; \
fi
%:
......
......@@ -9,10 +9,10 @@ executes System-V style init script actions
:Manual section: 8
:Manual group: Debian GNU/Linux
:Author:
Henrique Holschuh
Henrique de Moraes Holschuh
:Version: 1 March 2001
:Copyright: 2001 Hernique Holschuh
:Copyright: 2001 Henrique de Moraes Holschuh
:Licence: GNU Public Licence v2 or Later (GPLv2+)
SYNOPSIS
......@@ -69,7 +69,6 @@ policies, use the *--force* switch.
OPTIONS
=======
*--help*
Display usage help.
......@@ -192,19 +191,14 @@ is installed in the system.
FILES
=====
/etc/init.d/*
System V init scripts.
/usr/sbin/policy-rc.d
Init script policy layer helper (not required).
/etc/runlevel.conf
file-rc runlevel configuration (if the file-rc package is being used).
/etc/rc?.d/*
System V runlevel configuration (if the sysv-rc package is being used).
System V runlevel configuration.
NOTES
=====
......@@ -213,13 +207,11 @@ NOTES
action, and returns exit status 4 instead of exit status 0 when
it is denied.
BUGS
====
Please report any bugs using the Debian bug tracking system,
http://bugs.debian.org/, package sysv-rc or file-rc
(depending on which version of invoke-rc.d you are using).
See http://bugs.debian.org/sysv-rc and
http://bugs.debian.org/init-system-helpers.
SEE ALSO
========
......
===================
invoke-rc.d
update-rc.d
===================
---------------------------------------------------------
......@@ -13,7 +13,7 @@ install and remove System-V style init script links
Miquel van Smoorenburg
:Version: 14 November 2005
:Copyright: 2001 Hernique Holschuh
:Copyright: 2001 Henrique de Moraes Holschuh
:Licence: GNU Public Licence v2 or Later (GPLv2+)
......@@ -223,7 +223,8 @@ Example of a command for disabling a system initialization-and-shutdown script:
BUGS
====
See http://bugs.debian.org/sysv-rc.
See http://bugs.debian.org/sysv-rc and
http://bugs.debian.org/init-system-helpers.
FILES
=====
......@@ -245,6 +246,4 @@ SEE ALSO
| *Debian Policy Manual*,
| ``/etc/init.d/skeleton``,
| ``insserv``\(8),
| ``sysv-rc-conf``\(8),
| ``bum``\(8),
| ``init``\(8)
......@@ -33,7 +33,7 @@ if (exists $ENV{'DPKG_RUNNING_VERSION'} and
# We're in a maint-script and we're about to install a new init script
if (exists $status_wanted{$bn}) {
if ($status_wanted{$bn} eq "disabled") {
print STDERR "update-rc.d: $bn is in our deadpool blacklist! YOU SHALL NOT PASS!\n";
print STDERR "update-rc.d: As per Kali policy, $bn init script is left disabled.\n";
system("/usr/sbin/debian-update-rc.d", @orig_argv);
system("/usr/sbin/debian-update-rc.d", $bn, "disable");
exit 0;
......@@ -44,7 +44,7 @@ if (exists $ENV{'DPKG_RUNNING_VERSION'} and
if ($header->{'required-start'} =~ /\$network/ ||
$header->{'should-start'} =~ /\$network/)
{
print STDERR "update-rc.d: It looks like a network service! YOU SHALL NOT PASS!\n";
print STDERR "update-rc.d: It looks like a network service, we disable it.\n";
system("/usr/sbin/debian-update-rc.d", @orig_argv);
system("/usr/sbin/debian-update-rc.d", $bn, "disable");
exit 0;
......@@ -91,52 +91,29 @@ sub parse_lsb_header {
__DATA__
#
# Deadpool
# List of blacklisted init scripts
#
apache2 disabled
avahi-daemon disabled
bluetooth disabled
couchdb disabled
clamav-daemon disabled
clamav-freshclam disabled
cups disabled
dictd disabled
dhcpcd disabled
dradis disabled
exim4 disabled
greenbone-security-assistant disabled
iodined disabled
mariadb disabled
minissdpd disabled
nfs-common disabled
nginx disabled
nmbd disabled
openbsd-inetd disabled
openvas-manager disabled
openvas-scanner disabled
polipo disabled
postfix disabled
postgresql disabled
pppd-dns disabled
procmail disabled
redis disabled
redis-server disabled
redsocks disabled
rpcbind disabled
samba disabled
smbd disabled
saned disabled
snmpd disabled
ssh disabled
stunnel4 disabled
winbind disabled
thin disabled
tinyproxy disabled
tor disabled
udftools disabled
pure-ftpd disabled
#
# Whitelist
# List of whitelisted init scripts
#
acpid enabled
acpi-fakekey enabled
......@@ -171,9 +148,6 @@ keymap.sh enabled
kmod enabled
libvirt-bin enabled
libvirt-guests enabled
lightdm enabled
live-config enabled
live-boot enabled
loadcpufreq enabled
lvm2 enabled
lxc enabled
......@@ -188,14 +162,12 @@ mountnfs.sh enabled
mtab.sh enabled
networking enabled
network-manager enabled
nfs-common enabled
pppd-dns enabled
procps enabled
pulseaudio enabled
qemu-kvm enabled
rc.local enabled
rdnssd enabled
resolvconf enabled
restorecond enabled
rmnologin enabled
rsync enabled
......
......@@ -129,10 +129,25 @@ sub make_sysv_links {
sub make_systemd_links {
my ($scriptname, $action) = @_;
# If called by systemctl (via systemd-sysv-install), do nothing to avoid
# an endless loop.
if (defined($ENV{_SKIP_SYSTEMD_NATIVE}) && $ENV{_SKIP_SYSTEMD_NATIVE} == 1) {
return;
}
# If systemctl is available, let's use that to create the symlinks.
if (-x "/bin/systemctl") {
# Set this env var to avoid loop in systemd-sysv-install.
local $ENV{SYSTEMCTL_SKIP_SYSV} = 1;
# Use --quiet to mimic the old update-rc.d behaviour.
system("systemctl", "--quiet", "$action", "$scriptname");
return;
}
# In addition to the insserv call we also enable/disable the service
# for systemd by creating the appropriate symlink in case there is a
# native systemd service. We need to do this on our own instead of
# using systemctl because systemd might not even be installed yet.
# native systemd service. In case systemd is not installed we do this
# on our own instead of using systemctl.
my $service_path;
if (-f "/etc/systemd/system/$scriptname.service") {
$service_path = "/etc/systemd/system/$scriptname.service";
......@@ -293,15 +308,17 @@ sub create_sequence {
};
my @sequence;
if ($openrc_installed) {
push @sequence, $openrc;
}
if ($insserv_installed) {
push @sequence, $sysv_insserv;
}
else {
push @sequence, $sysv_plain;
}
# OpenRC has to be after sysv_{insserv,plain} because it depends on them to synchronize
# states.
if ($openrc_installed) {
push @sequence, $openrc;
}
push @sequence, $systemd;
return @sequence;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment