Merge lp:~philipgwyn/ltsp/ltsp-rhel into lp:~ltsp-upstream/ltsp/ltsp-trunk

[Philip Gwyn]

A few small changes to get more things working on CentOS 6.

[Vagrant Cascadian (vagrantc)]

First off, I haven't worked with Redhat based distributions for many, many years...

It seems like the IPV4ADDR/IPV4NETMASK changes should be conditional if they're not already set, and the redhat-specific changes could be merged into client/share/init-ltsp.d/09-hostname.

NBD swap is entirely independent of the type of rootfs used. It should use NBD_SWAP=false for environments that don't want to use it.

I'm wondering if it wouldn't be feasible to merge 50-rm-system-services from Debian, Gentoo and Redhat, rather than forking all the various versions...

syslog support should be enabled conditionally on the SYSLOG_HOST variable.

[Alkis Georgopoulos (alkisg)]

I'm setting the state of old merge requests that have been stale for years, to rejected; if someone wants, he can do another merge request in git format, since now ltsp uses git.

review: Disapprove

Unmerged revisions

2610. By Philip Gwyn <email address hidden> on 2014-10-28

Set IPV4ADDR and IPV4NETMASK

2609. By Philip Gwyn <email address hidden> on 2014-10-28

Log to stderr if syslog isn't running

2608. By Philip Gwyn <email address hidden> on 2014-10-28

Added 49-no-nbd-swap
    - it will prevent checking nbd ports for swapfiles if / is mounted via NFS
    - use NBD_SWAP=true to override

2607. By Philip Gwyn <email address hidden> on 2014-10-28

Don't use function foo(), that is a bashism

2606. By Philip Gwyn <email address hidden> on 2014-10-15

Added support for upstart

2605. By Philip Gwyn <email address hidden> on 2014-10-15

Tweak comments

2604. By Philip Gwyn <email address hidden> on 2014-10-15

Added 50-rm-system-services

=== modified file 'client/Redhat/share/ltsp/init-ltsp.d/09-hostname'
--- client/Redhat/share/ltsp/init-ltsp.d/09-hostname	2013-02-27 08:22:30 +0000
+++ client/Redhat/share/ltsp/init-ltsp.d/09-hostname	2014-10-28 19:13:05 +0000
@@ -5,6 +5,8 @@
             HOSTNAME_EXTRA=$(ip link show $DEVICE | awk '/ether/{print $2}' | tr ':' '-')
             ;;
         ip|"")
+            IPV4ADDR=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $2}')
+            IPV4NETMASK=$(ip -4 a s $DEVICE |awk 'sub(/\/24/, ""){print $4}')
             HOSTNAME_EXTRA=$(echo "$IPV4ADDR.$IPV4NETMASK" | awk -F "." '{ print (($1%(256-$5)*256+$2%(256-$6))*256+$3%(256-$7))*256+$4%(256-$8) }')
             ;;
     esac

=== added file 'client/Redhat/share/ltsp/init-ltsp.d/49-no-nbd-swap'
--- client/Redhat/share/ltsp/init-ltsp.d/49-no-nbd-swap	1970-01-01 00:00:00 +0000
+++ client/Redhat/share/ltsp/init-ltsp.d/49-no-nbd-swap	2014-10-28 19:13:05 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+#
+# We want to prevent probing for NBD swap files in 50-nbd-swap
+# if root is mounted via NFS.
+#
+
+# Only do things if NBD_SWAP is empty
+if test -z "$NBD_SWAP" ; then
+    # At the point this is run, /etc/fstab and /etc/mtab are empty
+    if grep /sysroot /proc/mounts | grep -q " nfs " ; then
+        NBD_SWAP=false
+    fi
+fi

=== added file 'client/Redhat/share/ltsp/init-ltsp.d/50-rm-system-services'
--- client/Redhat/share/ltsp/init-ltsp.d/50-rm-system-services	1970-01-01 00:00:00 +0000
+++ client/Redhat/share/ltsp/init-ltsp.d/50-rm-system-services	2014-10-28 19:13:05 +0000
@@ -0,0 +1,67 @@
+#!/bin/sh
+# Remove some system services that don't make sense in live sessions.
+# The user can add more items by declaring space separated RM_SYSTEM_SERVICES
+# or RM_THIN_SYSTEM_SERVICES lists in lts.conf. The RM_THIN_SYSTEM_SERVICES list
+# is ignored by fat clients.
+# KEEP_SYSTEM_SERVICES is a space separated whitelist of services.
+
+allowed_services() {
+    local service description
+
+    echo "$@" | while read service description; do
+        case " $KEEP_SYSTEM_SERVICES " in
+            *" $service "*)
+                ;;
+            *)
+                echo -n " $service"
+                ;;
+        esac
+    done
+}
+
+# $RM_SYSTEM_SERVICES are removed for all clients
+rm_services="$RM_SYSTEM_SERVICES $(allowed_services "
+rsyslog                 # rsyslog daemon
+xdm                     # X.Org Display Manager
+")"
+
+# $RM_THIN_SYSTEM_SERVICES are removed for thin clients
+if ! boolean_is_true "$LTSP_FATCLIENT"; then
+    rm_services="$rm_services $RM_THIN_SYSTEM_SERVICES $(allowed_services "
+cups                  # CUPS Printing spooler and server
+NetworkManager        # Network connection manager
+")"
+
+    # For low RAM thin clients, disable whatever isn't essential for booting
+    memtotal=$(sed -n 's/MemTotal: *\([0-9]*\) .*/\1/p' /proc/meminfo)
+    memtotal=$(($memtotal / 1024))
+    RM_RAM_THRESHOLD=${RM_RAM_THRESHOLD:-128}
+    if [ "$memtotal" -le "$RM_RAM_THRESHOLD" ]; then
+        rm_services="$rm_services $RM_LOW_RAM_SERVICES $(allowed_services "
+uptimed               # Uptime Daemon
+")"
+    fi
+fi
+
+# We don't need NFS-related services if we're not using nfs
+if ! grep -q nfs /etc/fstab; then
+    rm_services="$rm_services $(allowed_services "
+portreserve
+nfs                   # Network File System
+rpcbind
+nfslock
+")"
+else
+    rm_services="$rm_services nbd"
+fi
+
+for service in $rm_services; do
+    if test -f "/etc/rc.d/init.d/$service" ; then
+        debug "Deactivating $service"
+        # we don't use chkconfig $sevice off because that's needlessly slow
+        rm -f /etc/rc.d/rc?.d/S??$service
+    elif test -f "/etc/init/$service.conf" ; then
+        debug "Removing $service"
+        rm -f "/etc/init/$service.conf"
+    fi
+done

=== modified file 'client/initscripts/ltsp-init-common'
--- client/initscripts/ltsp-init-common	2013-07-31 00:32:42 +0000
+++ client/initscripts/ltsp-init-common	2014-10-28 19:13:05 +0000
@@ -3,9 +3,19 @@
 # ltsp_config sources ltsp-client-functions
 . /usr/share/ltsp/ltsp_config
 
+# detect if syslog is loaded
+ltsp_have_syslog=
+if ps | grep syslog ; then
+    ltsp_have_syslog=true
+fi
+
 warn() {
     msg="$1"
-    logger -p user.warning -t ltsp-client  "warning: $msg"
+    if test -n "$ltsp_have_syslog" ; then
+        logger -p user.warning -t ltsp-client  "warning: $msg"
+    else
+        echo "[ltsp-client] warning: $msg" >&1
+    fi
 }
 
 start_sound() {