Browse Source

Merge remote-tracking branch 'origin/master'

master
parazyd 5 years ago
parent
commit
5623b0ab8d
Signed by untrusted user: parazyd GPG Key ID: F0CB28FCF78637DE
  1. 2
      debian/bootlogd.postinst
  2. 100
      debian/changelog
  3. 62
      debian/control
  4. 6
      debian/rules
  5. 8
      debian/src/bootlogd/etc/init.d/bootlogd
  6. 1
      debian/src/bootlogd/etc/init.d/stop-bootlogd
  7. 1
      debian/src/bootlogd/etc/init.d/stop-bootlogd-single
  8. 3
      debian/src/initscripts/etc/default/rcS
  9. 4
      debian/src/initscripts/etc/default/tmpfs
  10. 2
      debian/src/initscripts/etc/init.d/umountfs
  11. 19
      debian/src/initscripts/etc/init.d/umountroot
  12. 34
      debian/src/initscripts/lib/init/mount-functions.sh
  13. 3
      debian/src/initscripts/man/rcS.5
  14. 3
      debian/src/initscripts/man/tmpfs.5
  15. 1
      debian/sysvinit-utils.install
  16. 12
      debian/sysvinit.NEWS
  17. 1
      debian/sysvinit.dirs
  18. 1
      debian/sysvinit.links
  19. 0
      debian/vars.sh

2
debian/bootlogd.postinst

@ -18,7 +18,7 @@ for F in /var/log/boot
do
if [ ! -f "$F" ] && touch "$F" >/dev/null 2>&1
then
echo "(Nothing has been logged yet.)" >| "$F"
echo "(Nothing has been logged yet. If you're still seeing this message your current init system might not write bootup messages to the system console at all.)" >| "$F"
chown root:adm "$F"
chmod 640 "$F"
fi

100
debian/changelog

@ -1,3 +1,103 @@
sysvinit (2.88dsf-59.9) UNRELEASED; urgency=medium
[ Martin Pitt ]
* Mark sysvinit-utils as Multi-Arch: foreign, like sysv-rc and initscripts.
[ Michael Biebl ]
* Demote priority of sysv-rc and initscripts to optional.
[ Petter Reinholdtsen ]
* Avoid remounting tmpfs, linprocfs and linsysfs on kFreeBSD
(Closes: #833687). These file systems are not remountable. The
change avoid a warning from mount. Based on Patch from Jon Boden.
[ Ian Jackson ]
* Add myself to Uploaders, as part of adopting the package.
Closes:#811377 (RFA bug).
* Add Benda Xu to Uploaders, as requested in #811377.
[ Ben Hutchings ]
* Keep /usr mounted read-only on shutdown (Closes: #757083)
-- Ian Jackson <ijackson@chiark.greenend.org.uk> Wed, 18 Jan 2017 23:23:35 +0000
sysvinit (2.88dsf-59.8) unstable; urgency=medium
* Non-maintainer upload.
[ Benda Xu ]
* Add openrc to the dependencies of initscripts and sysvinit-core.
openrc is going to drop Provides: sysv-rc.
[ Michael Biebl ]
* Update Vcs-* fields to use the canonical alioth URLs and prefer https://.
* Drop obsolete Conflicts, Breaks and Replaces from pre-wheezy.
* Drop Suggests: sash from sysvinit-utils. It is obsolete now that we use
the sulogin implementation from util-linux.
* Move Suggests: bootlogd from sysvinit-utils to sysvinit-core. Under
systemd, bootlogd is non-functional. So only suggest its installation when
sysvinit-core is the active init system. (Closes: #754443)
* Document that /etc/default/{rcS,tmpfs} are ignored when systemd is the
active init system. (Closes: #776963)
* Drop transitional sysvinit package. It has served its purpose for the
wheezy → jessie transition and keeping it around for longer only leads to
confusion as it doesn't setup /etc/inittab which is necessary to boot with
SysV. This functionality has moved into sysvinit-core, which should be
used instead in such a case. (Closes: #781766)
-- Michael Biebl <biebl@debian.org> Wed, 20 Jul 2016 15:28:28 +0200
sysvinit (2.88dsf-59.7) unstable; urgency=medium
* Non-maintainer upload.
* Drop sysvinit-utils' versioned Breaks: on initscripts, as this causes apt
to fail upgrades because of Breaks/Depends loops on essential packages.
Only keep the Replaces: for moving vars.sh. (Closes: #827705)
-- Martin Pitt <mpitt@debian.org> Wed, 22 Jun 2016 12:33:26 +0200
sysvinit (2.88dsf-59.6) unstable; urgency=medium
* Non-maintainer upload.
* Bump versioned initscripts dependency to sysvinit-utils to ensure that we
get the one with vars.sh. (Closes: #827212)
-- Martin Pitt <mpitt@debian.org> Mon, 13 Jun 2016 22:04:06 +0300
sysvinit (2.88dsf-59.5) unstable; urgency=medium
* Non-maintainer upload.
[ Andreas Henriksson ]
* bootlogd: mention it won't do anything under systemd (Closes: #791907)
[ Martin Pitt ]
* Move /lib/init/vars.sh from initscripts to sysvinit-utils. It's not
specific to initscripts, but API for other init scripts similar to
/lib/init/init-d-script. This will allow initscripts to drop from the
default installation. (Closes: #826205)
* Drop startpar dependency from sysvinit-utils. It's only being used by
sysv-rc and remains a dependency of that. (Closes: #825937)
-- Martin Pitt <mpitt@debian.org> Wed, 08 Jun 2016 15:25:01 +0200
sysvinit (2.88dsf-59.4) unstable; urgency=medium
* Non-maintainer upload.
[ Petter Reinholdtsen ]
* Fix typo in init-d-script(5) reported by Eric S. Raymond.
[ Andreas Henriksson ]
* sysvinit-utils: move util-linux back to Depends (instead of Breaks)
- that's where it belonged and can be put now that the cyclic-dep
(via initscripts pkg) workaround is no longer needed.
- also bump util-linux version to the one with the matching change.
Closes: #823569
* Add a basic debian/gbp.conf with debian/upstream branch names
-- Andreas Henriksson <andreas@fatal.se> Fri, 06 May 2016 05:55:46 +0200
sysvinit (2.88dsf-59.3+devuan2) unstable; urgency=medium
* fix upstream-tag var

62
debian/control

@ -30,7 +30,7 @@ Package: sysvinit-core
Priority: extra
Architecture: any
Depends: initscripts (>= 2.88dsf-13.3),
sysv-rc | file-rc,
sysv-rc | file-rc | openrc,
sysvinit-utils (>= 2.86.ds1-66),
${shlibs:Depends},
${misc:Depends},
@ -40,6 +40,7 @@ Depends: initscripts (>= 2.88dsf-13.3),
kbdcontrol (>= 8.2+ds2-6) [kfreebsd-any]
Conflicts: systemd-sysv, upstart
Replaces: sysvinit (<< 2.88dsf-44~), systemd-sysv, upstart
Suggests: bootlogd
Description: System-V-like init utilities
This package contains programs required for booting
a Debian system and doing basic process management.
@ -50,16 +51,15 @@ Description: System-V-like init utilities
other processes are descended from it.
Package: sysvinit-utils
Priority: required
Essential: yes
Architecture: any
Conflicts: last, sysvconfig, chkconfig (<< 11.0-79.1-2), startpar (<< 0.58-2)
Replaces: last, sysvinit (<= 2.86.ds1-65)
Multi-Arch: foreign
Replaces: initscripts (<< 2.88dsf-59.5)
Depends: ${shlibs:Depends}, ${misc:Depends}, init-system-helpers (>= 1.25~)
, startpar
Breaks: upstart (<< 1.5-0ubuntu5), systemd (<< 215)
# sulogin, last, lastb and mesg was moved to the util-linux package
, util-linux (<< 2.26.2-3)
Suggests: bootlogd, sash
, util-linux (>> 2.28-2~)
Breaks: systemd (<< 215)
Description: System-V-like utilities
This package contains the important System-V-like utilities.
.
@ -77,7 +77,7 @@ Depends:
sysvinit-utils (>= 2.86.ds1-62),
insserv (>> 1.12.0-10)
, startpar
Breaks: initscripts (<< 2.86.ds1-63), systemd (<< 215)
Breaks: systemd (<< 215)
Description: System-V-like runlevel change mechanism
This package provides support for the System-V like system
for booting, changing runlevels, and shutting down,
@ -90,51 +90,14 @@ Depends:
${shlibs:Depends}, ${misc:Depends}, ${mount:Depends},
debianutils (>= 4),
lsb-base (>= 3.2-14),
sysvinit-utils (>= 2.88dsf-50), sysv-rc | file-rc,
sysvinit-utils (>= 2.88dsf-59.5), sysv-rc | file-rc | openrc,
coreutils (>= 5.93),
Recommends: psmisc, e2fsprogs
Conflicts:
libdevmapper1.02.1 (<< 2:1.02.24-1),
Replaces: libc6, libc6.1, libc0.1, libc0.3
Breaks:
# Needed for ifquery
ifupdown (<< 0.7.46),
# /bin/mountpoint was moved to util-linux
util-linux (<< 2.26.2-4~),
# Packages using /lib/init/rw which must transition to /run.
# These breaks may be removed after wheezy is released.
aide (<< 0.15.1-5),
atm-tools (<< 1:2.5.1-1.3),
console-common (<< 0.7.86),
console-setup (<< 1.74),
cruft (<< 0.9.16),
eepc-acpi-scripts (<< 1.1.12),
fcheck (<< 2.7.59-16),
hostapd (<< 1:0.7.3-3),
live-build (<< 3.0~a26-1),
ltsp-client-core (<< 5.2.16-1),
mdadm (<< 3.2.2-1),
nbd-client (<< 1:2.9.23-1),
nfs-common (<< 1:1.2.5-3),
portmap (<< 6.0.0-2),
readahead-fedora (<< 2:1.5.6-3),
resolvconf (<< 1.49),
rpcbind (<< 0.2.0-7),
rsyslog (<< 5.8.2-2),
splashy (<< 0.3.13-5.1+b1),
sysklogd (<< 1.5-6.2),
wpasupplicant (<< 0.7.3-4),
xymon (<< 4.3.0~beta2.dfsg-9),
selinux-policy-default (<= 2:0.2.20100524-9),
# Packages relying on a writable /etc/mtab which need fixing
# before they can work with /proc/mounts and utab with libmount.
libpam-mount (<< 2.13-1),
autofs (<< 5.0.0),
# Older versions of initramfs-tools can't cope with /etc/mtab
# being a symlink #668616 and #668650
initramfs-tools (<< 0.104),
# Needed for transition to dependency-based boot for wheezy
bootchart (<< 0.10~svn407-4),
# Older versions of hurd do not implement the neccessary functionality
hurd (<< 0.5.git20131101~)
Description: scripts for initializing and shutting down the system
@ -143,10 +106,11 @@ Description: scripts for initializing and shutting down the system
Package: bootlogd
Architecture: any
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.2-14)
Replaces: sysvinit-utils (<< 2.88dsf-17), initscripts (<< 2.88dsf-17)
Breaks: sysvinit-utils (<< 2.88dsf-17), initscripts (<< 2.88dsf-17)
Description: daemon to log boot messages
bootlogd logs all messages printed to the system console during system boot,
and records those messages to a logfile.
.
Note that not all init systems print messages to the system console,
so that the logfile may remain empty; this is the case with systemd
(the default init system). Try "journalctl -b" instead.

6
debian/rules

@ -5,7 +5,6 @@ sysvtmp = $(CURDIR)/debian/sysvinit-core
utiltmp = $(CURDIR)/debian/sysvinit-utils
rctmp = $(CURDIR)/debian/sysv-rc
inittmp = $(CURDIR)/debian/initscripts
sysvinittmp = $(CURDIR)/debian/sysvinit
bootlogdtmp = $(CURDIR)/debian/bootlogd
doc = /usr/share/doc
@ -68,9 +67,6 @@ override_dh_install-arch:
$(sysvtmp)/usr/share/sysvinit/inittab ; \
fi
#$(INSTALL) debian/share/update-rc.d $(sysvtmp)/usr/share/sysvinit/
$(INSTALL) $(tmp)/sbin/init $(sysvinittmp)/lib/sysvinit/
# initscripts package may include /sys
ifneq (,$(findstring $(DEB_HOST_ARCH_OS),linux kfreebsd))
$(INSTALL) -d $(inittmp)/sys
@ -82,8 +78,6 @@ install-arch: build-arch
override_dh_installchangelogs-arch:
dh_installchangelogs -psysvinit-core doc/Changelog
dh_installchangelogs -psysvinit
dh_installchangelogs -psysvinit-utils doc/Changelog
sed -i -ne '/sysvinit (2.86.ds1-47)/q' -e p \
$(utiltmp)$(doc)/sysvinit-utils/changelog.Debian

8
debian/src/bootlogd/etc/init.d/bootlogd

@ -35,6 +35,14 @@ case "$0" in
;;
esac
if [ -d /run/system/system ]; then
if [ "$ACTION" = start ] && [ -f /var/log/boot ]; then
echo "(Booted up using systemd which doesn't write logs to system console. Please check 'journalctl -b' instead.)" > /var/log/boot
fi
log_daemon_msg "Skipping $NAME while running systemd"
exit 0
fi
case "$ACTION" in
start)
# PATH is set above

1
debian/src/bootlogd/etc/init.d/stop-bootlogd

@ -13,6 +13,7 @@ NAME=stop-bootlogd
DAEMON=/sbin/bootlogd
[ -x "$DAEMON" ] || exit 0
[ -d /run/systemd/system ] && exit 0
case "$1" in
start)

1
debian/src/bootlogd/etc/init.d/stop-bootlogd-single

@ -21,6 +21,7 @@ NAME=stop-bootlogd-single
DAEMON=/sbin/bootlogd
[ -x "$DAEMON" ] || exit 0
[ -d /run/systemd/system ] && exit 0
case "$1" in
start)

3
debian/src/initscripts/etc/default/rcS

@ -1,3 +1,6 @@
##################################################################
# NOTE: This file is ignored when systemd is used as init system #
##################################################################
#
# /etc/default/rcS
#

4
debian/src/initscripts/etc/default/tmpfs

@ -1,3 +1,7 @@
##################################################################
# NOTE: This file is ignored when systemd is used as init system #
##################################################################
#
# Configuration for tmpfs filesystems mounted in early boot, before
# filesystems from /etc/fstab are mounted. For information about
# these variables see the tmpfs(5) manual page.

2
debian/src/initscripts/etc/init.d/umountfs

@ -17,7 +17,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
umask 022
do_stop () {
PROTECTED_MOUNTS="$(sed -n ':a;/^[^ ]* \/ /!{H;n;ba};{H;s/.*//;x;s/\n//;p}' /proc/mounts)"
PROTECTED_MOUNTS="$(sed -n ':a;/^[^ ]* \(\/\|\/usr\) /!{H;n;ba};{H;s/.*//;x;s/\n//;p}' /proc/mounts)"
WEAK_MTPTS="" # be gentle, don't use force
REG_MTPTS=""
TMPFS_MTPTS=""

19
debian/src/initscripts/etc/init.d/umountroot

@ -6,7 +6,7 @@
# Should-Stop: halt reboot kexec
# Default-Start:
# Default-Stop: 0 6
# Short-Description: Mount the root filesystem read-only.
# Short-Description: Mount the root and /usr filesystems read-only.
### END INIT INFO
PATH=/sbin:/bin
@ -14,21 +14,28 @@ PATH=/sbin:/bin
. /lib/lsb/init-functions
do_stop () {
[ "$VERBOSE" = no ] || log_action_begin_msg "Mounting root filesystem read-only"
remount_ro () {
[ "$VERBOSE" = no ] || log_action_begin_msg "Mounting $1 filesystem read-only"
MOUNT_FORCE_OPT=
[ "$(uname -s)" = "GNU/kFreeBSD" ] && MOUNT_FORCE_OPT=-f
# This:
# mount -n -o remount,ro /
# will act on a bind mount of / if there is one.
# See #339023 and the comment in checkroot.sh
mount $MOUNT_FORCE_OPT -n -o remount,ro -t dummytype dummydev / 2>/dev/null \
|| mount $MOUNT_FORCE_OPT -n -o remount,ro dummydev / 2>/dev/null \
|| mount $MOUNT_FORCE_OPT -n -o remount,ro /
mount $MOUNT_FORCE_OPT -n -o remount,ro -t dummytype dummydev $2 2>/dev/null \
|| mount $MOUNT_FORCE_OPT -n -o remount,ro dummydev $2 2>/dev/null \
|| mount $MOUNT_FORCE_OPT -n -o remount,ro $2
ES=$?
[ "$VERBOSE" = no ] || log_action_end_msg $ES
}
do_stop () {
remount_ro root /
if mountpoint -q /usr; then
remount_ro /usr /usr
fi
}
case "$1" in
start|status)
# No-op

34
debian/src/initscripts/lib/init/mount-functions.sh

@ -174,6 +174,19 @@ domount () {
# Mount options from fstab
FSTAB_OPTS=
if [ "$MOUNTMODE" = remount ] ; then
case "$KERNEL" in
*FreeBSD)
case "$PRIFSTYPE" in
proc|tmpfs|sysfs)
# can't be remounted
return 0
;;
esac
;;
esac
fi
if [ "$PRIFSTYPE" = proc ]; then
case "$KERNEL" in
Linux) FSTYPE=proc ;;
@ -459,6 +472,16 @@ post_mountall ()
mount_run ()
{
MNTMODE="$1"
KERNEL="$(uname -s)"
if [ "$MNTMODE" = remount ] ; then
case "$KERNEL" in
*FreeBSD)
# tmpfs can't be remounted
return 0
;;
esac
fi
# Needed to determine if root is being mounted read-only.
read_fstab
@ -489,6 +512,16 @@ mount_run ()
mount_lock ()
{
MNTMODE="$1"
KERNEL="$(uname -s)"
if [ "$MNTMODE" = remount ] ; then
case "$KERNEL" in
*FreeBSD)
# tmpfs can't be remounted
return 0
;;
esac
fi
# Make lock directory as the replacement for /var/lock
[ -d /run/lock ] || mkdir --mode=755 /run/lock
@ -504,7 +537,6 @@ mount_lock ()
fi
fi
KERNEL="$(uname -s)"
NODEV="nodev,"
case "$KERNEL" in
*FreeBSD|GNU) NODEV="" ;;

3
debian/src/initscripts/man/rcS.5

@ -11,6 +11,9 @@ VAR=VAL
Only one assignment is allowed per line.
Comments (starting with '#') are also allowed.
.PP
\fBNOTE: This file is ignored when systemd is used as init system.\fP
.SH OPTIONS
The following variables can be set.

3
debian/src/initscripts/man/tmpfs.5

@ -96,6 +96,9 @@ tmpfs /tmp tmpfs nodev,nosuid,size=20%,mode=1777 0 0
.IP
Packages can not expect directories in /tmp to exist after boot.
.PP
\fBNOTE: This file is ignored when systemd is used as init system.\fP
.SH OPTIONS
The following variables can be set.

1
debian/sysvinit-utils.install

@ -4,3 +4,4 @@ usr/share/man/man8/fstab-decode.8
usr/share/man/man8/killall5.8
usr/share/man/man8/pidof.8
debian/init-d-script lib/init
debian/vars.sh lib/init

12
debian/sysvinit.NEWS

@ -1,12 +0,0 @@
sysvinit (2.86.ds1-10) unstable; urgency=low
In version 2.86.ds1-10 of the initscripts package the shell function
library /etc/init.d/bootclean.sh has been replaced by a new script
/etc/init.d/bootclean. If you made changes to the former in order
to customize the way files are cleaned at boot time then you will
have to port your changes to the new script. /etc/init.d/bootclean
continues to respect the TMPTIME variable and, in particular, does
not do any cleaning if TMPTIME is set to "infinite". See rcS(5).
-- Thomas Hood <jdthood@yahoo.co.uk> Sun, 15 Jan 2006 13:38:42 +0100

1
debian/sysvinit.dirs

@ -1 +0,0 @@
lib/sysvinit/

1
debian/sysvinit.links

@ -1 +0,0 @@
lib/sysvinit/init lib/sysvinit/telinit

0
debian/src/initscripts/lib/init/vars.sh → debian/vars.sh

Loading…
Cancel
Save