diff options
| author | Andrew Lutomirski <andy@luto.us> | 2017-11-22 09:25:37 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-22 09:25:37 -0800 |
| commit | 17888c778bc84e633ee160928603fd32537772b2 (patch) | |
| tree | ddd7de5fd9695c2d9fcb81c3cec9ff9f8910c62f | |
| parent | c44d06459ba7ecb1f2c3b994ef6685ae2bdfc8fc (diff) | |
| parent | c39a1cd18f9dd377a113bcc65bcd1e550701520b (diff) | |
| download | virtme-17888c778bc84e633ee160928603fd32537772b2.tar.gz | |
Merge pull request #15 from fzago-cray/forupstream
Minor changes for Debian/Ubuntu and OpenSUSE
| -rwxr-xr-x | virtme/guest/virtme-udhcpc-script | 4 | ||||
| -rw-r--r-- | virtme/mkinitramfs.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/virtme/guest/virtme-udhcpc-script b/virtme/guest/virtme-udhcpc-script index ae2eb66..d9876d5 100755 --- a/virtme/guest/virtme-udhcpc-script +++ b/virtme/guest/virtme-udhcpc-script @@ -13,8 +13,10 @@ elif [[ "$1" == "bound" ]]; then ip route add default via "$router" dev "$interface" if [[ -n "$dns" ]]; then # A lot of systems will have /etc/resolv.conf symlinked to - # /run/NetworkManager/something_or_other. Create the directory. + # /run/NetworkManager/something_or_other. Debian symlinks to /run/resolvconf. + # Create both directories. install -d /run/NetworkManager + install -d /run/resolvconf echo -e "# Generated by virtme-udhcpc-script\n\nnameserver $dns" \ >/etc/resolv.conf diff --git a/virtme/mkinitramfs.py b/virtme/mkinitramfs.py index 9ea8afe..ecb70ff 100644 --- a/virtme/mkinitramfs.py +++ b/virtme/mkinitramfs.py @@ -164,6 +164,7 @@ def mkinitramfs(out, config): def find_busybox(root, is_native): for path in ('usr/local/bin/busybox', 'usr/local/sbin/busybox', + 'usr/bin/busybox-static', 'usr/bin/busybox', 'usr/sbin/busybox', 'bin/busybox', 'sbin/busybox'): if os.path.isfile(os.path.join(root, path)): |