diff options
| author | Simon Rettberg | 2022-05-23 15:19:05 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2022-05-23 15:19:30 +0200 |
| commit | 2166aa15ea56fa627bbe6bd020fc2fc1335a481c (patch) | |
| tree | c3a0fd22ffe464b4b726356ad5af16a9df0caa2d /modules.d/slx-network/hooks/copy-network-files.sh | |
| parent | config(.tgz): Increase retry timeout to 20 seconds, use --slx-time (diff) | |
| download | systemd-init-2166aa15ea56fa627bbe6bd020fc2fc1335a481c.tar.gz systemd-init-2166aa15ea56fa627bbe6bd020fc2fc1335a481c.tar.xz systemd-init-2166aa15ea56fa627bbe6bd020fc2fc1335a481c.zip | |
Merge DNS search list from DHCP and config server (SLX_NET_SEARCH)
Diffstat (limited to 'modules.d/slx-network/hooks/copy-network-files.sh')
| -rw-r--r-- | modules.d/slx-network/hooks/copy-network-files.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules.d/slx-network/hooks/copy-network-files.sh b/modules.d/slx-network/hooks/copy-network-files.sh index d1dd48d1..5d28669e 100644 --- a/modules.d/slx-network/hooks/copy-network-files.sh +++ b/modules.d/slx-network/hooks/copy-network-files.sh @@ -6,13 +6,13 @@ if [ -n "$NEWROOT" ]; then # backup network configuration files found in stage4 for file in /etc/{hostname,hosts,resolv.conf}; do if [ ! -e "$file" ]; then - warn "Missing '$file' - won't move it to stage4. " + warn "Missing '$file' - can't move it to stage4. " continue fi if [ -e "${NEWROOT}/${file}" ] || [ -h "${NEWROOT}/${file}" ]; then - mv "${NEWROOT}/${file}" "${NEWROOT}/${file}.stage4" + mv "${NEWROOT}/${file}" "${NEWROOT}/${file}.renamed-by-stage3" fi - cp -af "$file" "${NEWROOT}/etc" + cp -af "$file" "${NEWROOT}/etc/" done # special handling for resolv.conf: # move it to /opt/openslx to detect we are managing it |