SHA256
1
0
forked from pool/libguestfs
libguestfs/appliance.patch

35 lines
1.5 KiB
Diff

Index: libguestfs-1.36.5/appliance/init
===================================================================
--- libguestfs-1.36.5.orig/appliance/init
+++ libguestfs-1.36.5/appliance/init
@@ -206,7 +206,9 @@ else
echo
echo "Note: The contents of / are the rescue appliance."
echo "You have to mount the guest's 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"
+
echo
run_bash_with_ctty
echo
Index: libguestfs-1.36.5/m4/guestfs_appliance.m4
===================================================================
--- libguestfs-1.36.5.orig/m4/guestfs_appliance.m4
+++ libguestfs-1.36.5/m4/guestfs_appliance.m4
@@ -97,9 +97,13 @@ AC_MSG_CHECKING([which Linux distro for
if test -f /etc/os-release; then
( . /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' ) >&AS_MESSAGE_LOG_FD
DISTRO="`. /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`"
+ if test -z "$DISTRO"; then
+ ( . /etc/os-release && echo $ID_LIKE | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' ) >&AS_MESSAGE_LOG_FD
+ DISTRO="`. /etc/os-release && echo $ID_LIKE | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`"
+ fi
AS_CASE([$DISTRO],
[FEDORA | RHEL | CENTOS],[DISTRO=REDHAT],
- [OPENSUSE | SLED | SLES],[DISTRO=SUSE],
+ [OPENSUSE | SLED | SLES | SUSE],[DISTRO=SUSE],
[ARCH],[DISTRO=ARCHLINUX])
elif test -f /etc/debian_version; then
DISTRO=DEBIAN