diff options
| author | Andrew Cady <d@cryptonomic.net> | 2021-03-02 14:07:14 -0500 |
|---|---|---|
| committer | Andrew Cady <d@cryptonomic.net> | 2021-03-02 14:07:14 -0500 |
| commit | 6ee184d6cb11be436bbcd5716a6162e4ce12a09e (patch) | |
| tree | 16642360c19cb10be533c51119349a8634219458 | |
| parent | b28ae67d2dab41035d3fc786dbc417bd6d21f2d6 (diff) | |
slight refactor
| -rw-r--r-- | initramfs-tools/scripts/samizdat | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat index 93c84d2..89e39ef 100644 --- a/initramfs-tools/scripts/samizdat +++ b/initramfs-tools/scripts/samizdat | |||
| @@ -38,6 +38,15 @@ run_nbd_client() | |||
| 38 | bootdone nbd-script) | 38 | bootdone nbd-script) |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | write_resolv_dot_conf() | ||
| 42 | { | ||
| 43 | |||
| 44 | if [ "$IPV4DNS0" != '0.0.0.0' ]; then | ||
| 45 | printf '%s\n' "$IPV4DNS0" "$IPV4DNS1" | | ||
| 46 | sed -e '/^0.0.0.0$/d; s/^/nameserver /' > /root/etc/resolv.conf | ||
| 47 | fi | ||
| 48 | } | ||
| 49 | |||
| 41 | mountroot() | 50 | mountroot() |
| 42 | { | 51 | { |
| 43 | openvt -c 13 sh | 52 | openvt -c 13 sh |
| @@ -57,11 +66,7 @@ mountroot() | |||
| 57 | samizdat_install_udev_rules | 66 | samizdat_install_udev_rules |
| 58 | bootwait samizdat-gpg | 67 | bootwait samizdat-gpg |
| 59 | bootwait root-mounted | 68 | bootwait root-mounted |
| 60 | 69 | write_resolv_dot_conf | |
| 61 | if [ "$IPV4DNS0" != '0.0.0.0' ]; then | ||
| 62 | printf '%s\n' "$IPV4DNS0" "$IPV4DNS1" | | ||
| 63 | sed -e '/^0.0.0.0$/d; s/^/nameserver /' > /root/etc/resolv.conf | ||
| 64 | fi | ||
| 65 | chvt 1 | 70 | chvt 1 |
| 66 | } | 71 | } |
| 67 | 72 | ||