From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- source/a/sysvinit-scripts/scripts/rc.4 | 7 ++ source/a/sysvinit-scripts/scripts/rc.6 | 24 +++---- source/a/sysvinit-scripts/scripts/rc.K | 14 ++-- source/a/sysvinit-scripts/scripts/rc.M | 98 ++++++++++++++-------------- source/a/sysvinit-scripts/scripts/rc.S | 24 +++---- source/a/sysvinit-scripts/scripts/rc.cpufreq | 4 ++ 6 files changed, 91 insertions(+), 80 deletions(-) (limited to 'source/a/sysvinit-scripts/scripts') diff --git a/source/a/sysvinit-scripts/scripts/rc.4 b/source/a/sysvinit-scripts/scripts/rc.4 index 3c65040da..76278410a 100644 --- a/source/a/sysvinit-scripts/scripts/rc.4 +++ b/source/a/sysvinit-scripts/scripts/rc.4 @@ -12,6 +12,13 @@ # Tell the viewers what's going to happen... echo "Starting up X11 session manager..." +# If you'd like to start something different or in a different order than +# the options below, create your own startup script /etc/rc.d/rc.4.local +# and make it executable and it will be used instead: +if [ -x /etc/rc.d/rc.4.local ]; then + exec /bin/bash /etc/rc.d/rc.4.local +fi + # Try to use GNOME's gdm session manager. This comes first because if # gdm is on the machine then the user probably installed it and wants # to use it by default: diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6 index 76895aca8..cf9d03420 100644 --- a/source/a/sysvinit-scripts/scripts/rc.6 +++ b/source/a/sysvinit-scripts/scripts/rc.6 @@ -11,11 +11,11 @@ # # Set the path. -PATH=/sbin:/etc:/bin:/usr/bin +PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin # If there are SystemV init scripts for this runlevel, run them. if [ -x /etc/rc.d/rc.sysvinit ]; then - . /etc/rc.d/rc.sysvinit + /etc/rc.d/rc.sysvinit fi # Set linefeed mode to avoid staircase effect. @@ -78,13 +78,13 @@ if [ -x /etc/rc.d/rc.httpd ]; then fi # Stop the MySQL database: -if [ -r /var/run/mysql/mysql.pid ]; then - . /etc/rc.d/rc.mysqld stop +if [ -x /etc/rc.d/rc.mysqld -a -r /var/run/mysql/mysql.pid ]; then + /etc/rc.d/rc.mysqld stop fi # Stop the Samba server: if [ -x /etc/rc.d/rc.samba ]; then - . /etc/rc.d/rc.samba stop + /etc/rc.d/rc.samba stop fi # Shut down the NFS server: @@ -109,7 +109,7 @@ fi # Stop D-Bus: if [ -x /etc/rc.d/rc.messagebus ]; then - sh /etc/rc.d/rc.messagebus stop + /etc/rc.d/rc.messagebus stop fi # Kill any processes (typically gam) that would otherwise prevent @@ -118,7 +118,7 @@ unset FUSER_DELAY for dir in $(/bin/mount | grep 'type nfs ' | cut -d ' ' -f 3 ) ; do echo "Killing processes holding NFS mount $dir open..." # Background this to prevent fuser from also blocking shutdown: - /usr/bin/fuser -k -m $dir & + /usr/bin/fuser -k -M -m $dir & FUSER_DELAY=5 done # If fuser was run, let it have some delay: @@ -149,7 +149,7 @@ fi # isn't a diskless client with the / partition mounted via NFS: if ! /bin/mount | /bin/grep -q 'on / type nfs' ; then if [ -x /etc/rc.d/rc.inet1 ]; then - . /etc/rc.d/rc.inet1 stop + /etc/rc.d/rc.inet1 stop fi fi @@ -164,7 +164,7 @@ fi # Shut down PCMCIA devices: if [ -x /etc/rc.d/rc.pcmcia ]; then - . /etc/rc.d/rc.pcmcia stop + /etc/rc.d/rc.pcmcia stop # The cards might need a little extra time here to deactivate: /bin/sleep 5 fi @@ -176,12 +176,12 @@ fi # Terminate acpid before syslog: if [ -x /etc/rc.d/rc.acpid -a -r /var/run/acpid.pid ]; then # quit - . /etc/rc.d/rc.acpid stop + /etc/rc.d/rc.acpid stop fi # Stop udev: if [ -x /etc/rc.d/rc.udev ]; then - sh /etc/rc.d/rc.udev force-stop + /etc/rc.d/rc.udev force-stop fi # Kill all remaining processes. @@ -222,7 +222,7 @@ echo "Turning off swap." # Stop cgmanager and cgproxy: if [ -x /etc/rc.d/rc.cgmanager ]; then - sh /etc/rc.d/rc.cgmanager stop + /etc/rc.d/rc.cgmanager stop fi echo "Unmounting local file systems:" diff --git a/source/a/sysvinit-scripts/scripts/rc.K b/source/a/sysvinit-scripts/scripts/rc.K index 794c82ac8..5362a620b 100644 --- a/source/a/sysvinit-scripts/scripts/rc.K +++ b/source/a/sysvinit-scripts/scripts/rc.K @@ -12,16 +12,16 @@ # # Set the path. -PATH=/sbin:/bin:/usr/bin:/usr/sbin +PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin # Load any needed keyboard mappings: if [ -x /etc/rc.d/rc.keymap ]; then - . /etc/rc.d/rc.keymap + /etc/rc.d/rc.keymap fi # If there are SystemV init scripts for this runlevel, run them. if [ -x /etc/rc.d/rc.sysvinit ]; then - . /etc/rc.d/rc.sysvinit + /etc/rc.d/rc.sysvinit fi # Try to turn off quota: @@ -49,7 +49,7 @@ fi # Stop the Samba server: if [ -x /etc/rc.d/rc.samba ]; then - . /etc/rc.d/rc.samba stop + /etc/rc.d/rc.samba stop fi # Shut down the NFS server: @@ -63,7 +63,7 @@ unset FUSER_DELAY for dir in $(/bin/mount | grep 'type nfs ' | cut -d ' ' -f 3 ) ; do echo "Killing processes holding NFS mount $dir open..." # Background this to prevent fuser from also blocking shutdown: - /usr/bin/fuser -k -m $dir & + /usr/bin/fuser -k -M -m $dir & FUSER_DELAY=5 done # If fuser was run, let it have some delay: @@ -77,14 +77,14 @@ echo "Unmounting remote filesystems:" # Shut down PCMCIA devices: if [ -x /etc/rc.d/rc.pcmcia ] ; then - . /etc/rc.d/rc.pcmcia stop + /etc/rc.d/rc.pcmcia stop # The cards might need a little extra time here to deactivate: sleep 5 fi # Terminate acpid before syslog: if [ -x /etc/rc.d/rc.acpid -a -r /var/run/acpid.pid ]; then # quit - . /etc/rc.d/rc.acpid stop + /etc/rc.d/rc.acpid stop fi # Kill all processes. diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index 1d480cac9..6b69bad23 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -26,11 +26,11 @@ fi # Set the hostname. if [ -r /etc/HOSTNAME ]; then - /bin/hostname $(cat /etc/HOSTNAME | cut -f1 -d .) + /bin/hostname $(cat /etc/HOSTNAME) else # fall back on this old default: echo "darkstar.example.net" > /etc/HOSTNAME - /bin/hostname darkstar + /bin/hostname $(cat /etc/HOSTNAME) fi # Set the permissions on /var/log/dmesg according to whether the kernel @@ -67,14 +67,14 @@ fi # that's how it is... # if [ -x /etc/rc.d/rc.pcmcia ]; then - . /etc/rc.d/rc.pcmcia start + /etc/rc.d/rc.pcmcia start # The cards might need a little extra time here to initialize. sleep 5 fi # Start the system logger. if [ -x /etc/rc.d/rc.syslog -a -x /usr/sbin/syslogd -a -d /var/log ]; then - . /etc/rc.d/rc.syslog start + /etc/rc.d/rc.syslog start fi # Update the X font indexes: @@ -89,41 +89,41 @@ fi if grep -wq sysfs /proc/mounts && grep -q devtmpfs /proc/filesystems ; then if ! grep -wq nohotplug /proc/cmdline ; then if [ -x /etc/rc.d/rc.udev ]; then - /bin/sh /etc/rc.d/rc.udev start + /etc/rc.d/rc.udev start fi fi fi # Initialize the networking hardware. if [ -x /etc/rc.d/rc.inet1 ]; then - . /etc/rc.d/rc.inet1 + /etc/rc.d/rc.inet1 fi # Start D-Bus: if [ -x /etc/rc.d/rc.messagebus ]; then - sh /etc/rc.d/rc.messagebus start + /etc/rc.d/rc.messagebus start +fi + +# Start console-kit-daemon: +if [ -x /etc/rc.d/rc.consolekit ]; then + /etc/rc.d/rc.consolekit start fi # Start Bluetooth: if [ -x /etc/rc.d/rc.bluetooth ]; then - sh /etc/rc.d/rc.bluetooth start + /etc/rc.d/rc.bluetooth start fi # Start wicd or networkmanager: if [ -x /etc/rc.d/rc.wicd -a -x /usr/sbin/wicd ]; then - sh /etc/rc.d/rc.wicd start + /etc/rc.d/rc.wicd start elif [ -x /etc/rc.d/rc.networkmanager ]; then - sh /etc/rc.d/rc.networkmanager start + /etc/rc.d/rc.networkmanager start fi # Start networking daemons: if [ -x /etc/rc.d/rc.inet2 ]; then - . /etc/rc.d/rc.inet2 -fi - -# Look for additional USB/SCSI/IEEE1394/etc devices on multiple LUNs: -if [ -x /etc/rc.d/rc.scanluns ]; then - . /etc/rc.d/rc.scanluns + /etc/rc.d/rc.inet2 fi # Mount any additional filesystem types that haven't already been mounted: @@ -131,12 +131,12 @@ mount -a -v 2> /dev/null | grep -v -e "already mounted" -e "ignored" | cut -f 1 # Start the Control Script for automounter: if [ -x /etc/rc.d/rc.autofs ]; then - sh /etc/rc.d/rc.autofs start + /etc/rc.d/rc.autofs start fi # Start the Network Time Protocol daemon: if [ -x /etc/rc.d/rc.ntpd ]; then - sh /etc/rc.d/rc.ntpd start + /etc/rc.d/rc.ntpd start fi # Remove stale locks and junk files (must be done after mount -a!) @@ -155,12 +155,12 @@ chmod 1777 /tmp /var/tmp # Start ACPI daemon. if [ -x /etc/rc.d/rc.acpid ]; then - . /etc/rc.d/rc.acpid start + /etc/rc.d/rc.acpid start fi # Enable CPU frequency scaling: if [ -x /etc/rc.d/rc.cpufreq ]; then - . /etc/rc.d/rc.cpufreq start + /etc/rc.d/rc.cpufreq start fi # Update any existing icon cache files: @@ -185,20 +185,15 @@ if [ -x /usr/bin/update-mime-database -a -d /usr/share/mime ]; then /usr/bin/update-mime-database /usr/share/mime 1> /dev/null 2> /dev/null & fi -# Start console-kit-daemon: -if [ -x /etc/rc.d/rc.consolekit ]; then - sh /etc/rc.d/rc.consolekit start -fi - # Start HAL: if [ -x /etc/rc.d/rc.hald ]; then - sh /etc/rc.d/rc.hald start + /etc/rc.d/rc.hald start fi # Start system-wide PulseAudio daemon (not recommended, nor required in # order to use PulseAudio -- see the script for details): if [ -x /etc/rc.d/rc.pulseaudio ]; then - . /etc/rc.d/rc.pulseaudio start + /etc/rc.d/rc.pulseaudio start fi # These GTK+/pango files need to be kept up to date for @@ -240,7 +235,7 @@ if [ -x /etc/rc.d/rc.cups ]; then /etc/rc.d/rc.cups start elif [ -x /etc/rc.d/rc.lprng ]; then # Start LPRng (lpd): - . /etc/rc.d/rc.lprng start + /etc/rc.d/rc.lprng start fi # Start netatalk. (a file/print server for Macs using Appletalk) @@ -249,12 +244,10 @@ if [ -x /etc/rc.d/rc.atalk ]; then fi # Start smartd, which monitors the status of S.M.A.R.T. compatible -# hard drives and reports any problems. Note some devices (which aren't -# smart, I guess ;) will hang if probed by smartd, so it's commented out -# by default. -#if [ -x /usr/sbin/smartd ]; then -# /usr/sbin/smartd -#fi +# hard drives and reports any problems: +if [ -x /etc/rc.d/rc.smartd ]; then + /etc/rc.d/rc.smartd start +fi # Monitor the UPS with genpowerd. # To use this, uncomment this section and edit your settings in @@ -322,65 +315,72 @@ if grep -q quota /etc/fstab ; then fi # Start the SASL authentication server. This provides SASL -# authentication services for sendmail: +# authentication services for sendmail/postfix: if [ -x /etc/rc.d/rc.saslauthd ]; then - . /etc/rc.d/rc.saslauthd start + /etc/rc.d/rc.saslauthd start fi -# Start the sendmail daemon: -if [ -x /etc/rc.d/rc.sendmail ]; then - . /etc/rc.d/rc.sendmail start +# Start the mail server. Try the rc.sendmail script first, then try rc.postfix. +if [ -x /etc/rc.d/rc.sendmail -a -x usr/sbin/makemap ]; then + /etc/rc.d/rc.sendmail start +elif [ -x /etc/rc.d/rc.postfix -a -x usr/sbin/postdrop ]; then + /etc/rc.d/rc.postfix start fi # Load ALSA (sound) defaults: if [ -x /etc/rc.d/rc.alsa ]; then - . /etc/rc.d/rc.alsa + /etc/rc.d/rc.alsa fi # Load a custom screen font if the user has an rc.font script. if [ -x /etc/rc.d/rc.font ]; then - . /etc/rc.d/rc.font + /etc/rc.d/rc.font fi # Load a custom keymap if the user has an rc.keymap script. if [ -x /etc/rc.d/rc.keymap ]; then - . /etc/rc.d/rc.keymap + /etc/rc.d/rc.keymap fi # Start the MySQL database: if [ -x /etc/rc.d/rc.mysqld ]; then - . /etc/rc.d/rc.mysqld start + /etc/rc.d/rc.mysqld start fi # Start Apache web server: if [ -x /etc/rc.d/rc.httpd ]; then - . /etc/rc.d/rc.httpd start + /etc/rc.d/rc.httpd start fi # Start OpenLDAP: if [ -x /etc/rc.d/rc.openldap ]; then - . /etc/rc.d/rc.openldap start + /etc/rc.d/rc.openldap start +fi + +# Start Dovecot: +if [ -x /etc/rc.d/rc.dovecot ]; then + /etc/rc.d/rc.dovecot start fi # Start Samba (a file/print server for Win95/NT machines). # Samba can be started in /etc/inetd.conf instead. if [ -x /etc/rc.d/rc.samba ]; then - . /etc/rc.d/rc.samba start + /etc/rc.d/rc.samba start fi # Start the GPM mouse server: if [ -x /etc/rc.d/rc.gpm ]; then - . /etc/rc.d/rc.gpm start + /etc/rc.d/rc.gpm start fi # If there are SystemV init scripts for this runlevel, run them. if [ -x /etc/rc.d/rc.sysvinit ]; then - . /etc/rc.d/rc.sysvinit + /etc/rc.d/rc.sysvinit fi # Start the local setup procedure. if [ -x /etc/rc.d/rc.local ]; then - . /etc/rc.d/rc.local + /etc/rc.d/rc.local fi # All done. diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index 20064e558..cbe99e8fc 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -5,7 +5,7 @@ # Mostly written by: Patrick J. Volkerding, # -PATH=/sbin:/usr/sbin:/bin:/usr/bin +PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin # Try to mount /proc: /sbin/mount -v proc /proc -n -t proc 2> /dev/null @@ -23,13 +23,13 @@ fi # initrd has already done so): if [ -d /run ]; then if ! grep -wq "tmpfs /run tmpfs" /proc/mounts ; then - /sbin/mount -v -n -t tmpfs tmpfs /run -o mode=0755 + /sbin/mount -v -n -t tmpfs tmpfs /run -o mode=0755,size=32M,nodev,nosuid,noexec fi fi # Load the loop device kernel module: if [ -x /etc/rc.d/rc.loop ]; then - . /etc/rc.d/rc.loop start + /etc/rc.d/rc.loop start fi # Initialize udev to manage /dev entries and hotplugging. @@ -43,7 +43,7 @@ fi if grep -wq sysfs /proc/mounts && grep -q devtmpfs /proc/filesystems ; then if ! grep -wq nohotplug /proc/cmdline ; then if [ -x /etc/rc.d/rc.udev ]; then - /bin/sh /etc/rc.d/rc.udev start + /etc/rc.d/rc.udev start fi fi fi @@ -55,7 +55,7 @@ if grep -wq cgroup /proc/filesystems ; then # Check if we have some tools to autodetect the available cgroup controllers if [ -x /bin/cut -a -x /bin/tail ]; then # Mount a tmpfs as the cgroup filesystem root - mount -t tmpfs -o mode=0755 cgroup_root /sys/fs/cgroup + mount -t tmpfs -o mode=0755,size=8M cgroup_root /sys/fs/cgroup # Autodetect available controllers and mount them in subfolders controllers="$(/bin/cut -f 1 /proc/cgroups | /bin/tail -n +2)" for i in $controllers; do @@ -179,7 +179,7 @@ fi # Start FUSE, if requested: if [ -x /etc/rc.d/rc.fuse ]; then - sh /etc/rc.d/rc.fuse start + /etc/rc.d/rc.fuse start fi # Set the tick and frequency for the system clock. @@ -326,7 +326,7 @@ fi # Run the kernel module script. This updates the module dependencies and # also supports manually loading kernel modules through rc.modules.local. if [ -x /etc/rc.d/rc.modules ]; then - . /etc/rc.d/rc.modules + /etc/rc.d/rc.modules fi # Configure kernel parameters: @@ -367,9 +367,9 @@ if /bin/grep -wq devpts /proc/mounts ; then # This pipe after the mount command is just to convert the new # mount verbose output back to the old format that contained # more useful information: - /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done + /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs,nodevpts | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done else - /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep "${dev} " ; done + /sbin/mount -a -v -t nonfs,nosmbfs,nocifs,noproc,nosysfs | grep successfully | cut -f 1 -d : | tr -d ' ' | while read dev ; do mount | grep " ${dev} " ; done fi # Enable swapping again. This is needed in case a swapfile is used, @@ -379,7 +379,7 @@ fi # Start cgmanager (or cgproxy in a container): if [ -x /etc/rc.d/rc.cgmanager -a -d /sys/fs/cgroup ]; then - sh /etc/rc.d/rc.cgmanager start + /etc/rc.d/rc.cgmanager start fi # Clean up some temporary files: @@ -419,7 +419,7 @@ fi # If there are SystemV init scripts for this runlevel, run them. if [ -x /etc/rc.d/rc.sysvinit ]; then - . /etc/rc.d/rc.sysvinit + /etc/rc.d/rc.sysvinit fi # Run serial port setup script: @@ -427,7 +427,7 @@ fi # set up correctly. If this happens, you may have to edit the file from a # boot disk, and/or set it as non-executable: if [ -x /etc/rc.d/rc.serial ]; then - sh /etc/rc.d/rc.serial start + /etc/rc.d/rc.serial start fi # Carry an entropy pool between reboots to improve randomness. diff --git a/source/a/sysvinit-scripts/scripts/rc.cpufreq b/source/a/sysvinit-scripts/scripts/rc.cpufreq index 571ce41c7..cafcb66ae 100644 --- a/source/a/sysvinit-scripts/scripts/rc.cpufreq +++ b/source/a/sysvinit-scripts/scripts/rc.cpufreq @@ -23,6 +23,10 @@ # differs in behaviour in that it gracefully increases and # decreases the CPU speed rather than jumping to max speed the # moment there is any load on the CPU. +# schedutil: The CPUfreq governor "schedutil" aims at better integration with +# the Linux kernel scheduler. Load estimation is achieved through +# the scheduler's Per-Entity Load Tracking (PELT) mechanism, which +# also provides information about the recent load. SCALING_GOVERNOR=ondemand # If rc.cpufreq is given an option, use it for the CPU scaling governor instead: -- cgit v1.2.3-65-gdbad