Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
This commit is contained in:
Stefan Schantl
2018-12-12 09:27:59 +01:00
284 changed files with 26196 additions and 21390 deletions

View File

@@ -13,8 +13,18 @@
case "${1}" in
start)
if pidofproc -s /usr/sbin/rngd; then
boot_mesg "Random Number Generator Daemon is already running..."
echo_ok;
exit 0
fi
if [ -e /dev/hwrngtty ]; then
HWRNG=/dev/hwrngtty
else
HWRNG=/dev/hwrng
fi
boot_mesg "Starting Random Number Generator Daemon..."
loadproc /usr/sbin/rngd --quiet
loadproc /usr/sbin/rngd -r $HWRNG --quiet
;;
stop)

View File

@@ -21,7 +21,7 @@ case "${1}" in
loadproc klogd -c 1
boot_mesg "Starting system log daemon..."
loadproc syslogd -m 0
loadproc syslogd -m 0 -r
boot_mesg "Saving Bootlog..."
if [ -e /var/log/bootlog ]; then

View File

@@ -51,13 +51,6 @@ case "${1}" in
mount -t devpts devpts -o gid=5,mode=620 /dev/pts
fi
# Udev handles uevents itself, so we don't need to have
# the kernel call out to any binary in response to them
echo > /proc/sys/kernel/hotplug
# Copy static device nodes to /dev
cp -a /lib/udev/devices/* /dev
# Start the udev daemon to continually watch for, and act on,
# uevents
boot_mesg "Starting udev daemon..."