Patch for Slackware 13.1 guest on a Linux-Vserver host ====================================================== by Roberto Puzzanghera - http://notes.sagredo.eu version: 2010.12.28 ====================================================== diff -urNB rc.d-original/rc.0 rc.d-patched/rc.0 --- rc.d-original/rc.0 2010-03-20 01:14:07.000000000 +0100 +++ rc.d-patched/rc.0 2010-12-28 17:37:41.000000000 +0100 @@ -37,22 +37,6 @@ ;; esac -# Save the system time to the hardware clock using hwclock --systohc. -if [ -x /sbin/hwclock ]; then - # Check for a broken motherboard RTC clock (where ioports for rtc are - # unknown) to prevent hwclock causing a hang: - if ! grep -q -w rtc /proc/ioports ; then - CLOCK_OPT="--directisa" - fi - if grep -q "^UTC" /etc/hardwareclock 2> /dev/null ; then - echo "Saving system time to the hardware clock (UTC)." - /sbin/hwclock $CLOCK_OPT --utc --systohc - else - echo "Saving system time to the hardware clock (localtime)." - /sbin/hwclock $CLOCK_OPT --localtime --systohc - fi -fi - # Run any local shutdown scripts: if [ -x /etc/rc.d/rc.local_shutdown ]; then /etc/rc.d/rc.local_shutdown stop @@ -98,18 +82,6 @@ sh /etc/rc.d/rc.messagebus stop fi -# Unmount any NFS, SMB, or CIFS filesystems: -echo "Unmounting remote filesystems." -/bin/umount -v -a -r -t nfs,smbfs,cifs - -# Try to shut down pppd: -PS="$(ps ax)" -if echo "$PS" | /bin/grep -q -w pppd ; then - if [ -x /usr/sbin/ppp-off ]; then - /usr/sbin/ppp-off - fi -fi - # Bring down the networking system, but first make sure that this # isn't a diskless client with the / partition mounted via NFS: if ! /bin/mount | /bin/grep -q 'on / type nfs' ; then @@ -127,13 +99,6 @@ sleep 2 fi -# Shut down PCMCIA devices: -if [ -x /etc/rc.d/rc.pcmcia ]; then - . /etc/rc.d/rc.pcmcia stop - # The cards might need a little extra time here to deactivate: - /bin/sleep 5 -fi - # Turn off process accounting: if [ -x /sbin/accton -a -r /var/log/pacct ]; then /sbin/accton off @@ -181,23 +146,6 @@ rm -f /var/lock/subsys/* fi -# Turn off swap: -echo "Turning off swap." -/sbin/swapoff -a -/bin/sync - -# Umount any LVM volumes: -if /bin/mount | /bin/grep -q '^/dev/mapper/' ; then - echo "Unmounting LVM volumes." - /bin/umount -v $(/bin/mount | /bin/grep '^/dev/mapper/' | /bin/cut -d ' ' -f 3 | /bin/tac) -fi - -echo "Unmounting local file systems." -/bin/umount -v -a -t no,proc,sysfs - -echo "Remounting root filesystem read-only." -/bin/mount -v -n -o remount,ro / - # This never hurts: /bin/sync @@ -222,45 +170,5 @@ done fi -# Deactivate LVM volume groups: -if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then - echo "Deactivating LVM volume groups:" - /sbin/vgchange -an --ignorelockingfailure -fi - -# This never hurts again (especially since root-on-LVM always fails -# to deactivate the / logical volume... but at least it was -# remounted as read-only first) -/bin/sync - -# sleep 3 fixes problems with some hard drives that don't -# otherwise finish syncing before reboot or poweroff -/bin/sleep 3 - # This is to ensure all processes have completed on SMP machines: wait - -if [ -x /sbin/genpowerd ]; then - # See if this is a powerfail situation: - if /bin/egrep -q "FAIL|SCRAM" /etc/upsstatus 2> /dev/null ; then - # Signal UPS to shut off the inverter: - /sbin/genpowerd -k - if [ ! $? = 0 ]; then - echo - echo "There was an error signaling the UPS." - echo "Perhaps you need to edit /etc/genpowerd.conf to configure" - echo "the serial line and UPS type." - # Wasting 15 seconds of precious power: - /bin/sleep 15 - fi - fi -fi - -# Now halt (poweroff with APM or ACPI enabled kernels) or reboot. -if [ "$command" = "reboot" ]; then - echo "Rebooting." - /sbin/reboot -else - /sbin/poweroff -fi - diff -urNB rc.d-original/rc.6 rc.d-patched/rc.6 --- rc.d-original/rc.6 2010-03-20 01:14:07.000000000 +0100 +++ rc.d-patched/rc.6 2010-12-28 17:37:41.000000000 +0100 @@ -37,22 +37,6 @@ ;; esac -# Save the system time to the hardware clock using hwclock --systohc. -if [ -x /sbin/hwclock ]; then - # Check for a broken motherboard RTC clock (where ioports for rtc are - # unknown) to prevent hwclock causing a hang: - if ! grep -q -w rtc /proc/ioports ; then - CLOCK_OPT="--directisa" - fi - if grep -q "^UTC" /etc/hardwareclock 2> /dev/null ; then - echo "Saving system time to the hardware clock (UTC)." - /sbin/hwclock $CLOCK_OPT --utc --systohc - else - echo "Saving system time to the hardware clock (localtime)." - /sbin/hwclock $CLOCK_OPT --localtime --systohc - fi -fi - # Run any local shutdown scripts: if [ -x /etc/rc.d/rc.local_shutdown ]; then /etc/rc.d/rc.local_shutdown stop @@ -98,18 +82,6 @@ sh /etc/rc.d/rc.messagebus stop fi -# Unmount any NFS, SMB, or CIFS filesystems: -echo "Unmounting remote filesystems." -/bin/umount -v -a -r -t nfs,smbfs,cifs - -# Try to shut down pppd: -PS="$(ps ax)" -if echo "$PS" | /bin/grep -q -w pppd ; then - if [ -x /usr/sbin/ppp-off ]; then - /usr/sbin/ppp-off - fi -fi - # Bring down the networking system, but first make sure that this # isn't a diskless client with the / partition mounted via NFS: if ! /bin/mount | /bin/grep -q 'on / type nfs' ; then @@ -127,13 +99,6 @@ sleep 2 fi -# Shut down PCMCIA devices: -if [ -x /etc/rc.d/rc.pcmcia ]; then - . /etc/rc.d/rc.pcmcia stop - # The cards might need a little extra time here to deactivate: - /bin/sleep 5 -fi - # Turn off process accounting: if [ -x /sbin/accton -a -r /var/log/pacct ]; then /sbin/accton off @@ -181,23 +146,6 @@ rm -f /var/lock/subsys/* fi -# Turn off swap: -echo "Turning off swap." -/sbin/swapoff -a -/bin/sync - -# Umount any LVM volumes: -if /bin/mount | /bin/grep -q '^/dev/mapper/' ; then - echo "Unmounting LVM volumes." - /bin/umount -v $(/bin/mount | /bin/grep '^/dev/mapper/' | /bin/cut -d ' ' -f 3 | /bin/tac) -fi - -echo "Unmounting local file systems." -/bin/umount -v -a -t no,proc,sysfs - -echo "Remounting root filesystem read-only." -/bin/mount -v -n -o remount,ro / - # This never hurts: /bin/sync @@ -222,45 +170,5 @@ done fi -# Deactivate LVM volume groups: -if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then - echo "Deactivating LVM volume groups:" - /sbin/vgchange -an --ignorelockingfailure -fi - -# This never hurts again (especially since root-on-LVM always fails -# to deactivate the / logical volume... but at least it was -# remounted as read-only first) -/bin/sync - -# sleep 3 fixes problems with some hard drives that don't -# otherwise finish syncing before reboot or poweroff -/bin/sleep 3 - # This is to ensure all processes have completed on SMP machines: wait - -if [ -x /sbin/genpowerd ]; then - # See if this is a powerfail situation: - if /bin/egrep -q "FAIL|SCRAM" /etc/upsstatus 2> /dev/null ; then - # Signal UPS to shut off the inverter: - /sbin/genpowerd -k - if [ ! $? = 0 ]; then - echo - echo "There was an error signaling the UPS." - echo "Perhaps you need to edit /etc/genpowerd.conf to configure" - echo "the serial line and UPS type." - # Wasting 15 seconds of precious power: - /bin/sleep 15 - fi - fi -fi - -# Now halt (poweroff with APM or ACPI enabled kernels) or reboot. -if [ "$command" = "reboot" ]; then - echo "Rebooting." - /sbin/reboot -else - /sbin/poweroff -fi - diff -urNB rc.d-original/rc.K rc.d-patched/rc.K --- rc.d-original/rc.K 2008-12-02 21:31:48.000000000 +0100 +++ rc.d-patched/rc.K 2010-12-28 17:37:41.000000000 +0100 @@ -57,22 +57,6 @@ /etc/rc.d/rc.nfsd stop fi -# Unmount any NFS, SMB, or CIFS filesystems: -echo "Unmounting remote filesystems." -umount -a -r -t nfs,smbfs,cifs - -# Shut down PCMCIA devices: -if [ -x /etc/rc.d/rc.pcmcia ] ; then - . /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 -fi - # Kill all processes. echo echo "Sending all processes the SIGHUP signal." diff -urNB rc.d-original/rc.M rc.d-patched/rc.M --- rc.d-original/rc.M 2010-02-07 04:01:28.000000000 +0100 +++ rc.d-patched/rc.M 2010-12-28 17:37:41.000000000 +0100 @@ -20,10 +20,6 @@ /sbin/ldconfig & fi -# Screen blanks after 15 minutes idle time, and powers down in one hour -# if the kernel supports APM or ACPI power management: -/bin/setterm -blank 15 -powersave powerdown -powerdown 60 - # Set the hostname. if [ -r /etc/HOSTNAME ]; then /bin/hostname $(cat /etc/HOSTNAME | cut -f1 -d .) @@ -36,31 +32,6 @@ # Save the contents of 'dmesg': /bin/dmesg -s 65536 > /var/log/dmesg -# Initialize PCMCIA devices: -# -# NOTE: This used to be started near the top of rc.S so that PCMCIA devices -# could be fsck'ed along with the other drives. This had some unfortunate -# side effects, however, since root isn't yet read-write, and /var might not -# even be mounted the .pid files can't be correctly written in /var/run and -# the pcmcia system can't be correctly shut down. If you want some PCMCIA -# partition to be mounted at boot (or when the card is inserted) then add -# the appropriate lines to /etc/pcmcia/scsi.opts. -# -# Note that the stuff in /etc/pcmcia/ is only for 2.4.x kernels using -# 16-bit PCMCIA cards (not 32-bit Cardbus cards!). For example, with a -# wireless card you might need to set options in /etc/pcmcia OR in -# /etc/rc.d/rc.wireless.conf, or even in /etc/rc.d/rc.inet1.conf (with -# extra options if needed for the encryption key, ESSID, etc.) -# -# Hopefully this situation will be unified in the future, but for now -# that's how it is... -# -if [ -x /etc/rc.d/rc.pcmcia ]; then - . /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 @@ -72,26 +43,11 @@ /usr/bin/fc-cache -f & fi -# If we are returning from single-user mode we will need to restart -# udevd on systems that use udev: -if grep -wq sysfs /proc/mounts && grep -q tmpfs /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 - fi - fi -fi - # Initialize the networking hardware. if [ -x /etc/rc.d/rc.inet1 ]; then . /etc/rc.d/rc.inet1 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 -fi - # Start networking daemons: if [ -x /etc/rc.d/rc.inet2 ]; then . /etc/rc.d/rc.inet2 @@ -118,17 +74,6 @@ chmod 755 / 2> /dev/null chmod 1777 /tmp /var/tmp -# Start APM or ACPI daemon. -# If APM is enabled in the kernel, start apmd: -if [ -e /proc/apm ]; then - if [ -x /usr/sbin/apmd ]; then - echo "Starting APM daemon: /usr/sbin/apmd" - /usr/sbin/apmd - fi -elif [ -x /etc/rc.d/rc.acpid ]; then # otherwise, start acpid: - . /etc/rc.d/rc.acpid start -fi - # Update any existing icon cache files: if find /usr/share/icons 2> /dev/null | grep -q icon-theme.cache ; then for theme_dir in /usr/share/icons/* ; do @@ -161,11 +106,6 @@ sh /etc/rc.d/rc.hald start fi -# Start Bluetooth: -if [ -x /etc/rc.d/rc.bluetooth ]; then - sh /etc/rc.d/rc.bluetooth start -fi - # Start wicd: if [ -x /etc/rc.d/rc.wicd ]; then sh /etc/rc.d/rc.wicd start @@ -207,36 +147,6 @@ /etc/rc.d/rc.atalk 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 - -# If we're using udev, make /dev/cdrom and any other optical drive symlinks -# if some udev rule hasn't made them already: -if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems; then - if ! grep -wq nohotplug /proc/cmdline ; then - if [ -x /lib/udev/rc.optical-symlinks -a -x /etc/rc.d/rc.udev ]; then - /bin/sh /lib/udev/rc.optical-symlinks - fi - fi -fi - -# Monitor the UPS with genpowerd. -# To use this, uncomment this section and edit your settings in -# /etc/genpowerd.conf (serial device, UPS type, etc). For more information, -# see "man genpowerd" or the extensive documentation in the -# /usr/doc/genpower-*/ directory. -# You'll also need to configure a similar block in /etc/rc.d/rc.6 if you want -# support for stopping the UPS's inverter after the machine halts. -#if [ -x /sbin/genpowerd ]; then -# echo "Starting genpowerd daemon..." -# /sbin/genpowerd -#fi - # Turn on process accounting. To enable process accounting, make sure the # option for BSD process accounting is enabled in your kernel, and then # create the file /var/log/pacct (touch /var/log/pacct). By default, process @@ -301,11 +211,6 @@ . /etc/rc.d/rc.sendmail start fi -# Load ALSA (sound) defaults: -if [ -x /etc/rc.d/rc.alsa ]; then - . /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 @@ -337,11 +242,6 @@ . /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 -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 diff -urNB rc.d-original/rc.inet2 rc.d-patched/rc.inet2 --- rc.d-original/rc.inet2 2007-09-18 00:07:32.000000000 +0200 +++ rc.d-patched/rc.inet2 2010-12-28 17:37:41.000000000 +0100 @@ -15,27 +15,6 @@ # At this point, we are ready to talk to The World... - -# Mount remote (NFS) filesystems: -if cat /etc/fstab | grep -v '^#' | grep -w nfs 1> /dev/null 2> /dev/null ; then - # Start rpc.portmap, /sbin/rpc.lockd, and /sbin/rpc.statd if we find NFS - # volumes defined in /etc/fstab since these will need to be running in order - # to mount them. If they are not running, attempting to mount an NFS - # partition will cause mount to hang, or at least result in unreliable - # operation. Keep this in mind if you plan to mount unlisted NFS - # partitions... - # If you have uncommented NFS partitions in your /etc/fstab, rc.rpc is run - # whether it is set as executable or not. If you don't want to run it, - # comment the NFS partitions out in /etc/fstab or erase/rename rc.rpc. - if [ -r /etc/rc.d/rc.rpc ]; then - sh /etc/rc.d/rc.rpc start - fi - echo "Mounting remote (NFS) file systems: /sbin/mount -a -t nfs" - /sbin/mount -a -t nfs # This may be our /usr runtime! - # Show the mounted volumes: - /sbin/mount -v -t nfs -fi - # If /etc/rc.d/rc.rpc is executable, run it to load rpc.portmap, rpc.lockd, # and rpc.statd. This might be needed to mount NFS partitions that are not # listed in /etc/fstab. Starting this twice won't hurt as the script will