[Libguestfs] [PATCH] appliance: move virt-rescue welcome to /etc/issue

[Richard W.M. Jones]

On Thu, Jul 21, 2016 at 10:26:16AM +0200, Cédric Bosdonnat wrote:
> @@ -49,6 +50,7 @@ superminfs_DATA = \
>  	supermin.d/base.tar.gz \
>  	supermin.d/daemon.tar.gz \
>  	supermin.d/excludefiles \
> +	supermin.d/extras.tar.gz \

Let's just call this 'issue.tar.gz' or 'etc_issue.tar.gz' or something
that describes what it contains.

>  	supermin.d/hostfiles \
>  	supermin.d/init.tar.gz \
>  	supermin.d/packages \
> @@ -107,6 +109,15 @@ supermin.d/excludefiles: excludefiles.in Makefile
>  	cmp -s $@ excludefiles-t || mv excludefiles-t $@
>  	rm -f excludefiles-t
>  
> +supermin.d/extras.tar.gz: issue
> +	rm -f $@ $@-t
> +	rm -rf tmp-d
> +	mkdir -p tmp-d/etc
> +	cp issue tmp-d/etc 

^ extra whitespace at the end of this line

> +	( cd tmp-d && tar zcf - * ) > $@-t
> +	rm -r tmp-d
> +	mv $@-t $@
> +
>  supermin.d/hostfiles: hostfiles.in Makefile
>  	m4 $(PACKAGELIST_CPP_FLAGS) $< | \
>  	grep -v '^[[:space:]]*$$' | grep -v '^#' > hostfiles-t
> diff --git a/appliance/init b/appliance/init
> index 3816dfd..e549df0 100755
> --- a/appliance/init
> +++ b/appliance/init
> @@ -184,15 +184,8 @@ else
>    echo "PS1='><rescue> '" >> $HOME/.bashrc
>    echo "export TERM PS1" >> $HOME/.bashrc
>  
> -  echo
> -  echo "------------------------------------------------------------"
> -  echo
> -  echo "Welcome to virt-rescue, the libguestfs rescue shell."
> -  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
> +  cat /etc/issue
> +
>    bash -i
>    echo
>    echo "virt-rescue: Syncing the disk now before exiting ..."
> diff --git a/appliance/issue b/appliance/issue
> new file mode 100644
> index 0000000..40b8e17
> --- /dev/null
> +++ b/appliance/issue
> @@ -0,0 +1,9 @@
> +
> +------------------------------------------------------------
> +
> +Welcome to virt-rescue, the libguestfs rescue shell.
> +  
> +Note: The contents of / are the rescue appliance.
> +You have to mount the guest's partitions under /sysroot
> +before you can examine them.
> +

The rest looks OK to me, with the changes above.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html