[patch] Patch for /usr/share/ltsp/ltsp-init-common of net-misc/ltsp-client-5.2

ltsp-init-common.patch (text/plain), 4.72 KB, created by Horst Prote on 2010-03-15 11:24:21 UTC

--- /usr/share/ltsp/ltsp-init-common.orig	2010-03-03 14:48:08.000000000 +0100
+++ /usr/share/ltsp/ltsp-init-common	2010-03-12 18:23:39.000000000 +0100
@@ -105,33 +105,6 @@
     fi
 }
 
-configure_localdev() {
-    if boolean_is_true "$LOCALDEV" ; then
-        # Make mountpoint dir
-        mkdir -p /var/run/drives
-        # Make this sessions secret auth cookie for ltspfs
-        if [ ! -f /var/run/ltspfs_token ]; then
-            mcookie > /var/run/ltspfs_token
-        fi
-        if [ -z "$(pgrep ltspfsd)" ]; then
-            /usr/bin/ltspfsd
-        fi
-        # cdrom devices are handled by the cdpingerponger
-        if [ -z "$(pgrep -l -f -x "/usr/sbin/cdpinger cdrom$")" ]; then
-            /usr/sbin/cdpinger cdrom # default for usb cdroms
-        fi
-
-        # and start one for every additional cdrom device
-        if [ -L /dev/cdrom?* ];then
-            for CDDEV in $(ls /dev/cdrom?*); do
-                if [ -z "$(pgrep -l -f -x "/usr/sbin/cdpinger ${CDDEV}$")" ]; then
-                    /usr/sbin/cdpinger $(basename ${CDDEV})
-                fi
-            done
-        fi
-    fi
-}
-
 configure_swap() {
     if boolean_is_true "$USE_LOCAL_SWAP" ; then
         # Enable local swap partition if found on local disk
@@ -237,70 +210,6 @@
 
 }
 
-load_modules() {
-    for module in $(env|grep ^MODULE_|sed -e s/^MODULE_[0-9]*\=//|sed -e s/\ /*/);do
-        modprobe $(echo $module|tr "*" " ")
-    done
-}
-
-configure_console() {
-    if [ -n "$CONSOLE_KEYMAP" ]; then
-        ckbcomp -model pc105 "$CONSOLE_KEYMAP" | loadkeys
-    fi
-}
-
-configure_resolver() {
-    hostname=$(cat /proc/sys/kernel/hostname)
-    if [ -z "$hostname" ] || [ "$hostname" = "(none)" ]; then
-        # ensure a default hostname, otherwise /etc/hosts may get borked.
-        hostname=ltsp
-        echo $hostname > /proc/sys/kernel/hostname || true
-    fi
-    cat <<EOF > /etc/hosts
-127.0.0.1 localhost
-127.0.0.2 $hostname
-$SERVER server
-EOF
-    if [ -f /etc/hosts.ltsp ]; then
-        cat /etc/hosts.ltsp >> /etc/hosts
-    fi
-
-    if [ -n "$DNS_SERVER" ] || [ -n "$SEARCH_DOMAIN" ]; then
-        :>/etc/resolv.conf
-        if [ -n "$SEARCH_DOMAIN" ]; then
-            echo "search $SEARCH_DOMAIN" >> /etc/resolv.conf
-        fi
-        if [ -n "$DNS_SERVER" ]; then
-            for n in $DNS_SERVER; do 
-                echo "nameserver ${n}" >> /etc/resolv.conf
-            done
-        fi
-    fi
-}
-
-configure_syslog() {
-    if [ -z "$SYSLOG" ] || [ "$SYSLOG" = "remote" ]; then
-        syslog_conf=/etc/syslog.conf
-        if [ -d /etc/rsyslog.d ]; then
-            syslog_conf=/etc/rsyslog.d/ltsp.conf   
-            touch $syslog_conf
-        fi
-        if [ -f "$syslog_conf" ]; then
-            cat <<EOF > "$syslog_conf"
-*.* @${SYSLOG_HOST:-$SERVER}
-EOF
-        fi
-    fi
-}
-
-configure_fstab() {
-    if [ -z "$CONFIGURE_FSTAB" ] || boolean_is_true "$CONFIGURE_FSTAB" ; then
-        echo "/dev/root     /       rootfs defaults        0       0" > /etc/fstab
-        echo "tmpfs         /tmp    tmpfs   defaults,nosuid,nodev 0 0" >> /etc/fstab
-        mount /tmp
-    fi
-}
-
 configure_cron() {
     CRON_FILE=/etc/cron.d/ltsp
     if [ ! -w "/etc/cron.d" ]; then
@@ -317,56 +226,6 @@
     done
 }
 
-run_rcfiles() {
-    for i in 01 02 03 04 05 06 07 08 09 10; do
-        eval rcfile=\${RCFILE_${i}}
-        [ -x "$rcfile" ] && "$rcfile" $@
-    done
-}
-
-bind_mounts () {
-    # set defaults
-    test -z "$tmpfs_dir" && tmpfs_dir=/var/lib/ltsp-client-setup
-    mount -t tmpfs -o mode=0755 tmpfs $tmpfs_dir
-    # preserve directory structure
-    for d in $rw_dirs ; do
-        if [ -d "$d" ]; then
-            cd $tmpfs_dir
-            tar --no-recursion -cpf - $(find $d -type d 2> /dev/null) 2> /dev/null | tar xpf -
-            mount --bind $tmpfs_dir/$d $d
-        else
-            echo "WARNING: $d does not exist"
-        fi
-    done
-    # copy contents into tmpfs
-    for d in $copy_dirs $temp_copy_dirs; do
-        if [ -d "$d" ]; then
-            cd $tmpfs_dir
-            tar -cpf - $d 2> /dev/null | tar xpf -
-            mount --bind $tmpfs_dir/$d $d
-        else
-            echo "WARNING: $d does not exist"
-        fi
-    done
-    # mount one file on top of another
-    for f in $bindfiles ; do
-        if [ -e "$f" ]; then
-            mkdir -p "$(dirname $tmpfs_dir/$f)"
-            cp $f $tmpfs_dir/$f
-            mount --bind $tmpfs_dir/$f $f
-        else
-            echo "WARNING: $f does not exist"
-        fi
-    done
-}
-
-bind_unmounts() {
-    for dir in $temp_copy_dirs; do
-        umount $dir
-        rm -rf $tmpfs_dir/${dir#/}
-    done
-}
-
 nbd_sendsigs_protection() {
     if [ -n "$NBD_SERVER" ]; then
         # register pids of nbd-client and nbd-proxy so that sendsigs doesn't kill