diff options
| author | Simon Rettberg | 2018-04-19 17:27:29 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-04-19 17:27:29 +0200 |
| commit | a1f380fabd251e62df0139cd9f61b75c6477ac8b (patch) | |
| tree | a0c3b2a2e10d17d9932027d55d408c81c310b7f9 /satellit_installer/includes/10-configurations.inc | |
| parent | [SSUS] added permissionmanager to slxadmin module link list (diff) | |
| download | setup-scripts-a1f380fabd251e62df0139cd9f61b75c6477ac8b.tar.gz setup-scripts-a1f380fabd251e62df0139cd9f61b75c6477ac8b.tar.xz setup-scripts-a1f380fabd251e62df0139cd9f61b75c6477ac8b.zip | |
[SSPS] Kill dup files; move tftpd files around
Diffstat (limited to 'satellit_installer/includes/10-configurations.inc')
| -rw-r--r-- | satellit_installer/includes/10-configurations.inc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/satellit_installer/includes/10-configurations.inc b/satellit_installer/includes/10-configurations.inc index 0ab68f8..7ea5355 100644 --- a/satellit_installer/includes/10-configurations.inc +++ b/satellit_installer/includes/10-configurations.inc @@ -3,15 +3,8 @@ patch_tftpd-hpa_config() { [ "$SYSTEMD" ] && systemctl stop tftpd-hpa || /etc/init.d/tftpd-hpa stop 2>/dev/null 1>&2 echo "ok." # No sense in patching, we will drop this little entry. - echo -n "# Patching tftpd-hpa configuration... " - cat <<- HEREDOC > /etc/default/tftpd-hpa - # /etc/default/tftpd-hpa - TFTP_USERNAME="tftp" - TFTP_DIRECTORY="/srv/openslx/tftp" - TFTP_ADDRESS="0.0.0.0:69" - TFTP_OPTIONS="--secure" - HEREDOC - echo "ok." + echo "# Patching tftpd-hpa configuration... " + cp -p "$BASEDIR/static_files/tftpd/tftpd-hpa" "/etc/default/tftpd-hpa" || perror "failed" # sometimes a tftp stating line remains in /etc/inetd.conf. Let's have a look and kill this interesting line: echo -n "# Checking /etc/inetd.conf for a tftp entry... " if [ -f /etc/inetd.conf ]; then @@ -28,8 +21,8 @@ patch_tftpd-hpa_config() { } copy_tftpd-hpa_service() { - echo -n "# Copying tftpd-hpa service file... " - cp -p "$BASEDIR/static_files/tftpd-hpa.service" /etc/systemd/system && echo "ok." || perror "failed." + echo "# Copying tftpd-hpa service file... " + cp -p "$BASEDIR/static_files/tftpd/tftpd-hpa.service" "/etc/systemd/system/tftpd-hpa.service" || perror "failed" echo -n "# Linking tftpd-hpa service file into (/etc/systemd/system/)multi-user.target.wants... " ln -s ../tftpd-hpa.service /etc/systemd/system/multi-user.target.wants/tftpd-hpa.service \ && echo "ok." || perror "Could not link tftpd-hpa service file into multiuser target!" |