Changeset 4819 in /cluster/svnroot


Ignore:
Timestamp:
Jul 20, 2014 11:42:01 PM (6 years ago)
Author:
skylar
Message:

start bccd-networking in bccd-reset-network now that it starts in XFCE (#856)

Location:
bccd-ng/branches/skylar/bccd-3.4.0
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar/bccd-3.4.0/packages/etc/init.d/bccd-networking

    r4800 r4819  
    11#!/bin/bash -e
     2
     3set -x
    24
    35# $Id$
     
    5860                # grep dies mysteriously when run within
    5961                # invoke-rc.d; awk used instead
    60                 awk "/$NET/ { exit 1; }" < /etc/hosts.allow
    61                 if test $? -eq 0; then
     62                if awk "/$NET/ { exit 1; }" < /etc/hosts.allow; then
    6263                        echo "ALL: $n" >> /etc/hosts.allow;
    6364                fi
  • bccd-ng/branches/skylar/bccd-3.4.0/trees/bin/bccd-reset-network

    r4802 r4819  
    9191fi
    9292
    93 ${LOGCMD} -p info "Starting networking again"
    94 /usr/sbin/invoke-rc.d networking start
     93${LOGCMD} -p info "Starting BCCD networking"
     94/usr/sbin/invoke-rc.d bccd-networking start
    9595RC=$?
    9696if [ ${RC} -ne 0 ]; then
    97         fatal -m "Networking start failed" -r ${RC}
     97        fatal -m "BCCD networking start failed" -r ${RC}
    9898fi
    9999
  • bccd-ng/branches/skylar/bccd-3.4.0/trees/etc/skel/.xinitrc

    r4802 r4819  
    136136fi
    137137
     138
     139# Start bccd-reset-network in LIVE mode when XFCE4 starts (#856, skylar)
     140# Do before terminal start so that the hostname is correct
     141if test $(cat /etc/bccd-stage) = "LIVE"; then
     142    /usr/bin/sudo /bin/bccd-reset-network
     143fi
    138144
    139145xterm -ls -bg white -fg black -sl 2048 -title "BCCD" -geometry 110x25+400-25 -cr red &
     
    222228#    esac
    223229#fi
    224 
    225 # Start bccd-reset-network in LIVE mode when XFCE4 starts (#856, skylar)
    226 if test $(cat /etc/bccd-stage) = "LIVE"; then
    227     /usr/bin/sudo /bin/bccd-reset-network
    228 fi
    229230
    230231# Run xfce4-session if installed
Note: See TracChangeset for help on using the changeset viewer.