libguestfs/appliance.patch
Charles Arnold e135b4bcc8 - bsc#1190501 - virt-builder fails to install packages when
building an image
  9db0c98c-appliance-enable-bashs-Process-Substitution-feature.patch
- Upstream bug fixes
  c0de4de9-appliance-add-reboot-and-netconfig-for-SUSE.patch
  f47e0bb6-appliance-reorder-mounting-of-special-filesystems-in-init.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=484
2021-09-15 16:53:39 +00:00

27 lines
1008 B
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

Index: libguestfs-1.44.2/appliance/init
===================================================================
--- libguestfs-1.44.2.orig/appliance/init
+++ libguestfs-1.44.2/appliance/init
@@ -122,8 +122,10 @@ if test "$guestfs_network" = 1; then
rm -f /etc/dhcp/dhclient-enter-hooks.d/resolved
if dhclient --version >/dev/null 2>&1; then
dhclient $iface
- else
+ elif dhcpcd --version ; then
dhcpcd $iface
+ elif busybox udhcpc --help ; then
+ busybox udhcpc --quit -v
fi
fi
@@ -240,7 +242,8 @@ else
echo "Note: The contents of / (root) are the rescue appliance."
if ! test -d "/sysroot/dev"; then
echo "You have to mount the guests partitions under /sysroot"
- echo "before you can examine them."
+ echo "before you can examine them. A helper script for that exists:"
+ echo "mount-rootfs-and-chroot.sh /dev/sda2"
else
echo "Use 'cd /sysroot' or 'chroot /sysroot' to see guest filesystems."
fi