Re: [Libguestfs] [PATCH 13/13] syntax-check: fix trailing_blank check
On Tuesday 23 September 2014 17:20:39 Hu Tao wrote: > Signed-off-by: Hu Tao > --- > builder/website/index | 120 +- > builder/website/index.asc | 120 +- The index files for virt-builder need a trailing space to indicate a continuation line in notes, so the changes in these files are not correct. > fish/test-file-attrs.sh| 10 +- This is comparing the output that you get from guestish, so the changes here are not correct. > guestfs-release-notes.txt | 520 > - guestfs-release-notes.txt is generated from guestfs-release-notes.pod. > podwrapper.pl.in | 6 +- > tools/virt-win-reg | 2 +- > v2v/test-v2v-print-source.sh | 4 +- > 11 files changed, 395 insertions(+), 395 deletions(-) > > diff --git a/builder/website/debian.preseed > b/builder/website/debian.preseed index faa4430..d3158a5 100644 > --- a/builder/website/debian.preseed > +++ b/builder/website/debian.preseed > @@ -227,7 +227,7 @@ d-i partman/confirm_nooverwrite boolean true > # so this will only work if the disks are the same size. > #d-i partman-auto/disk string /dev/sda /dev/sdb > > -# Next you need to specify the physical partitions that will be used. > +# Next you need to specify the physical partitions that will be > used. #d-i partman-auto/expert_recipe string \ > # multiraid :: \ > # 1000 5000 4000 raid \ > diff --git a/builder/website/index b/builder/website/index > index 5645ddf..aea33aa 100644 > --- a/builder/website/index > +++ b/builder/website/index > @@ -10,14 +10,14 @@ size=6442450944 > compressed_size=197139324 > expand=/dev/sda3 > notes=CentOS 6.5 > - > + > This CentOS image contains only unmodified @Core group packages. > - > + > It is thus very minimal. The kickstart and install script can be > found in the libguestfs source tree: > - > + > builder/website/centos.sh > - > + > Note that `virt-builder centos-6' will always install the latest > 6.x release. > > @@ -32,12 +32,12 @@ size=6442450944 > compressed_size=213203844 > expand=/dev/sda3 > notes=CentOS 7.0 > - > + > This CentOS image contains only unmodified @Core group packages. > - > + > It is thus very minimal. The kickstart and install script can be > found in the libguestfs source tree: > - > + > builder/website/centos.sh > > [cirros-0.3.1] > @@ -50,13 +50,13 @@ size=41126400 > compressed_size=11419004 > expand=/dev/sda1 > notes=CirrOS 0.3.1 > - > + > CirrOS is a commonly used test image, ideal because it is very > small and boots into a minimally usable Linux system. > - > + > Note this is not a real Linux distribution, and several virt-builder > features such as installing packages will not (and cannot) work. - > + > This CirrOS image comes from https://launchpad.net/cirros > > [debian-6] > @@ -71,24 +71,24 @@ size=4294967296 > compressed_size=139615908 > expand=/dev/sda1 > notes=Debian 6 (Squeeze). > - > + > This is a default Debian install. > - > + > The preseed and virt-install scripts that produced this image > can be found in the libguestfs source tree: > - > + > builder/website/debian.preseed > builder/website/debian.sh > - > + > This image is so very minimal that it only includes an ssh > server and no virtual consoles. To enable virtual consoles > use this virt-builder option: > - > + > virt-builder debian-6 \ > --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' > - > + > This image does not contain SSH host keys. To regenerate them use: > - > + > --firstboot-command "dpkg-reconfigure openssh-server" > > [debian-7] > @@ -103,24 +103,24 @@ size=4294967296 > compressed_size=150734028 > expand=/dev/sda1 > notes=Debian 7 (Wheezy). > - > + > This is a default Debian install. > - > + > The preseed and virt-install scripts that produced this image > can be found in the libguestfs source tree: > - > + > builder/website/debian.preseed > builder/website/debian.sh > - > + > This image is so very minimal that it only includes an ssh > server and no virtual consoles. To enable virtual consoles > use this virt-builder option: > - > + > virt-builder debian-7 \ > --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' > - > + > This image does not contain SSH host keys. To regenerate them use: > - > + > --firstboot-command "dpkg-reconfigure openssh-server" > > [fedora-18] > @@ -134,14 +134,14 @@ size=6442450944 > compressed_size=148947524 > expand=/dev/sda3 > notes=Fedora 18. > - > + > This Fedora image contains only unmodified @Core group packages. > - > + > It is thus very minimal. The kickstart and install script can be > found in the libguestfs source tree: > - > + > builder/website/fedora.sh > - > + > Fedora and the Infinity design logo are trademarks of Red Hat, Inc. > Source and further information is availab
[Libguestfs] [PATCH 13/13] syntax-check: fix trailing_blank check
Signed-off-by: Hu Tao --- builder/website/debian.preseed | 2 +- builder/website/index | 120 +- builder/website/index.asc | 120 +- customize/customize_run.mli| 2 +- daemon/mount.c | 2 +- fish/test-file-attrs.sh| 10 +- generator/c.ml | 2 +- guestfs-release-notes.txt | 520 - podwrapper.pl.in | 6 +- tools/virt-win-reg | 2 +- v2v/test-v2v-print-source.sh | 4 +- 11 files changed, 395 insertions(+), 395 deletions(-) diff --git a/builder/website/debian.preseed b/builder/website/debian.preseed index faa4430..d3158a5 100644 --- a/builder/website/debian.preseed +++ b/builder/website/debian.preseed @@ -227,7 +227,7 @@ d-i partman/confirm_nooverwrite boolean true # so this will only work if the disks are the same size. #d-i partman-auto/disk string /dev/sda /dev/sdb -# Next you need to specify the physical partitions that will be used. +# Next you need to specify the physical partitions that will be used. #d-i partman-auto/expert_recipe string \ # multiraid :: \ # 1000 5000 4000 raid \ diff --git a/builder/website/index b/builder/website/index index 5645ddf..aea33aa 100644 --- a/builder/website/index +++ b/builder/website/index @@ -10,14 +10,14 @@ size=6442450944 compressed_size=197139324 expand=/dev/sda3 notes=CentOS 6.5 - + This CentOS image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/centos.sh - + Note that `virt-builder centos-6' will always install the latest 6.x release. @@ -32,12 +32,12 @@ size=6442450944 compressed_size=213203844 expand=/dev/sda3 notes=CentOS 7.0 - + This CentOS image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/centos.sh [cirros-0.3.1] @@ -50,13 +50,13 @@ size=41126400 compressed_size=11419004 expand=/dev/sda1 notes=CirrOS 0.3.1 - + CirrOS is a commonly used test image, ideal because it is very small and boots into a minimally usable Linux system. - + Note this is not a real Linux distribution, and several virt-builder features such as installing packages will not (and cannot) work. - + This CirrOS image comes from https://launchpad.net/cirros [debian-6] @@ -71,24 +71,24 @@ size=4294967296 compressed_size=139615908 expand=/dev/sda1 notes=Debian 6 (Squeeze). - + This is a default Debian install. - + The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/debian.preseed builder/website/debian.sh - + This image is so very minimal that it only includes an ssh server and no virtual consoles. To enable virtual consoles use this virt-builder option: - + virt-builder debian-6 \ --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [debian-7] @@ -103,24 +103,24 @@ size=4294967296 compressed_size=150734028 expand=/dev/sda1 notes=Debian 7 (Wheezy). - + This is a default Debian install. - + The preseed and virt-install scripts that produced this image can be found in the libguestfs source tree: - + builder/website/debian.preseed builder/website/debian.sh - + This image is so very minimal that it only includes an ssh server and no virtual consoles. To enable virtual consoles use this virt-builder option: - + virt-builder debian-7 \ --edit '/etc/inittab: s,^#([1-9].*respawn.*/sbin/getty.*),$1,' - + This image does not contain SSH host keys. To regenerate them use: - + --firstboot-command "dpkg-reconfigure openssh-server" [fedora-18] @@ -134,14 +134,14 @@ size=6442450944 compressed_size=148947524 expand=/dev/sda3 notes=Fedora 18. - + This Fedora image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/fedora.sh - + Fedora and the Infinity design logo are trademarks of Red Hat, Inc. Source and further information is available from http://fedoraproject.org/ @@ -157,14 +157,14 @@ size=4294967296 compressed_size=169531628 expand=/dev/sda3 notes=Fedora 19. - + This Fedora image contains only unmodified @Core group packages. - + It is thus very minimal. The kickstart and install script can be found in the libguestfs source tree: - + builder/website/fedora.sh - + Fedora and the Infinity design logo are trademarks of Red Hat, Inc. Source and further information is available from http://fedorapro
