--- mcore-src/trunk/mcore-tools/dracut/run-mcored.sh.in 2014/01/11 00:21:51 2237 +++ mcore-src/trunk/mcore-tools/dracut/run-mcored.sh.in 2014/01/11 00:40:11 2240 @@ -1,12 +1,12 @@ #!/bin/sh -if [ -x /usr/sbin/sslsvd -a -x /usr/sbin/mcored -a -x /usr/sbin/udhcpc -a -f /etc/conf.d/mcored -a -f /etc/conf.d/network ] +if [ -x @@SBINDIR@@/sslsvd -a -x @@SBINDIR@@/mcored -a -x @@SBINDIR@@/udhcpc -a -f @@CONFDDIR@@/mcored -a -f @@CONFDDIR@/network ] then if getargbool 1 rd.mcored then . /lib/dracut-lib.sh . /lib/net-lib.sh - . /etc/conf.d/network + . @@CONFDDIR@@/network # sane defaults [[ -z ${DEFAULT_DHCP_START} ]] && DEFAULT_DHCP_START="-T10 -t3 -n -x hostname:$(hostname) -i" @@ -16,8 +16,8 @@ then # setup networking info "Setup networking" - /usr/bin/ip link set "${_myiface}" up - /usr/sbin/udhcpc ${DEFAULT_DHCP_START} "${_myiface}" + @@BINDIR@@/ip link set "${_myiface}" up + @@SBINDIR@@/udhcpc ${DEFAULT_DHCP_START} "${_myiface}" # print ip config info "Current ip settings:" info "$(ip addr)" @@ -27,10 +27,10 @@ # start mcored info "Starting mcore daemon" export MROOT=/sysroot - . /etc/conf.d/mcored - /usr/sbin/sslsvd -U ${SSL_USER} -/ ${CHROOT_DIR} \ + . @@CONFDDIR@@/mcored + @@SBINDIR@@/sslsvd -U ${SSL_USER} -/ ${CHROOT_DIR} \ -Z ${SSL_CERT} -K ${SSL_KEY} \ - 0 6666 /usr/sbin/mcored + 0 6666 @@SBINDIR@@/mcored # remount sysroot read-only info "Remount /sysroot read-only" mount -oremount,ro /sysroot