diff options
Diffstat (limited to 'remote/tools')
| -rw-r--r-- | remote/tools/base/base.build | 9 | ||||
| -rw-r--r-- | remote/tools/base/base.conf | 7 | ||||
| -rw-r--r-- | remote/tools/dbus/dbus.build | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build index 06ff22b7..efabaedd 100644 --- a/remote/tools/base/base.build +++ b/remote/tools/base/base.build @@ -20,10 +20,7 @@ build() { if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ]; then pdebug "Processing $BIN at $BIN_LOCATION ..." - echo ${BIN_LOCATION} >> "${FILELIST}" - [ -L "${BIN_LOCATION}" ] \ - && pdebug "${BIN_LOCATION} is a symbolic link, copying $(readlink -f "${BIN_LOCATION}")" \ - && echo $(readlink -f "${BIN_LOCATION}") >> "${FILELIST}" + get_link_chain ${BIN_LOCATION} >> "${FILELIST}" else perror "${BIN} not found on the system! Please install it." fi @@ -31,9 +28,9 @@ build() { for LIB in ${REQUIRED_LIBRARIES} do - for LIB_LOCATION in $(find /lib/ -name "${LIB}.so\*") + for LIB_LOCATION in $(find /lib/ -name "${LIB}.so*") do - echo ${LIB_LOCATION} >> "${FILELIST}" + get_link_chain "${LIB_LOCATION}" >> "${FILELIST}" done done diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf index 85b638e6..6a95ab2c 100644 --- a/remote/tools/base/base.conf +++ b/remote/tools/base/base.conf @@ -9,7 +9,8 @@ REQUIRED_BINARIES=" bash sulogin mount umount - mount.nfs + mount.nfs4 + umount.nfs4 mount.aufs umount.aufs rm @@ -40,9 +41,7 @@ REQUIRED_LIBRARIES=" libcap libau" REQUIRED_DIRECTORIES=" /etc/pam.d /etc/security" -REQUIRED_FILES=" /sbin/mount.nfs4 - /sbin/umount.nfs4 - /etc/environment +REQUIRED_FILES=" /etc/environment /etc/pam.conf /etc/issue /etc/inputrc diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build index 5254497f..331d49e4 100644 --- a/remote/tools/dbus/dbus.build +++ b/remote/tools/dbus/dbus.build @@ -21,7 +21,7 @@ build() { # prepare target dir & copy there [ ! -d ${BUILDDIR} ] && mkdir -p ${BUILDDIR} - (tar -cpv $(cat ${COPYLIST}|sort -u) | tar -xpv -C ${BUILDDIR}) &> /dev/null + tar -cp $(cat ${COPYLIST}|sort -u) | tar -xp -C ${BUILDDIR} } post_copy() { |