diff options
author | Jan Wagner <mail@jwagner.eu> | 2016-03-15 15:03:31 +0100 |
---|---|---|
committer | Jan Wagner <mail@jwagner.eu> | 2016-03-15 15:03:31 +0100 |
commit | 24bd7e97cf9d07454c9cde74e4d80a1b3de9dfac (patch) | |
tree | ecafd5cf7a2ff7dc25a343098ccdf66a659334f5 /bootstrap.d/20-networking.sh | |
parent | d4ab3cfce58c908c8bdf85c96ea300c47db3ac85 (diff) | |
download | rpi2-gen-image-24bd7e97cf9d07454c9cde74e4d80a1b3de9dfac.tar.gz rpi2-gen-image-24bd7e97cf9d07454c9cde74e4d80a1b3de9dfac.tar.bz2 rpi2-gen-image-24bd7e97cf9d07454c9cde74e4d80a1b3de9dfac.zip |
Added: KERNELSRC_PREBUILT, KERNELSRC_ rename, fix-quotes
Diffstat (limited to 'bootstrap.d/20-networking.sh')
-rw-r--r-- | bootstrap.d/20-networking.sh | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/bootstrap.d/20-networking.sh b/bootstrap.d/20-networking.sh index 3216f4e..bd6e8db 100644 --- a/bootstrap.d/20-networking.sh +++ b/bootstrap.d/20-networking.sh @@ -6,37 +6,37 @@ . ./functions.sh # Install and setup hostname -install_readonly files/network/hostname $R/etc/hostname -sed -i "s/^rpi2-jessie/${HOSTNAME}/" $R/etc/hostname +install_readonly files/network/hostname "$R/etc/hostname" +sed -i "s/^rpi2-jessie/${HOSTNAME}/" "$R/etc/hostname" # Install and setup hosts -install_readonly files/network/hosts $R/etc/hosts -sed -i "s/rpi2-jessie/${HOSTNAME}/" $R/etc/hosts +install_readonly files/network/hosts "$R/etc/hosts" +sed -i "s/rpi2-jessie/${HOSTNAME}/" "$R/etc/hosts" # Setup hostname entry with static IP if [ "$NET_ADDRESS" != "" ] ; then - NET_IP=$(echo ${NET_ADDRESS} | cut -f 1 -d'/') - sed -i "s/^127.0.1.1/${NET_IP}/" $R/etc/hosts + NET_IP=$(echo "${NET_ADDRESS}" | cut -f 1 -d'/') + sed -i "s/^127.0.1.1/${NET_IP}/" "$R/etc/hosts" fi # Remove IPv6 hosts if [ "$ENABLE_IPV6" = false ] ; then - sed -i -e "/::[1-9]/d" -e "/^$/d" $R/etc/hosts + sed -i -e "/::[1-9]/d" -e "/^$/d" "$R/etc/hosts" fi # Install hint about network configuration -install_readonly files/network/interfaces $R/etc/network/interfaces +install_readonly files/network/interfaces "$R/etc/network/interfaces" # Install configuration for interface eth0 -install_readonly files/network/eth.network $R/etc/systemd/network/eth.network +install_readonly files/network/eth.network "$R/etc/systemd/network/eth.network" if [ "$ENABLE_DHCP" = true ] ; then # Enable DHCP configuration for interface eth0 - sed -i -e "s/DHCP=.*/DHCP=yes/" -e "/DHCP/q" $R/etc/systemd/network/eth.network + sed -i -e "s/DHCP=.*/DHCP=yes/" -e "/DHCP/q" "$R/etc/systemd/network/eth.network" # Set DHCP configuration to IPv4 only if [ "$ENABLE_IPV6" = false ] ; then - sed -i "s/DHCP=.*/DHCP=v4/" $R/etc/systemd/network/eth.network + sed -i "s/DHCP=.*/DHCP=v4/" "$R/etc/systemd/network/eth.network" fi else # ENABLE_DHCP=false @@ -50,23 +50,23 @@ else # ENABLE_DHCP=false -e "s|Domains=\$|Domains=${NET_DNS_DOMAINS}|"\ -e "0,/NTP=\$/ s|NTP=\$|NTP=${NET_NTP_1}|"\ -e "0,/NTP=\$/ s|NTP=\$|NTP=${NET_NTP_2}|"\ - $R/etc/systemd/network/eth.network + "$R/etc/systemd/network/eth.network" fi # Remove empty settings from network configuration -sed -i "/.*=\$/d" $R/etc/systemd/network/eth.network +sed -i "/.*=\$/d" "$R/etc/systemd/network/eth.network" # Enable systemd-networkd service chroot_exec systemctl enable systemd-networkd # Install host.conf resolver configuration -install_readonly files/network/host.conf $R/etc/host.conf +install_readonly files/network/host.conf "$R/etc/host.conf" # Enable network stack hardening if [ "$ENABLE_HARDNET" = true ] ; then # Install sysctl.d configuration files - install_readonly files/sysctl.d/82-rpi-net-hardening.conf $R/etc/sysctl.d/82-rpi-net-hardening.conf + install_readonly files/sysctl.d/82-rpi-net-hardening.conf "$R/etc/sysctl.d/82-rpi-net-hardening.conf" # Setup resolver warnings about spoofed addresses - sed -i "s/^# spoof warn/spoof warn/" $R/etc/host.conf + sed -i "s/^# spoof warn/spoof warn/" "$R/etc/host.conf" fi |