diff options
4 files changed, 11 insertions, 8 deletions
diff --git a/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service b/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service index 808f733a..8746629c 100644 --- a/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service +++ b/remote/modules/vmchooser/data/etc/systemd/system/var-lib-virt.service @@ -3,6 +3,7 @@ Description=Mount vm-store NFS After=download-config.service network.target Requires=network.target DefaultDependencies=no +ConditionPathExists=/run/udhcpc/network-ready [Service] Type=oneshot diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/download-config.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/download-config.service index e60b28b7..fca8ee5b 100644 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/download-config.service +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/download-config.service @@ -4,4 +4,5 @@ DefaultDependencies=no [Service] Type=oneshot +RemainAfterExit=yes ExecStart=/opt/openslx/bin/activate-sysconfig diff --git a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service index 402df6cb..4acfb046 100644 --- a/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service +++ b/remote/rootfs/rootfs-stage32/data/etc/systemd/system/ntpdate.service @@ -2,6 +2,7 @@ Description=Update date from local time server After=network.target Requires=network.target +ConditionPathExists=/run/udhcpc/network-ready [Service] Type=oneshot diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build index 73b1a894..39c96ccc 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build @@ -14,21 +14,21 @@ build() { FILELIST="list_binaries_and_files" [ -e "${FILELIST}" ] && rm "${FILELIST}" + # Compile rdns + mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" + gcc -o "$MODULE_BUILD_DIR/opt/openslx/bin/rdns" "$MODULE_DIR/rdns.c" || perror "Compiling rdns failed." + pinfo "Searching binaries from config file in system..." for BIN in ${REQUIRED_BINARIES} do - BIN_LOCATION="$(which ${BIN})" - if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ]; - then - get_link_chain ${BIN_LOCATION} >> "${FILELIST}" + [ -n "$(find "$MODULE_BUILD_DIR" -name "$BIN")" ] && continue + BIN_LOCATION="$(which "$BIN")" + if [ ! -z "$BIN_LOCATION" -a -e "$BIN_LOCATION" ]; then + get_link_chain "$BIN_LOCATION" >> "$FILELIST" else perror "${BIN} not found on the system! Please install it." fi done - # Compile rdns - mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin" - gcc -o "$MODULE_BUILD_DIR/opt/openslx/bin/rdns" "$MODULE_DIR/rdns.c" || perror "Compiling rdns failed." - REQUIRED_BINARIES+=" rdns" pinfo "Searching libraries from config file in system... (could take some time)" for LIB in ${REQUIRED_LIBRARIES} |