[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Libguestfs] [PATCH 1/3] Tidy up appliance rescue code.



Richard W.M. Jones wrote:
> Subject: [PATCH 1/3] Tidy up appliance rescue code.
>
> The appliance shouldn't run the daemon after we leave the
> rescue shell.  It should just exit instead.
> ---
>  appliance/init |   10 +++++++---
>  1 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/appliance/init b/appliance/init
> index fe135b4..8b97590 100755
> --- a/appliance/init
> +++ b/appliance/init
> @@ -61,7 +61,11 @@ lsmod
>  # Improve virtio-blk performance (RHBZ#509383).
>  for f in /sys/block/vd*/queue/rotational; do echo 1 > $f; done
>
> -if grep -sq guestfs_rescue=1 /proc/cmdline; then
> -  bash -i
> +if ! grep -sq guestfs_rescue=1 /proc/cmdline; then
> +  exec guestfsd -f
>  fi
> -exec guestfsd -f
> +
> +TERM=linux ;# XXX library should pass this from library's environment
> +PS1='><rescue> '
> +export TERM PS1
> +exec bash -i

Looks right.
ACK


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]