Skip to content

Commit

Permalink
Add default "Home directory" entry in device.conf
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Harvey <markh794@gmail.com>
  • Loading branch information
markh794 authored and Mark Harvey committed Aug 2, 2012
1 parent cb53724 commit e8c899f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions etc/Makefile
Expand Up @@ -2,11 +2,15 @@
RCFILE = mhvtl
USR ?= vtl
MHVTL_CONFIG_PATH ?= /etc/mhvtl
MHVTL_HOME_PATH ?= /opt/mhvtl

CONFIG_PATH = $(shell echo $(MHVTL_CONFIG_PATH) | sed -e s'/\//\\\//g')
HOME_PATH = $(shell echo $(MHVTL_HOME_PATH) | sed -e s'/\//\\\//g')

$(RCFILE): $(RCFILE).in
sed -e s'/@USR@/$(USR)/' $< > $@.1
sed -e s'/@CONF_PATH@/$(CONFIG_PATH)/' $@.1 > $@
sed -i s'/@HOME_PATH@/$(HOME_PATH)/' $@
rm -f $@.1

.PHONY: rcfile
Expand Down
2 changes: 2 additions & 0 deletions etc/mhvtl.in
Expand Up @@ -33,6 +33,7 @@

USER=@USR@
MHVTL_CONFIG_PATH=@CONF_PATH@
MHVTL_HOME_PATH=@HOME_PATH@

DEVICE_CONF=$MHVTL_CONFIG_PATH/device.conf

Expand All @@ -59,6 +60,7 @@ echo " Product identification: $6" >> $DEVICE_CONF
echo " Unit serial number: $8" >> $DEVICE_CONF
printf " NAA: %02d:22:33:44:ab:%02d:%02d:%02d\n" \
$ID $CH $TARGET $LUN >> $DEVICE_CONF
echo " Home directory: $MHVTL_HOME_PATH" >> $DEVICE_CONF
echo "# fifo: /var/tmp/mhvtl" >> $DEVICE_CONF
echo "" >> $DEVICE_CONF
}
Expand Down

0 comments on commit e8c899f

Please sign in to comment.