Skip to content

Commit

Permalink
rename scr binary in chroot to scr_remote
Browse files Browse the repository at this point in the history
We need different name, because for SystemNamespace we need to call in
chrooted env binary that sends there ycp, but scr is already reserved
for ScriptingAgent, so it never use ProgramComponent to run in chroot
  • Loading branch information
jreidinger committed Oct 4, 2013
1 parent 781fd38 commit eda7222
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion base/src/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
scr
scr_remote
y2base
*.log
*.trs
10 changes: 5 additions & 5 deletions base/src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,18 @@ y2base_LDFLAGS = \
AM_CXXFLAGS = -DY2LOG=\"scr\" -DSUSEVERSION=\"${SUSEVERSION}\"

serversdir = $(execcompdir)/servers
servers_PROGRAMS = scr
servers_PROGRAMS = scr_remote

AM_CPPFLAGS = ${AGENT_INCLUDES} \
-I$(srcdir)/../../libscr/src/include \
-I$(srcdir)/../../scr/src

scr_SOURCES = \
scr.cc
scr_remote_SOURCES = \
scr_remote.cc

scr_LDADD = ${AGENT_LIBADD}
scr_remote_LDADD = ${AGENT_LIBADD}

scr_LDFLAGS = \
scr_remote_LDFLAGS = \
-Xlinker --whole-archive \
$(top_builddir)/scr/src/libpy2scr.la \
$(top_builddir)/wfm/src/libpy2wfm.la \
Expand Down
2 changes: 1 addition & 1 deletion base/src/scr-smoke-test
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# smoke test:
echo "WHEN" "simply run with noting to do"
echo " IT" "exits with no error (in particular it does not segfault)"
$DIR/scr stdio scr < /dev/null
$DIR/scr_remote stdio scr < /dev/null
File renamed without changes.

0 comments on commit eda7222

Please sign in to comment.