Commit 882f58aa authored by Sven Breuner's avatar Sven Breuner

ctl: rename executable from beegfs-online-cfg to beegfs-ctl

also added a symlink for the project dir (beegfs_ctl -> fhgfs_online_cfg)
parent 0fb2b248
......@@ -5,7 +5,7 @@
BEEGFS_COMMON_PATH ?= ../../beegfs_common/
BEEGFS_OPENTK_PATH ?= ../../beegfs_opentk_lib/
BEEGFS_ONLINE_CFG_PATH ?= ../../beegfs_online_cfg
BEEGFS_ONLINE_CFG_PATH ?= ../../beegfs_ctl
BEEGFS_FSCK_PATH ?= ../../beegfs_fsck
ifneq ($(BEEGFS_VERSION),)
......
......@@ -8,7 +8,7 @@ source ../../beegfs-version
BEEGFS_OPENTK_PATH=${BEEGFS_OPENTK_PATH:-`readlink -f ../../beegfs_opentk_lib`}
BEEGFS_COMMON_PATH=${BEEGFS_COMMON_PATH:-`readlink -f ../../beegfs_common`}
BEEGFS_ONLINE_CFG_PATH=${BEEGFS_ONLINE_CFG_PATH:-`readlink -f ../../beegfs_online_cfg`}
BEEGFS_ONLINE_CFG_PATH=${BEEGFS_ONLINE_CFG_PATH:-`readlink -f ../../beegfs_ctl`}
BEEGFS_FSCK_PATH=${BEEGFS_FSCK_PATH:-`readlink -f ../../beegfs_fsck`}
CHANGELOG="debian/changelog"
......
......@@ -25,7 +25,7 @@ rm -f $BUILD/buildroot/SOURCES/*.tgz
BEEGFS_OPENTK_PATH=${BEEGFS_OPENTK_PATH:-`readlink -f ../../beegfs_opentk_lib`}
BEEGFS_COMMON_PATH=${BEEGFS_COMMON_PATH:-`readlink -f ../../beegfs_common`}
BEEGFS_ONLINE_CFG_PATH=${BEEGFS_ONLINE_CFG_PATH:-`readlink -f ../../beegfs_online_cfg`}
BEEGFS_ONLINE_CFG_PATH=${BEEGFS_ONLINE_CFG_PATH:-`readlink -f ../../beegfs_ctl`}
BEEGFS_FSCK_PATH=${BEEGFS_FSCK_PATH:-`readlink -f ../../beegfs_fsck`}
......
# This is the beegfs-online-cfg makefile.
# This is the beegfs-ctl makefile.
# It creates an ELF executable.
#
# Use "make help" to find out about configuration options.
......@@ -10,7 +10,7 @@ BEEGFS_THIRDPARTY_PATH ?= ../../beegfs_thirdparty/
BEEGFS_DEVEL_INCLUDE_PATH ?= ../../beegfs_utils/include
CPPUNIT_INC_PATH ?= $(BEEGFS_THIRDPARTY_PATH)/source/cppunit_install/usr/local/include
EXE = beegfs-online-cfg
EXE = beegfs-ctl
# note: general CXXFLAGS contains "-ggdb3" for $(EXE)-unstripped, normal $(EXE)
# is stripped later.
......
......@@ -516,7 +516,7 @@ void App::initLocalNodeInfo() throw(InvalidConfigException)
localNicList.sort(&NetworkInterfaceCard::nicAddrPreferenceComp);
std::string nodeID = System::getHostname() + "-" + StringTk::uint64ToHexStr(System::getPID() ) +
"-" + StringTk::uintToHexStr(TimeAbs().getTimeMS() ) + "-" "online_cfg";
"-" + StringTk::uintToHexStr(TimeAbs().getTimeMS() ) + "-" "ctl";
localNode = new LocalNode(nodeID, 0, 0, 0, localNicList);
......
This package contains fhgfs_online_cfg, fhgfs_fsck and some helper scripts
This package contains fhgfs_ctl, fhgfs_fsck and some helper scripts
which make typical tasks easier for the user/admin.
......@@ -6,7 +6,7 @@
BEEGFS_COMMON_PATH ?= ../../beegfs_common/
BEEGFS_OPENTK_PATH ?= ../../beegfs_opentk_lib/
BEEGFS_THIRDPARTY_PATH ?= ../../beegfs_thirdparty/
BEEGFS_ONLINE_CFG_PATH ?= ../../beegfs_online_cfg
BEEGFS_ONLINE_CFG_PATH ?= ../../beegfs_ctl
BEEGFS_FSCK_PATH ?= ../../beegfs_fsck
BEEGFS_JAVA_LIB_PATH ?= ../../beegfs_java_lib
......@@ -19,15 +19,15 @@ BEEGFS_EXTRA_FLAGS += 'BEEGFS_DEBUG=$(BEEGFS_DEBUG)'
endif
all: beegfs_online_cfg beegfs_fsck beegfs_java_lib
all: beegfs_ctl beegfs_fsck beegfs_java_lib
beegfs_online_cfg:
beegfs_ctl:
$(MAKE) BEEGFS_COMMON_PATH=$(BEEGFS_COMMON_PATH) \
BEEGFS_OPENTK_PATH=$(BEEGFS_OPENTK_PATH) \
BEEGFS_THIRDPARTY_PATH=$(BEEGFS_THIRDPARTY_PATH) \
$(EXTRA_FLAGS) $(BEEGFS_EXTRA_FLAGS) \
-C $(BEEGFS_ONLINE_CFG_PATH)/build
cp $(BEEGFS_ONLINE_CFG_PATH)/build/beegfs-online-cfg .
cp $(BEEGFS_ONLINE_CFG_PATH)/build/beegfs-ctl .
beegfs_fsck:
$(MAKE) BEEGFS_COMMON_PATH=$(BEEGFS_COMMON_PATH) \
......@@ -46,7 +46,7 @@ clean:
$(MAKE) -C $(BEEGFS_FSCK_PATH)/build clean
# $(MAKE) -C $(BEEGFS_JAVA_LIB_PATH)/build clean
rm -f beegfs-online-cfg
rm -f beegfs-ctl
rm -f beegfs-fsck
rpm:
......
......@@ -84,7 +84,7 @@ make BEEGFS_OPENTK_PATH=%{BEEGFS_OPENTK_PATH} \
cd build
echo "mkdir RPM_BUILD_ROOT (${RPM_BUILD_ROOT})"
mkdir -p ${RPM_BUILD_ROOT}
install -D --mode=u+rwxs,g+rx,o+rx beegfs-online-cfg ${RPM_BUILD_ROOT}/opt/beegfs/sbin/beegfs-ctl
install -D --mode=u+rwxs,g+rx,o+rx beegfs-ctl ${RPM_BUILD_ROOT}/opt/beegfs/sbin/beegfs-ctl
install -D beegfs-fsck ${RPM_BUILD_ROOT}/opt/beegfs/sbin/beegfs-fsck
install -D ../source/beegfs-ondemand ${RPM_BUILD_ROOT}/opt/beegfs/sbin/beegfs-ondemand
install -D ../source/beegfs-ondemand-v2 ${RPM_BUILD_ROOT}/opt/beegfs/sbin/beegfs-ondemand-v2
......
......@@ -47,7 +47,7 @@ clean:
BEEGFS_ONLINE_CFG_PATH='__BEEGFS_ONLINE_CFG_PATH__' \
BEEGFS_FSCK_PATH='__BEEGFS_FSCK_PATH__' \
clean
rm -f beegfs-online-cfg
rm -f beegfs-ctl
rm -f beegfs-fsck
dh_clean
......@@ -59,7 +59,7 @@ install: build
dh_installdirs
# manual installation
install -D --mode=u+rwxs,g+rx,o+rx beegfs-online-cfg $(DEB_BUILD_ROOT)/opt/beegfs/sbin/beegfs-ctl
install -D --mode=u+rwxs,g+rx,o+rx beegfs-ctl $(DEB_BUILD_ROOT)/opt/beegfs/sbin/beegfs-ctl
install -D beegfs-fsck $(DEB_BUILD_ROOT)/opt/beegfs/sbin/beegfs-fsck
install -D ../source/beegfs-ondemand $(DEB_BUILD_ROOT)/opt/beegfs/sbin/beegfs-ondemand
install -D ../source/beegfs-ondemand-v2 $(DEB_BUILD_ROOT)/opt/beegfs/sbin/beegfs-ondemand-v2
......
......@@ -11,7 +11,7 @@ CONCURRENCY=${MAKE_CONCURRENCY:-4}
BEEGFS_OPENTK_PATH=${BEEGFS_OPENTK_PATH:-`readlink -f ../../beegfs_opentk_lib`}
BEEGFS_COMMON_PATH=${BEEGFS_COMMON_PATH:-`readlink -f ../../beegfs_common`}
BEEGFS_THIRDPARTY_PATH=${BEEGFS_THIRDPARTY_PATH:-`readlink -f ../../beegfs_thirdparty`}
BEEGFS_ONLINE_CFG_PATH=${BEEGFS_ONLINE_CFG_PATH:-`readlink -f ../../beegfs_online_cfg`}
BEEGFS_ONLINE_CFG_PATH=${BEEGFS_ONLINE_CFG_PATH:-`readlink -f ../../beegfs_ctl`}
BEEGFS_FSCK_PATH=${BEEGFS_FSCK_PATH:-`readlink -f ../../beegfs_fsck`}
CHANGELOG="debian/changelog"
......
......@@ -31,7 +31,7 @@ rm -f $BUILD/buildroot/SOURCES/*.tgz
BEEGFS_OPENTK_PATH=${BEEGFS_OPENTK_PATH:-`readlink -f ../../beegfs_opentk_lib`}
BEEGFS_COMMON_PATH=${BEEGFS_COMMON_PATH:-`readlink -f ../../beegfs_common`}
BEEGFS_THIRDPARTY_PATH=${BEEGFS_THIRDPARTY_PATH:-`readlink -f ../../beegfs_thirdparty`}
BEEGFS_ONLINE_CFG_PATH=${BEEGFS_ONLINE_CFG_PATH:-`readlink -f ../../beegfs_online_cfg`}
BEEGFS_ONLINE_CFG_PATH=${BEEGFS_ONLINE_CFG_PATH:-`readlink -f ../../beegfs_ctl`}
BEEGFS_FSCK_PATH=${BEEGFS_FSCK_PATH:-`readlink -f ../../beegfs_fsck`}
BEEGFS_JAVA_LIB_PATH=${BEEGFS_JAVA_LIB_PATH:-`readlink -f ../../beegfs_java_lib`}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment