Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sysvinit for openSUSE:Factory
checked in at 2021-03-10 08:48:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sysvinit (Old)
and /work/SRC/openSUSE:Factory/.sysvinit.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysvinit"
Wed Mar 10 08:48:30 2021 rev:174 rq:875937 version:2.99
Changes:
--------
--- /work/SRC/openSUSE:Factory/sysvinit/powerd.changes 2019-06-25
22:16:50.636664190 +0200
+++ /work/SRC/openSUSE:Factory/.sysvinit.new.2378/powerd.changes
2021-03-10 08:48:50.630368050 +0100
@@ -1,0 +2,5 @@
+Wed Nov 25 15:04:45 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/sysvinit/sysvinit.changes 2020-12-09
22:12:13.675116097 +0100
+++ /work/SRC/openSUSE:Factory/.sysvinit.new.2378/sysvinit.changes
2021-03-10 08:48:50.970368401 +0100
@@ -1,0 +2,12 @@
+Mon Feb 22 16:00:28 UTC 2021 - Dr. Werner Fink <wer...@suse.de>
+
+- Update to sysvinit 2.99:
+ * Mostly typo and just better documentation and easier to read
+ code comments
+
+-------------------------------------------------------------------
+Wed Nov 25 15:04:42 UTC 2020 - Ludwig Nussel <lnus...@suse.de>
+
+- prepare usrmerge (boo#1029961)
+
+-------------------------------------------------------------------
Old:
----
sysvinit-2.98.tar.xz
New:
----
sysvinit-2.99.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ powerd.spec ++++++
--- /var/tmp/diff_new_pack.6WfoG4/_old 2021-03-10 08:48:51.650369102 +0100
+++ /var/tmp/diff_new_pack.6WfoG4/_new 2021-03-10 08:48:51.654369106 +0100
@@ -1,7 +1,7 @@
#
# spec file for package powerd
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,12 @@
#
+%if 0%{?usrmerged}
+%define sbindir %_sbindir
+%else
+%define sbindir /sbin
+%endif
+
Name: powerd
Version: 2.0.2
Release: 0
@@ -50,9 +56,9 @@
RPM_OPT_FLAGS="${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS) -pipe"
CC=%__cc
export RPM_OPT_FLAGS CC
- %configure --prefix= --bindir='$(DESTDIR)/sbin' \
+ %configure --prefix= --bindir='$(DESTDIR)%{sbindir}' \
--mandir='$(DESTDIR)%{_mandir}' \
- --sbindir='$(DESTDIR)/sbin'
+ --sbindir='$(DESTDIR)%{sbindir}'
make %{?_smp_mflags} CFLAGS="-I. $RPM_OPT_FLAGS -DWITH_SYSVINIT"
%install
@@ -71,7 +77,7 @@
echo '# systemctl start powerd.service' >> %{buildroot}/etc/powerd.conf
mkdir -p %{buildroot}/%{_unitdir}
install -m 0644 %{S:2} %{buildroot}/%{_unitdir}/powerd.service
- ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpowerd
+ ln -sf service %{buildroot}%{_sbindir}/rcpowerd
%pre
%service_add_post powerd.service
@@ -89,8 +95,8 @@
%defattr (-,root,root,755)
%license COPYING
%doc README SUPPORTED FAQ powerd.conf.monitor powerd.conf.peer
-/sbin/powerd
-/sbin/detectups
+%{sbindir}/powerd
+%{sbindir}/detectups
%{_sbindir}/rcpowerd
%config /etc/powerd.conf
%attr(0644,root,root) %{_unitdir}/powerd.service
++++++ sysvinit.spec ++++++
--- /var/tmp/diff_new_pack.6WfoG4/_old 2021-03-10 08:48:51.674369127 +0100
+++ /var/tmp/diff_new_pack.6WfoG4/_new 2021-03-10 08:48:51.678369131 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sysvinit
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,17 @@
#
+%if 0%{?usrmerged}
+%define sbindir %_sbindir
+%define bindir %_bindir
+%else
+%define sbindir /sbin
+%define bindir /bin
+%endif
+
Name: sysvinit
%define KPVER 2.23
-%define SIVER 2.98
+%define SIVER 2.99
%define START 0.65
Version: %{SIVER}
Release: 0
@@ -105,23 +113,30 @@
rm -vf %{buildroot}/usr/include/initreq.h
# pidof is part of procps-ng; let's remove the symlinks to killproc5 here
rm -f %{buildroot}{/sbin,/bin,%{_mandir}/man8}/pidof{,.8}
+%if 0%{?usrmerged}
+# it's all hardcoded in Makefiles so move here
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_sbindir}
+mv %{buildroot}/bin/* %{buildroot}%{_bindir}
+mv %{buildroot}/sbin/* %{buildroot}%{_sbindir}
+%endif
%files tools
%defattr (-,root,root,755)
%license COPYING COPYRIGHT
%doc doc/Propaganda doc/Changelog doc/killproc
-/bin/usleep
-/bin/fsync
-/sbin/fstab-decode
-/sbin/checkproc
-/sbin/pidofproc
-/sbin/killproc
-/sbin/killall5
-/sbin/startproc
-/sbin/rvmtab
-/sbin/vhangup
-/sbin/mkill
-/sbin/start_daemon
+%{bindir}/usleep
+%{bindir}/fsync
+%{sbindir}/fstab-decode
+%{sbindir}/checkproc
+%{sbindir}/pidofproc
+%{sbindir}/killproc
+%{sbindir}/killall5
+%{sbindir}/startproc
+%{sbindir}/rvmtab
+%{sbindir}/vhangup
+%{sbindir}/mkill
+%{sbindir}/start_daemon
%{_bindir}/startpar
%doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz
++++++ sysvinit-2.90-no-kill.patch ++++++
--- /var/tmp/diff_new_pack.6WfoG4/_old 2021-03-10 08:48:51.718369172 +0100
+++ /var/tmp/diff_new_pack.6WfoG4/_new 2021-03-10 08:48:51.718369172 +0100
@@ -43,7 +43,7 @@
* Read the proc filesystem.
* CWD must be /proc to avoid problems if / is affected by the killing (ie
depend on fuse).
*/
-@@ -683,6 +715,26 @@ int readproc(int do_stat)
+@@ -676,6 +708,26 @@ int readproc(int do_stat)
p->nfs = 0;
switch (do_stat) {
++++++ sysvinit-2.98.tar.xz -> sysvinit-2.99.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/README new/sysvinit-2.99/README
--- old/sysvinit-2.98/README 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/README 2021-02-21 19:02:25.000000000 +0100
@@ -1,7 +1,7 @@
README for SysV init
====================
-SysV init is a classic initilization program (PID 1) for GNU/Linux and
+SysV init is a classic initialization program (PID 1) for GNU/Linux and
other UNIX/POSIX systems. It is designed to be small, simple and to
stay out of the way.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/contrib/alexander.viro
new/sysvinit-2.99/contrib/alexander.viro
--- old/sysvinit-2.98/contrib/alexander.viro 2020-11-17 02:52:07.000000000
+0100
+++ new/sysvinit-2.99/contrib/alexander.viro 2021-02-21 19:02:25.000000000
+0100
@@ -1,4 +1,4 @@
-I proposed moving some stuff to a seperate file, such as the
+I proposed moving some stuff to a separate file, such as the
re-exec routines. Alexander wrote:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/doc/Changelog
new/sysvinit-2.99/doc/Changelog
--- old/sysvinit-2.98/doc/Changelog 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/doc/Changelog 2021-02-21 19:02:25.000000000 +0100
@@ -1,7 +1,12 @@
+sysvinit (2.99) released; urgency=low
+
+ * Fixed typos and missing underlines in shutdown manual page.
+ Corrections provided by Helge Kreutzmann.
+
sysvinit (2.98) released; urgency=low
* Fixed time parsing in shutdown when there is a + in front of a 0 time
offset.
- Commands with a postiive time offset (+1) would work but +0 fails.
+ Commands with a positive time offset (+1) would work but +0 fails.
This has been corrected by Arkadiusz Miskiewicz.
sysvinit (2.97) released; urgency=low
@@ -30,8 +35,8 @@
[ Jesse Smith ]
- * Added -z command line paramter to pidof which tells pidof to
- try to find processes in uninterruptable (D) or zombie (Z) states.
+ * Added -z command line parameter to pidof which tells pidof to
+ try to find processes in uninterruptible (D) or zombie (Z) states.
This can cause pidof to hang, but produces a more complete process
list.
Closes Savannah bug #56534
@@ -89,7 +94,7 @@
shutting down procedure, it should cause the system to
be powered off.
If halt is called without -p then the value of INIT_HALT
- is not set and the default action (often set in /etc/defaut/halt)
+ is not set and the default action (often set in /etc/default/halt)
is taken.
* Removed unnecessary malloc.h includes. Memory allocation
and freeing is now handled in stdlib.h
@@ -175,7 +180,7 @@
* Removed typos from pidof manual page and killall5 page.
Closes Debian bugs #815839, #905245 and #890478
* Added -f <format> option to pidof program to allow printf
- style formating.
+ style formatting.
Closes Debian bug #571590
Thanks to Philipp Marek for the patch.
* Added new tool (readbootlog) which will read the /var/log/boot file
@@ -365,7 +370,7 @@
This should close Savannah bug report 36528.
http://savannah.nongnu.org/bugs/?36528
* Applied patches provided in Savannah bug report 49991. Fix tabs in
- bootlogd and avoid printing unitialized "buf" variable when
+ bootlogd and avoid printing uninitialized "buf" variable when
consolename() fails.
[ Werner Fink ]
@@ -374,7 +379,7 @@
* Handle deleted binaries in pidof (was local bug #34992)
* Allow init to delete extra environment variables (was local bug
#35858)
- * Avoid that init double environment variables for its childs
+ * Avoid that init double environment variables for its children
(was local bug #35855)
* Remove man-db tag for encoding for canonical man
* Sulogin: try to detect the real device(s) used for the system console
@@ -493,7 +498,7 @@
to disk using fdatasync(). Patch from Scott Gifford via Debian.
* Add compatibility code to handle old path "/etc/powerstatus" for a
while.
- * Incude definition for MNT_DETACH which is missing in older GNU libc
+ * Include definition for MNT_DETACH which is missing in older GNU libc
headers.
* Do not strip binaries before installing them, to make it easier to
get binaries with debug information installed.
@@ -522,8 +527,8 @@
* pidof - provide '-n' to skip stat(2) syscall on network based FS.
* init - avoid compiler warnings
* init - initialize console by using the macros from ttydefaults.h
- * init - add the possiblity to ignore further interrupts from keyboard
- * init - add the possiblity to set sane terminal line settings
+ * init - add the possibility to ignore further interrupts from keyboard
+ * init - add the possibility to set sane terminal line settings
* sulogin - add the possibility to reset the terminal io
* Fix some minor problems
* init - enable is_selinux_enabled() to detect selinuxfs
@@ -539,7 +544,7 @@
#68621, which will add PAM support for programs spawned by init on
the console like sulogin. Based on patch by Topi Miettinen. This
patch is not applied by default yet while we review its
- usefullness. It is only helpful for session handling, as sulogin
+ usefulness. It is only helpful for session handling, as sulogin
do not use and will not use a PAM conv() function. The current
sulogin is able to handle DES as well as MD5, SHA, and Blowfish
encrypted passwords due using getpwnam(3).
@@ -547,7 +552,7 @@
use the correct pid even on a controlling tty
* Remaining problem is that the pid of the second fork() for
getting a controlling tty isn't that reported by spawn()
- * Re-enable writting utmp/wtmp for boot scripts
+ * Re-enable writing utmp/wtmp for boot scripts
* Extend sulogin to support additional encryption algorithms
* Re-enable maintenance message of sulogin
* Enable the sulogin fallback password check to handle MD5, SHA, and
@@ -639,7 +644,7 @@
and document this requirement in the manual page.
* Change reboot/halt to work properly when used as a login shell.
Patch by Dale R. Worley and Fedora.
- * Let sulogin fall back to the staticly linked /bin/sash if both roots
+ * Let sulogin fall back to the statically linked /bin/sash if both roots
shell and /bin/sh fail to execute.
-- Petter Reinholdtsen <p...@hungry.com> Sun, 12 Jul 2009 19:58:10 +0200
@@ -647,11 +652,11 @@
sysvinit (2.86) cistron; urgency=low
* Fixed up bootlogd to read /proc/cmdline. Also keep an internal
- linebuffer to process \r, \t and ^H. It is becoming useable.
+ linebuffer to process \r, \t and ^H. It is becoming usable.
* Applied trivial OWL patches
* Block signals in syslog(), since syslog() is not re-entrant
(James Olin Oden <jo...@malachi.lee.k12.nc.us>, redhat bug #97534)
- * Minor adjustements so that sysvinit compiles on the Hurd
+ * Minor adjustments so that sysvinit compiles on the Hurd
* killall5 now skips kernel threads
* Inittab entries with both 'S' and other runlevels were broken.
Fix by Bryan Kadzban <br...@kadzban.is-a-geek.net>
@@ -880,7 +885,7 @@
* Use siginterrupt, now that system calls are restarted by default.
Main symptom was that the sulogin timeout didn't work but there
might have been more hidden problems.
- * Kill process immidiately if turned off in inittab
+ * Kill process immediately if turned off in inittab
* Fixed sulogin check on tty arg.
* Use strerror() instead of sys_errlist
* wall now supports a '-n' option to suppress [most of] the banner.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/doc/initctl
new/sysvinit-2.99/doc/initctl
--- old/sysvinit-2.98/doc/initctl 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/doc/initctl 2021-02-21 19:02:25.000000000 +0100
@@ -13,7 +13,7 @@
/*
* Because of legacy interfaces, "runlevel" and "sleeptime"
- * aren't in a seperate struct in the union.
+ * aren't in a separate struct in the union.
*
* The weird sizes are because init expects the whole
* struct to be 384 bytes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/man/fstab-decode.8
new/sysvinit-2.99/man/fstab-decode.8
--- old/sysvinit-2.98/man/fstab-decode.8 2020-11-17 02:52:07.000000000
+0100
+++ new/sysvinit-2.99/man/fstab-decode.8 2021-02-21 19:02:25.000000000
+0100
@@ -35,7 +35,7 @@
and \fB/proc/mtab\fR.
In essence fstab-decode can be used anytime we want to pass multiple
-parameters to a command as a list of command line argments. It turns output
+parameters to a command as a list of command line arguments. It turns output
like this:
.nf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/man/initctl.5
new/sysvinit-2.99/man/initctl.5
--- old/sysvinit-2.98/man/initctl.5 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/man/initctl.5 2021-02-21 19:02:25.000000000 +0100
@@ -36,7 +36,7 @@
/*
* Because of legacy interfaces, "runlevel" and "sleeptime"
- * aren't in a seperate struct in the union.
+ * aren't in a separate struct in the union.
*
* The weird sizes are because init expects the whole
* struct to be 384 bytes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/man/shutdown.8
new/sysvinit-2.99/man/shutdown.8
--- old/sysvinit-2.98/man/shutdown.8 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/man/shutdown.8 2021-02-21 19:02:25.000000000 +0100
@@ -35,10 +35,10 @@
.\"{{{ Description
.SH DESCRIPTION
\fBshutdown\fP brings the system down in a secure way. All logged-in users are
-notified that the system is going down, and \fBlogin\fP(1) is blocked.
+notified that the system is going down, and \fIlogin\fP(1) is blocked.
It is possible to shut the system down immediately or after a specified delay.
All processes are first notified that the system is going down by the
-signal \s-2SIGTERM\s0. This gives programs like \fBvi\fP(1)
+signal \s-2SIGTERM\s0. This gives programs like \fIvi\fP(1)
the time to save the file being edited,
mail and news processing programs a chance to exit cleanly, etc.
\fBshutdown\fP does its job by signalling the \fBinit\fP process,
@@ -66,30 +66,30 @@
.\"}}}
.\"{{{ -h
.IP \fB\-h\fP
-Halt or power off after shutdown. Usually used with the -P or -H flags,
+Halt or power off after shutdown. Usually used with the \fI-P\fP or \fI-H\fP
flags,
depending on whether we want to poweroff or simply stop the operating system.
.\"}}}
.\"{{{ -P
.IP \fB\-P\fP
-Modifier to the -h flag. Halt action is to turn off the power.
-Must be used with the -h flag.
+Modifier to the \fI-h\fP flag. Halt action is to turn off the power.
+Must be used with the \fI-h\fP flag.
.\"}}}
.\"{{{ -H
.IP \fB\-H\fP
-Modifier to the -h flag. Halt action is to halt or drop into boot
-monitor on systems that support it. Must be used with the -h flag.
+Modifier to the \fI-h\fP flag. Halt action is to halt or drop into boot
+monitor on systems that support it. Must be used with the \fI-h\fP flag.
Halting is often used to run through the shutdown process and leave
output on the screen for debugging purposes. Or when the user wants the OS to
stop, but leave the power on. To power off at the end of the shutdown sequence
-use the -P modifier instead.
+use the \fI-P\fP modifier instead.
.\"}}}
.\"{{{ -f
.IP \fB\-f\fP
-Skip fsck on reboot.
+Skip \fIfsck\fP on reboot.
.\"}}}
.\"{{{ -F
.IP \fB\-F\fP
-Force fsck on reboot.
+Force \fIfsck\fP on reboot.
.\"}}}
.\"{{{ -n
.IP \fB\-n\fP
@@ -114,7 +114,7 @@
.IP \fB\-Q
Silence warnings prior to shutting down. Usually shutdown displays
warnings every 15 minutes and then every minute in the last 10 minutes of the
-countdown until \fItime\fP is reached. When \-Q is specified
+countdown until \fItime\fP is reached. When \fI-Q\fP is specified
shutdown only warns when the shutdown process actually happens. All
other warning intervals are suppressed.
.\"}}}
@@ -126,7 +126,7 @@
three seconds. Warning: when shutdown calls init to perform the shutdown (the
default behaviour), init checks to see if all processes have terminated
and will stop waiting early once its children have all terminated.
-When shutdown is called with the -n flag, it waits the full time specified
+When shutdown is called with the \fI-n\fP flag, it waits the full time
specified
(or three seconds) even if all other processes have terminated.
.\"}}}
.\"{{{ time
@@ -195,7 +195,7 @@
is one user name per line. Empty lines and comment lines (prefixed by a
\fB#\fP) are allowed. Currently there is a limit of 32 users in this file.
.sp 1
-Note that if \fI/etc/shutdown.allow\fP is not present, the \fB-a\fP
+Note that if \fI/etc/shutdown.allow\fP is not present, the \fI-a\fP
argument is ignored.
.SH HALT OR POWEROFF
The \fB-H\fP option just sets the \fIinit\fP environment variable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/consoles.c
new/sysvinit-2.99/src/consoles.c
--- old/sysvinit-2.98/src/consoles.c 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/src/consoles.c 2021-02-21 19:02:25.000000000 +0100
@@ -142,7 +142,7 @@
#endif /* __linux__ */
/*
- * Search below /dev for the characer device in
+ * Search below /dev for the character device in
* the local `dev_t comparedev' variable.
*/
static dev_t comparedev;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/ifdown.c
new/sysvinit-2.99/src/ifdown.c
--- old/sysvinit-2.98/src/ifdown.c 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/src/ifdown.c 2021-02-21 19:02:25.000000000 +0100
@@ -58,7 +58,7 @@
* First, we find all shaper devices and down them. Then we
* down all real interfaces. This is because the comment in the
* shaper driver says "if you down the shaper device before the
- * attached inerface your computer will follow".
+ * attached interface your computer will follow".
*/
int ifdown(void)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/init.c new/sysvinit-2.99/src/init.c
--- old/sysvinit-2.98/src/init.c 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/src/init.c 2021-02-21 19:02:25.000000000 +0100
@@ -541,7 +541,7 @@
__attribute__ ((format (printf, 1, 2)))
#endif
#endif
-/* This function already exists on FreeBSD. No need to delcare it. */
+/* This function already exists on FreeBSD. No need to declare it. */
#ifndef __FreeBSD__
static int setproctitle(char *fmt, ...)
{
@@ -737,7 +737,7 @@
/*
* OOPS: segmentation violation!
- * If we have the info, print where it occured.
+ * If we have the info, print where it occurred.
* Then sleep 30 seconds and try to continue.
*/
static
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/initreq.h
new/sysvinit-2.99/src/initreq.h
--- old/sysvinit-2.98/src/initreq.h 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/src/initreq.h 2021-02-21 19:02:25.000000000 +0100
@@ -63,7 +63,7 @@
/*
* Because of legacy interfaces, "runlevel" and "sleeptime"
- * aren't in a seperate struct in the union.
+ * aren't in a separate struct in the union.
*
* The weird sizes are because init expects the whole
* struct to be 384 bytes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/killall5.c
new/sysvinit-2.99/src/killall5.c
--- old/sysvinit-2.98/src/killall5.c 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/src/killall5.c 2021-02-21 19:02:25.000000000 +0100
@@ -14,7 +14,7 @@
*
* Riku Meskanen, <mes...@jyu.fi>
* - return all running pids of given program name
- * - single shot '-s' option for backwards combatibility
+ * - single shot '-s' option for backwards compatibility
* - omit pid '-o' option and %PPID (parent pid metavariable)
* - syslog() only if not a connected to controlling terminal
* - swapped out programs pids are caught now
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/set.h new/sysvinit-2.99/src/set.h
--- old/sysvinit-2.98/src/set.h 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/src/set.h 2021-02-21 19:02:25.000000000 +0100
@@ -1,7 +1,7 @@
/*
* set.h Macros that look like sigaddset et al. but
* aren't. They are used to manipulate bits in
- * an integer, to do our signal bookeeping.
+ * an integer, to do our signal bookkeeping.
*
* Copyright (C) 2005 Miquel van Smoorenburg.
*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/shutdown.c
new/sysvinit-2.99/src/shutdown.c
--- old/sysvinit-2.98/src/shutdown.c 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/src/shutdown.c 2021-02-21 19:02:25.000000000 +0100
@@ -811,7 +811,7 @@
/* Rather than loop and reduce wt (wait time) once per minute,
we shall check the current time against the target time.
- Then calculate the remaining wating time based on the difference
+ Then calculate the remaining waiting time based on the difference
between current time and target time.
This avoids missing shutdown time (target time) after the
computer has been asleep. -- Jesse
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/shutdown.c.orig
new/sysvinit-2.99/src/shutdown.c.orig
--- old/sysvinit-2.98/src/shutdown.c.orig 2020-11-17 02:52:07.000000000
+0100
+++ new/sysvinit-2.99/src/shutdown.c.orig 1970-01-01 01:00:00.000000000
+0100
@@ -1,844 +0,0 @@
-/*
- * shutdown.c Shut the system down.
- *
- * Usage: shutdown [-krhfnc] time [warning message]
- * -k: don't really shutdown, only warn.
- * -r: reboot after shutdown.
- * -h: halt after shutdown.
- * -f: do a 'fast' reboot (skip fsck).
- * -F: Force fsck on reboot.
- * -n: do not go through init but do it ourselves.
- * -c: cancel an already running shutdown.
- * -t secs: delay between SIGTERM and SIGKILL for init.
- *
- * Author: Miquel van Smoorenburg, miqu...@cistron.nl
- *
- * Version: @(#)shutdown 2.86-1 31-Jul-2004 miqu...@cistron.nl
- *
- * This file is part of the sysvinit suite,
- * Copyright (C) 1991-2004 Miquel van Smoorenburg.
- *
- * This program is free software; you can redistribute it and/or
modify
- * it under the terms of the GNU General Public License as
published by
- * the Free Software Foundation; either version 2 of the License,
or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
- */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE /* otherwise `extern char **environ' is missed */
-#endif
-#ifndef ACCTON_OFF
-# define ACCTON_OFF 0
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#ifdef __linux__
-#include <sys/sysmacros.h> /* brought in my LFS patch */
-#endif
-#include <time.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <stdarg.h>
-#ifdef __FreeBSD__
-#include <utmpx.h>
-#else
-#include <utmp.h>
-#endif
-#include <syslog.h>
-#include "paths.h"
-#include "reboot.h"
-#include "initreq.h"
-#include "init.h"
-
-#ifdef __FreeBSD__
-extern char **environ;
-#endif
-
-#define MESSAGELEN 256
-#define STATELEN 64
-#define WHEN_SIZE 64
-
-/* Whether we should warn system is shutting down */
-#define QUIET_FULL 2
-#define QUIET_PARTIAL 1
-#define QUIET_NONE 0
-
-int dontshut = 0; /* Don't shutdown, only warn */
-char down_level[2]; /* What runlevel to go to. */
-int dosync = 1; /* Sync before reboot or halt */
-int fastboot = 0; /* Do a 'fast' reboot */
-int forcefsck = 0; /* Force fsck on reboot */
-char message[MESSAGELEN]; /* Warning message */
-char *sltime = 0; /* Sleep time */
-char newstate[STATELEN]; /* What are we gonna do */
-int doself = 0; /* Don't use init */
-int got_alrm = 0;
-
-char *clean_env[] = {
- "HOME=/",
- "PATH=" PATH_DEFAULT,
- "TERM=dumb",
- "SHELL=/bin/sh",
- NULL,
-};
-
-/* From "utmp.c" */
-extern void write_wtmp(char *user, char *id, int pid, int type, char *line);
-
-/*
- * Sleep without being interrupted.
- */
-void hardsleep(int secs)
-{
- struct timespec ts, rem;
-
- ts.tv_sec = secs;
- ts.tv_nsec = 0;
-
- while(nanosleep(&ts, &rem) < 0 && errno == EINTR)
- ts = rem;
-}
-
-/*
- * Break off an already running shutdown.
- */
-# ifdef __GNUC__
-void stopit(int sig __attribute__((unused)))
-# else
-void stopit(int sig)
-# endif
-
-{
- unlink(NOLOGIN);
- unlink(FASTBOOT);
- unlink(FORCEFSCK);
- unlink(SDPID);
- printf("\r\nShutdown cancelled.\r\n");
- exit(0);
-}
-
-/*
- * Show usage message.
- */
-void usage(void)
-{
- fprintf(stderr,
- "Usage:\t shutdown [-akrhPHfFnc] [-t sec] time [warning message]\n"
- "\t\t -a: use /etc/shutdown.allow\n"
- "\t\t -k: don't really shutdown, only warn.\n"
- "\t\t -r: reboot after shutdown.\n"
- "\t\t -h: halt after shutdown.\n"
- "\t\t -P: halt action is to turn off power.\n"
- "\t\t can only be used along with -h flag.\n"
- "\t\t -H: halt action is to just halt.\n"
- "\t\t can only be used along with -h flag.\n"
- "\t\t -f: do a 'fast' reboot (skip fsck).\n"
- "\t\t -F: Force fsck on reboot.\n"
- "\t\t -n: do not go through \"init\" but go down real fast.\n"
- "\t\t -c: cancel a running shutdown.\n"
- "\t\t -q: quiet mode - display fewer shutdown warnings.\n"
- "\t\t -Q: full quiet mode - display only final shutdown
warning.\n"
- "\t\t -t secs: delay between warning and kill signal.\n"
- "\t\t ** the \"time\" argument is mandatory! (try \"now\") **\n");
- exit(1);
-}
-
-
-void alrm_handler(int sig)
-{
- got_alrm = sig;
-}
-
-
-/*
- * Set environment variables in the init process.
- */
-int init_setenv(char *name, char *value)
-{
- struct init_request request;
- struct sigaction sa;
- int fd;
- size_t nl, vl;
-
- memset(&request, 0, sizeof(request));
- request.magic = INIT_MAGIC;
- request.cmd = INIT_CMD_SETENV;
- nl = strlen(name);
- vl = value ? strlen(value) : 0;
-
- if (nl + vl + 3 >= (int)sizeof(request.i.data))
- return -1;
-
- memcpy(request.i.data, name, nl);
- if (value) {
- request.i.data[nl] = '=';
- memcpy(request.i.data + nl + 1, value, vl);
- }
-
- /*
- * Open the fifo and write the command.
- * Make sure we don't hang on opening /run/initctl
- */
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = alrm_handler;
- sigaction(SIGALRM, &sa, NULL);
- got_alrm = 0;
- alarm(3);
- if ((fd = open(INIT_FIFO, O_WRONLY)) >= 0) {
- ssize_t p = 0;
- size_t s = sizeof(request);
- void *ptr = &request;
- while (s > 0) {
- p = write(fd, ptr, s);
- if (p < 0) {
- if (errno == EINTR || errno == EAGAIN)
- continue;
- break;
- }
- ptr += p;
- s -= p;
- }
- close(fd);
- alarm(0);
- return 0;
- }
-
- fprintf(stderr, "shutdown: ");
- if (got_alrm) {
- fprintf(stderr, "timeout opening/writing control channel %s\n",
- INIT_FIFO);
- } else {
- perror(INIT_FIFO);
- }
- return -1;
-}
-
-
-/*
- * Tell everyone the system is going down in 'mins' minutes.
- */
-void issue_warn(int mins)
-{
- char buf[MESSAGELEN + sizeof(newstate) + 1];
- int len;
-
- buf[0] = 0;
- strncpy(buf, message, MESSAGELEN);
- len = strlen(buf);
-
- if (mins == 0)
- snprintf(buf + len, sizeof(buf) - len,
- "\rThe system is going down %s NOW!\r\n",
- newstate);
- else
- snprintf(buf + len, sizeof(buf) - len,
- "\rThe system is going DOWN %s in %d minute%s!\r\n",
- newstate, mins, mins == 1 ? "" : "s");
- wall(buf, 0);
-}
-
-/*
- * Create the /etc/nologin file.
- */
-void donologin(int min)
-{
- FILE *fp;
- time_t t;
-
- time(&t);
- t += 60 * min;
-
- if ((fp = fopen(NOLOGIN, "w")) != NULL) {
- fprintf(fp, "\rThe system is going down on %s\r\n", ctime(&t));
- if (message[0]) fputs(message, fp);
- fclose(fp);
- }
-}
-
-/*
- * Spawn an external program.
- */
-int spawn(int noerr, char *prog, ...)
-{
- va_list ap;
- pid_t pid, rc;
- int i;
- char *argv[8];
-
- i = 0;
- while ((pid = fork()) < 0 && i < 10) {
- perror("fork");
- sleep(5);
- i++;
- }
-
- if (pid < 0) return -1;
-
- if (pid > 0) {
- while((rc = wait(&i)) != pid)
- if (rc < 0 && errno == ECHILD)
- break;
- return (rc == pid) ? WEXITSTATUS(i) : -1;
- }
-
- if (noerr) fclose(stderr);
-
- argv[0] = prog;
- va_start(ap, prog);
- for (i = 1; i < 7 && (argv[i] = va_arg(ap, char *)) != NULL; i++)
- ;
- argv[i] = NULL;
- va_end(ap);
-
- if (chdir("/"))
- exit(1);
- environ = clean_env;
-
- execvp(argv[0], argv);
- perror(argv[0]);
- exit(1);
-
- /*NOTREACHED*/
- return 0;
-}
-
-/*
- * Kill all processes, call /etc/init.d/halt (if present)
- */
-void fastdown()
-{
- int do_halt = (down_level[0] == '0');
- int i;
-#if 0
- char cmd[128];
- char *script;
-
- /*
- * Currently, the halt script is either init.d/halt OR rc.d/rc.0,
- * likewise for the reboot script. Test for the presence
- * of either.
- */
- if (do_halt) {
- if (access(HALTSCRIPT1, X_OK) == 0)
- script = HALTSCRIPT1;
- else
- script = HALTSCRIPT2;
- } else {
- if (access(REBOOTSCRIPT1, X_OK) == 0)
- script = REBOOTSCRIPT1;
- else
- script = REBOOTSCRIPT2;
- }
-#endif
-
- /* First close all files. */
- for(i = 0; i < 3; i++)
- if (!isatty(i)) {
- close(i);
- open("/dev/null", O_RDWR);
- }
- for(i = 3; i < 20; i++) close(i);
- close(255);
-
- /* First idle init. */
- if (kill(1, SIGTSTP) < 0) {
- fprintf(stderr, "shutdown: can't idle init: %s.\r\n",
strerror(errno));
- exit(1);
- }
-
- /* Kill all processes. */
- fprintf(stderr, "shutdown: sending all processes the TERM
signal...\r\n");
- kill(-1, SIGTERM);
- sleep(sltime ? atoi(sltime) : WAIT_BETWEEN_SIGNALS);
- fprintf(stderr, "shutdown: sending all processes the KILL signal.\r\n");
- (void) kill(-1, SIGKILL);
-
-#if 0
- /* See if we can run /etc/init.d/halt */
- if (access(script, X_OK) == 0) {
- spawn(1, cmd, "fast", NULL);
- fprintf(stderr, "shutdown: %s returned - falling back "
- "on default routines\r\n", script);
- }
-#endif
-
- /* script failed or not present: do it ourself. */
- /* Give init the chance to collect zombies. */
- /* sleep(1); */
-
- /* Record the fact that we're going down */
- write_wtmp("shutdown", "~~", 0, RUN_LVL, "~~");
-
- /* This is for those who have quota installed. */
-#if defined(ACCTON_OFF)
-# if (ACCTON_OFF > 1) && (_BSD_SOURCE || (_XOPEN_SOURCE && _XOPEN_SOURCE <
500))
- /* This is an alternative way to disable accounting, saving a fork() */
- if (acct(NULL))
- fprintf(stderr, "shutdown: can not stop process accounting:
%s.\r\n", strerror(errno));
-# elif (ACCTON_OFF > 0)
- spawn(1, "accton", "off", NULL);
-# else
- spawn(1, "accton", NULL);
-# endif
-#endif
- spawn(1, "quotaoff", "-a", NULL);
-
- sync();
- fprintf(stderr, "shutdown: turning off swap\r\n");
- spawn(0, "swapoff", "-a", NULL);
- fprintf(stderr, "shutdown: unmounting all file systems\r\n");
- spawn(0, "umount", "-a", NULL);
-
- /* We're done, halt or reboot now. */
- if (do_halt) {
- fprintf(stderr, "The system is halted. Press CTRL-ALT-DEL "
- "or turn off power\r\n");
- init_reboot(BMAGIC_HALT);
- exit(0);
- }
-
- fprintf(stderr, "Please stand by while rebooting the system.\r\n");
- init_reboot(BMAGIC_REBOOT);
- exit(0);
-}
-
-/*
- * Go to runlevel 0, 1 or 6.
- */
-void issue_shutdown(char *halttype)
-{
- char *args[8];
- int argp = 0;
- int do_halt = (down_level[0] == '0');
-
- /* Warn for the last time */
- issue_warn(0);
- if (dontshut) {
- hardsleep(1);
- stopit(0);
- }
- openlog("shutdown", LOG_PID, LOG_USER);
- if (do_halt)
- syslog(LOG_NOTICE, "shutting down for system halt");
- else
- syslog(LOG_NOTICE, "shutting down for system reboot");
- closelog();
-
- /* See if we have to do it ourself. */
- if (doself) fastdown();
-
- /* Create the arguments for init. */
- args[argp++] = INIT;
- if (sltime) {
- args[argp++] = "-t";
- args[argp++] = sltime;
- }
- args[argp++] = down_level;
- args[argp] = (char *)NULL;
-
- unlink(SDPID);
- unlink(NOLOGIN);
-
- /* Now execute init to change runlevel. */
- sync();
- init_setenv("INIT_HALT", halttype);
- execv(INIT, args);
-
- /* Oops - failed. */
- fprintf(stderr, "\rshutdown: cannot execute %s\r\n", INIT);
- unlink(FASTBOOT);
- unlink(FORCEFSCK);
- init_setenv("INIT_HALT", NULL);
- openlog("shutdown", LOG_PID, LOG_USER);
- syslog(LOG_NOTICE, "shutdown failed");
- closelog();
- exit(1);
-}
-
-/*
- * returns if a warning is to be sent for wt
- */
-static int needwarning(int wt, int quiet_mode)
-{
- int ret;
-
- if (quiet_mode == QUIET_FULL) return FALSE;
- else if (quiet_mode == QUIET_PARTIAL)
- {
- if (wt == 10)
- return TRUE;
- else if (wt == 5)
- return TRUE;
- else if ( (wt % 60) == 0)
- return TRUE;
- else
- return FALSE;
- }
- /* no silence setting, print lots of warnings */
- if (wt < 10)
- ret = 1;
- else if (wt < 60)
- ret = (wt % 15 == 0);
- else if (wt < 180)
- ret = (wt % 30 == 0);
- else
- ret = (wt % 60 == 0);
-
- return ret;
-}
-
-/*
- * Main program.
- * Process the options and do the final countdown.
- */
-int main(int argc, char **argv)
-{
- FILE *fp;
- extern int getopt();
- extern int optind;
- struct sigaction sa;
- struct tm *lt;
- struct stat st;
- struct utmp *ut;
- time_t t, target_time;
- char *halttype;
- char *downusers[32];
- char buf[128];
- char term[UT_LINESIZE + 6];
- char *sp;
- char when[WHEN_SIZE];
- int c, i, wt;
- int hours, mins;
- int didnolog = 0;
- int cancel = 0;
- int useacl = 0;
- int pid = 0;
- int user_ok = 0;
- int quiet_level = QUIET_NONE; /* Whether to display shutdown warning
*/
-
- /* We can be installed setuid root (executable for a special group) */
- /*
- This way is risky, do error check on setuid call.
- setuid(geteuid());
- */
- errno = 0;
- if (setuid(geteuid()) == -1) {
- fprintf(stderr, "%s (%d): %s\n", __FILE__, __LINE__,
strerror(errno));
- abort();
- }
-
- if (getuid() != 0) {
- fprintf(stderr, "shutdown: you must be root to do that!\n");
- usage();
- exit(1);
- }
- strcpy(down_level, "1");
- halttype = NULL;
- memset(when, '\0', WHEN_SIZE);
-
- /* Process the options. */
- while((c = getopt(argc, argv, "HPacqQkrhnfFyt:g:i:")) != EOF) {
- switch(c) {
- case 'H':
- halttype = "HALT";
- break;
- case 'P':
- halttype = "POWEROFF";
- break;
- case 'a': /* Access control. */
- useacl = 1;
- break;
- case 'c': /* Cancel an already running shutdown. */
- cancel = 1;
- break;
- case 'k': /* Don't really shutdown, only warn.*/
- dontshut = 1;
- break;
- case 'r': /* Automatic reboot */
- down_level[0] = '6';
- break;
- case 'h': /* Halt after shutdown */
- down_level[0] = '0';
- break;
- case 'f': /* Don't perform fsck after next boot */
- fastboot = 1;
- break;
- case 'F': /* Force fsck after next boot */
- forcefsck = 1;
- break;
- case 'n': /* Don't switch runlevels. */
- doself = 1;
- break;
- case 't': /* Delay between TERM and KILL */
- sltime = optarg;
- break;
- case 'q': /* put into somewhat quiet mode */
- quiet_level = QUIET_PARTIAL;
- break;
- case 'Q': /* put into full quiet mode */
- quiet_level = QUIET_FULL;
- break;
- case 'y': /* Ignored for sysV compatibility */
- break;
- case 'g': /* sysv style to specify time. */
- strncpy(when, optarg, WHEN_SIZE - 1);
- break;
- case 'i': /* Level to go to. */
- if (!strchr("0156aAbBcCsS", optarg[0])) {
- fprintf(stderr,
- "shutdown: `%s': bad runlevel\n",
- optarg);
- exit(1);
- }
- down_level[0] = optarg[0];
- break;
- default:
- usage();
- break;
- }
- }
-
- if (NULL != halttype && down_level[0] != '0') {
- fprintf(stderr, "shutdown: -H and -P flags can only be used
along with -h flag.\n");
- usage();
- exit(1);
- }
-
- /* Do we need to use the shutdown.allow file ? */
- if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) {
-
- /* Read /etc/shutdown.allow. */
- i = 0;
- while(fgets(buf, 128, fp)) {
- if (buf[0] == '#' || buf[0] == '\n') continue;
- if (i > 31) continue;
- for(sp = buf; *sp; sp++) if (*sp == '\n') *sp = 0;
- downusers[i++] = strdup(buf);
- }
- if (i < 32) downusers[i] = 0;
- fclose(fp);
-
- /* Now walk through /var/run/utmp to find logged in users. */
- while(!user_ok && (ut = getutent()) != NULL) {
-
- /* See if this is a user process on a VC. */
- if (ut->ut_type != USER_PROCESS) continue;
- sprintf(term, "/dev/%.*s", UT_LINESIZE, ut->ut_line);
- if (stat(term, &st) < 0) continue;
-#ifdef major /* glibc */
- if (major(st.st_rdev) != 4 ||
- minor(st.st_rdev) > 63) continue;
-#else
- if ((st.st_rdev & 0xFFC0) != 0x0400) continue;
-#endif
- /* Root is always OK. */
- if (strcmp(ut->ut_user, "root") == 0) {
- user_ok++;
- break;
- }
-
- /* See if this is an allowed user. */
- for(i = 0; i < 32 && downusers[i]; i++)
- if (!strncmp(downusers[i], ut->ut_user,
- UT_NAMESIZE)) {
- user_ok++;
- break;
- }
- }
- endutent();
-
- /* See if user was allowed. */
- if (!user_ok) {
- if ((fp = fopen(CONSOLE, "w")) != NULL) {
- fprintf(fp, "\rshutdown: no authorized users "
- "logged in.\r\n");
- fclose(fp);
- }
- exit(1);
- }
- }
-
- /* Read pid of running shutdown from a file */
- if ((fp = fopen(SDPID, "r")) != NULL) {
- if (fscanf(fp, "%d", &pid) != 1)
- pid = 0;
- fclose(fp);
- }
-
- /* Read remaining words, skip time if needed. */
- message[0] = 0;
- for(c = optind + (!cancel && !when[0]); c < argc; c++) {
- if (strlen(message) + strlen(argv[c]) + 4 > MESSAGELEN)
- break;
- strcat(message, argv[c]);
- strcat(message, " ");
- }
- if (message[0]) strcat(message, "\r\n");
-
- /* See if we want to run or cancel. */
- if (cancel) {
- if (pid <= 0) {
- fprintf(stderr, "shutdown: cannot find pid "
- "of running shutdown.\n");
- exit(1);
- }
- init_setenv("INIT_HALT", NULL);
- if (kill(pid, SIGINT) < 0) {
- fprintf(stderr, "shutdown: not running.\n");
- exit(1);
- }
- if (message[0]) wall(message, 0);
- exit(0);
- }
-
- /* Check syntax. */
- if (when[0] == '\0') {
- if (optind == argc) usage();
- strncpy(when, argv[optind++], WHEN_SIZE - 1);
- }
-
- /* See if we are already running. */
- if (pid > 0 && kill(pid, 0) == 0) {
- fprintf(stderr, "\rshutdown: already running.\r\n");
- exit(1);
- }
-
- /* Extra check. */
- if (doself && down_level[0] != '0' && down_level[0] != '6') {
- fprintf(stderr,
- "shutdown: can use \"-n\" for halt or reboot only.\r\n");
- exit(1);
- }
-
- /* Tell users what we're gonna do. */
- switch(down_level[0]) {
- case '0':
- strncpy(newstate, "for system halt", STATELEN);
- break;
- case '6':
- strncpy(newstate, "for reboot", STATELEN);
- break;
- case '1':
- strncpy(newstate, "to maintenance mode", STATELEN);
- break;
- default:
- snprintf(newstate, STATELEN, "to runlevel %s",
down_level);
- break;
- }
-
- /* Go to the root directory */
- if (chdir("/")) {
- fprintf(stderr, "shutdown: chdir(/): %m\n");
- exit(1);
- }
-
- /* Create a new PID file. */
- unlink(SDPID);
- umask(022);
- if ((fp = fopen(SDPID, "w")) != NULL) {
- fprintf(fp, "%d\n", getpid());
- fclose(fp);
- } else if (errno != EROFS)
- fprintf(stderr, "shutdown: warning: cannot open %s\n", SDPID);
-
- /*
- * Catch some common signals.
- */
- signal(SIGQUIT, SIG_IGN);
- signal(SIGCHLD, SIG_IGN);
- signal(SIGHUP, SIG_IGN);
- signal(SIGTSTP, SIG_IGN);
- signal(SIGTTIN, SIG_IGN);
- signal(SIGTTOU, SIG_IGN);
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = stopit;
- sigaction(SIGINT, &sa, NULL);
-
- if (fastboot) close(open(FASTBOOT, O_CREAT | O_RDWR, 0644));
- if (forcefsck) close(open(FORCEFSCK, O_CREAT | O_RDWR, 0644));
-
- /* Alias now and take care of old '+mins' notation. */
- if (!strcmp(when, "now")) strcpy(when, "0");
-
- sp = when;
- if (when[0] == '+') sp++;
- /* Decode shutdown time. */
- for ( ; *sp; sp++) {
- if (*sp != ':' && (*sp < '0' || *sp > '9'))
- usage();
- }
- if (strchr(when, ':') == NULL) {
- /* Time in minutes. */
- wt = atoi(when);
- if (wt == 0 && when[0] != '0') usage();
- } else {
- if (sscanf(when, "%d:%2d", &hours, &mins) != 2) usage();
- /* Time in hh:mm format. */
- if (when[0] == '+') {
- /* Hours and minutes from now */
- if (hours > 99999 || mins > 59) usage();
- wt = (60*hours + mins);
- if (wt < 0) usage();
- } else {
- /* Time of day */
- if (hours > 23 || mins > 59) usage();
- time(&t);
- lt = localtime(&t);
- wt = (60*hours + mins) - (60*lt->tm_hour + lt->tm_min);
- if (wt < 0) wt += 1440;
- }
- }
- /* Shutdown NOW if time == 0 */
- if (wt == 0) issue_shutdown(halttype);
-
- /* Rather than loop and reduce wt (wait time) once per minute,
- we shall check the current time against the target time.
- Then calculate the remaining wating time based on the difference
- between current time and target time.
- This avoids missing shutdown time (target time) after the
- computer has been asleep. -- Jesse
- */
- /* target time, in seconds = current time + wait time */
- time(&t);
- target_time = t + (60 * wt);
-
- /* Give warnings on regular intervals and finally shutdown. */
- if (wt < 15 && !needwarning(wt, quiet_level)) issue_warn(wt);
- while(wt) {
- if (wt <= 5 && !didnolog) {
- donologin(wt);
- didnolog++;
- }
- if (needwarning(wt, quiet_level)) issue_warn(wt);
- hardsleep(60);
- time(&t); /* get current time once per minute */
- if (t >= target_time) /* past the target */
- wt = 0;
- else if ( (target_time - t) <= 60 ) /* less 1 min remains */
- {
- hardsleep(target_time - t);
- wt = 0;
- }
- else /* more than 1 min remains */
- wt = (int) (target_time - t) / 60;
- }
- issue_shutdown(halttype);
-
- return 0; /* Never happens */
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/sulogin.c
new/sysvinit-2.99/src/sulogin.c
--- old/sysvinit-2.98/src/sulogin.c 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/src/sulogin.c 2021-02-21 19:02:25.000000000 +0100
@@ -790,7 +790,7 @@
execl(BINSH, profile ? "-sh" : "sh", NULL);
perror(BINSH);
- /* Fall back to staticly linked shell if both the users shell
+ /* Fall back to statically linked shell if both the users shell
and /bin/sh failed to execute. */
setenv("SHELL", STATICSH, 1);
execl(STATICSH, STATICSH, NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sysvinit-2.98/src/wall.c new/sysvinit-2.99/src/wall.c
--- old/sysvinit-2.98/src/wall.c 2020-11-17 02:52:07.000000000 +0100
+++ new/sysvinit-2.99/src/wall.c 2021-02-21 19:02:25.000000000 +0100
@@ -68,7 +68,7 @@
* we are root or if we're NOT setgid.
*/
if (geteuid() != 0 && getgid() != getegid()) {
- fprintf(stderr, "wall -n: not priviliged\n");
+ fprintf(stderr, "wall -n: not privileged\n");
exit(1);
}
remote = 1;
