[Libguestfs] [PATCH v2 04/11] customize: change windows firstboot path
Richard W.M. Jones
rjones at redhat.com
Fri May 20 09:21:45 UTC 2016
On Wed, May 18, 2016 at 02:00:52PM +0200, Cédric Bosdonnat wrote:
> Rename the C:\Program Files\Red Hat\Firstboot folder into the more vendor
> independent C:\Program Files\Guestfs\Firstboot.
> ---
> builder/virt-builder.pod | 2 +-
> customize/firstboot.ml | 2 +-
> v2v/test-v2v-in-place.sh | 2 +-
> v2v/test-v2v-virtio-win-iso.sh | 2 +-
> v2v/test-v2v-windows-conversion.sh | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
> index 9a49138..dc36c13 100644
> --- a/builder/virt-builder.pod
> +++ b/builder/virt-builder.pod
> @@ -849,7 +849,7 @@ C<VIRT_TOOLS_DATA_DIR> environment variable; if not set, a compiled-in
> default will be used (something like F</usr/share/virt-tools>).
>
> The output of the first boot scripts is available in the guest as
> -F<C:\Program Files\Red Hat\Firstboot\log.txt>.
> +F<C:\Program Files\Guestfs\Firstboot\log.txt>.
>
> =back
>
> diff --git a/customize/firstboot.ml b/customize/firstboot.ml
> index 83bd808..4167098 100644
> --- a/customize/firstboot.ml
> +++ b/customize/firstboot.ml
> @@ -211,7 +211,7 @@ module Windows = struct
> g#mkdir_p firstboot_dir;
> loop firstboot_dir firstboot_dir_win path
> in
> - loop "" "C:" ["Program Files"; "Red Hat"; "Firstboot"] in
> + loop "" "C:" ["Program Files"; "Guestfs"; "Firstboot"] in
>
> g#mkdir_p (firstboot_dir // "scripts");
>
> diff --git a/v2v/test-v2v-in-place.sh b/v2v/test-v2v-in-place.sh
> index e55daa0..444790c 100755
> --- a/v2v/test-v2v-in-place.sh
> +++ b/v2v/test-v2v-in-place.sh
> @@ -99,7 +99,7 @@ mktest ()
> :> "$script"
> :> "$expected"
>
> -firstboot_dir="/Program Files/Red Hat/Firstboot"
> +firstboot_dir="/Program Files/Guestfs/Firstboot"
> mktest "is-dir \"$firstboot_dir\"" true
> mktest "is-file \"$firstboot_dir/firstboot.bat\"" true
> mktest "is-dir \"$firstboot_dir/scripts\"" true
> diff --git a/v2v/test-v2v-virtio-win-iso.sh b/v2v/test-v2v-virtio-win-iso.sh
> index a9f937c..49cda02 100755
> --- a/v2v/test-v2v-virtio-win-iso.sh
> +++ b/v2v/test-v2v-virtio-win-iso.sh
> @@ -93,7 +93,7 @@ mktest ()
> :> "$script"
> :> "$expected"
>
> -firstboot_dir="/Program Files/Red Hat/Firstboot"
> +firstboot_dir="/Program Files/Guestfs/Firstboot"
> mktest "is-dir \"$firstboot_dir\"" true
> mktest "is-file \"$firstboot_dir/firstboot.bat\"" true
> mktest "is-dir \"$firstboot_dir/scripts\"" true
> diff --git a/v2v/test-v2v-windows-conversion.sh b/v2v/test-v2v-windows-conversion.sh
> index 8406743..5e745c7 100755
> --- a/v2v/test-v2v-windows-conversion.sh
> +++ b/v2v/test-v2v-windows-conversion.sh
> @@ -86,7 +86,7 @@ mktest ()
> :> "$script"
> :> "$expected"
>
> -firstboot_dir="/Program Files/Red Hat/Firstboot"
> +firstboot_dir="/Program Files/Guestfs/Firstboot"
> mktest "is-dir \"$firstboot_dir\"" true
> mktest "is-file \"$firstboot_dir/firstboot.bat\"" true
> mktest "is-dir \"$firstboot_dir/scripts\"" true
I think we should do this unless Roman has any objection
(eg. if you've got any software which depends on the
specific path).
So, ACK from me.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://libguestfs.org
More information about the Libguestfs
mailing list