* [PATCH OSSTEST] Various fixes when using standalone
@ 2016-10-26 18:14 Konrad Rzeszutek Wilk
2016-10-26 18:14 ` [PATCH 1/3] DhcpWatch: Print what is wrong with the line Konrad Rzeszutek Wilk
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-10-26 18:14 UTC (permalink / raw)
To: xen-devel, ian.jackson; +Cc: Marcos.Matsunaga
Hey,
Some more fixes that the OSSTest may want when folks are using
the standalone state.
Osstest/DhcpWatch/leases.pm | 2 +-
README | 3 ++-
standalone-reset | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
Konrad Rzeszutek Wilk (3):
DhcpWatch: Print what is wrong with the line.
standalong-reset: Use the $suite when recreating soft links.
README: Mention the / requirement in Tftp[Dir|Tmp]Dir
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 1/3] DhcpWatch: Print what is wrong with the line.
2016-10-26 18:14 [PATCH OSSTEST] Various fixes when using standalone Konrad Rzeszutek Wilk
@ 2016-10-26 18:14 ` Konrad Rzeszutek Wilk
2016-10-26 15:10 ` Ian Jackson
2016-10-26 18:14 ` [PATCH 2/3] standalong-reset: Use the $suite when recreating soft links Konrad Rzeszutek Wilk
2016-10-26 18:14 ` [PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir Konrad Rzeszutek Wilk
2 siblings, 1 reply; 12+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-10-26 18:14 UTC (permalink / raw)
To: xen-devel, ian.jackson; +Cc: Marcos.Matsunaga, Konrad Rzeszutek Wilk
If the user forgot to include 'dhcp3' on the parameter
line point out the error to the user.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
Osstest/DhcpWatch/leases.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Osstest/DhcpWatch/leases.pm b/Osstest/DhcpWatch/leases.pm
index b74ebf0..13ab7b4 100644
--- a/Osstest/DhcpWatch/leases.pm
+++ b/Osstest/DhcpWatch/leases.pm
@@ -40,7 +40,7 @@ BEGIN {
sub new {
my ($class, $ho, $meth, $format, $source) = @_;
- die "$format (@_) ?" unless $format eq 'dhcp3';
+ die "'$format' is missing dhcp3 in it!" unless $format eq 'dhcp3';
return bless {
Format => $format,
Source => $source,
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/3] DhcpWatch: Print what is wrong with the line.
2016-10-26 18:14 ` [PATCH 1/3] DhcpWatch: Print what is wrong with the line Konrad Rzeszutek Wilk
@ 2016-10-26 15:10 ` Ian Jackson
2016-10-26 15:15 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 12+ messages in thread
From: Ian Jackson @ 2016-10-26 15:10 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: xen-devel, Marcos.Matsunaga
Konrad Rzeszutek Wilk writes ("[PATCH 1/3] DhcpWatch: Print what is wrong with the line."):
> If the user forgot to include 'dhcp3' on the parameter
> line point out the error to the user.
How about this ?
From 693471df9e9a2a491a576ae644d02751906a63cf Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 26 Oct 2016 14:14:07 -0400
Subject: [OSSTEST PATCH] DhcpWatch: Print what is wrong with the line.
If the user forgot to include 'dhcp3' on the parameter
line point out the error to the user.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
v2: Still print out the arguments to the constructor, hopefully
non-confusingly.
---
Osstest/DhcpWatch/leases.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Osstest/DhcpWatch/leases.pm b/Osstest/DhcpWatch/leases.pm
index b74ebf0..98c22b9 100644
--- a/Osstest/DhcpWatch/leases.pm
+++ b/Osstest/DhcpWatch/leases.pm
@@ -40,7 +40,8 @@ BEGIN {
sub new {
my ($class, $ho, $meth, $format, $source) = @_;
- die "$format (@_) ?" unless $format eq 'dhcp3';
+ die "'$format' is missing dhcp3 in it! (args: @_) ?"
+ unless $format eq 'dhcp3';
return bless {
Format => $format,
Source => $source,
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 1/3] DhcpWatch: Print what is wrong with the line.
2016-10-26 15:10 ` Ian Jackson
@ 2016-10-26 15:15 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 12+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-10-26 15:15 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Marcos.Matsunaga
On Wed, Oct 26, 2016 at 04:10:23PM +0100, Ian Jackson wrote:
> Konrad Rzeszutek Wilk writes ("[PATCH 1/3] DhcpWatch: Print what is wrong with the line."):
> > If the user forgot to include 'dhcp3' on the parameter
> > line point out the error to the user.
>
> How about this ?
+1
>
> >From 693471df9e9a2a491a576ae644d02751906a63cf Mon Sep 17 00:00:00 2001
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Date: Wed, 26 Oct 2016 14:14:07 -0400
> Subject: [OSSTEST PATCH] DhcpWatch: Print what is wrong with the line.
>
> If the user forgot to include 'dhcp3' on the parameter
> line point out the error to the user.
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
> ---
> v2: Still print out the arguments to the constructor, hopefully
> non-confusingly.
> ---
> Osstest/DhcpWatch/leases.pm | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Osstest/DhcpWatch/leases.pm b/Osstest/DhcpWatch/leases.pm
> index b74ebf0..98c22b9 100644
> --- a/Osstest/DhcpWatch/leases.pm
> +++ b/Osstest/DhcpWatch/leases.pm
> @@ -40,7 +40,8 @@ BEGIN {
>
> sub new {
> my ($class, $ho, $meth, $format, $source) = @_;
> - die "$format (@_) ?" unless $format eq 'dhcp3';
> + die "'$format' is missing dhcp3 in it! (args: @_) ?"
> + unless $format eq 'dhcp3';
> return bless {
> Format => $format,
> Source => $source,
> --
> 2.1.4
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/3] standalong-reset: Use the $suite when recreating soft links.
2016-10-26 18:14 [PATCH OSSTEST] Various fixes when using standalone Konrad Rzeszutek Wilk
2016-10-26 18:14 ` [PATCH 1/3] DhcpWatch: Print what is wrong with the line Konrad Rzeszutek Wilk
@ 2016-10-26 18:14 ` Konrad Rzeszutek Wilk
2016-10-26 18:14 ` [PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir Konrad Rzeszutek Wilk
2 siblings, 0 replies; 12+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-10-26 18:14 UTC (permalink / raw)
To: xen-devel, ian.jackson; +Cc: Marcos.Matsunaga, Konrad Rzeszutek Wilk
Commit ef3a6f2162ced5cfeb08b437315b69ad1ddbc5ed:
"Add -$suite suffix to TftpDiVersion in code"
forgot to include the $suite parameter when re-linking
current-$suite against the <date>-$suite.
Specifically after we have downloaded the debian files the
$TftpDir has:
konrad konrad 4096 paź 26 13:29 2016-10-26-jessi
konrad konrad 17 paź 26 13:29 current-jessie -> 2016-10-26-jessi
we end up removing the symlink (current-jessie) and then
recreating it as:
konrad konrad 4096 paź 26 13:29 2016-10-26-jessi
konrad konrad 10 paź 26 13:29 current-jessie -> 2016-10-2
which is wrong as there is no '2016-10-2' directory.
The patch is to add the $suite in the linking.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
CC: Marcos Matsunaga <Marcos.Matsunaga@oracle.com>
---
standalone-reset | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/standalone-reset b/standalone-reset
index 7f34b61..c587e60 100755
--- a/standalone-reset
+++ b/standalone-reset
@@ -119,7 +119,7 @@ else
div="${div#* }"
if [ -n "$div" ] ; then
rm -f "$tftp/$dibase/$arch/current-$suite"
- ln -s $div "$tftp/$dibase/$arch/current-$suite"
+ ln -s $div-$suite "$tftp/$dibase/$arch/current-$suite"
fi
done
fi
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir
2016-10-26 18:14 [PATCH OSSTEST] Various fixes when using standalone Konrad Rzeszutek Wilk
2016-10-26 18:14 ` [PATCH 1/3] DhcpWatch: Print what is wrong with the line Konrad Rzeszutek Wilk
2016-10-26 18:14 ` [PATCH 2/3] standalong-reset: Use the $suite when recreating soft links Konrad Rzeszutek Wilk
@ 2016-10-26 18:14 ` Konrad Rzeszutek Wilk
2016-10-26 15:12 ` Ian Jackson
2016-10-26 18:51 ` [PATCH] standalone-reset: Check for TftpPxeDir Konrad Rzeszutek Wilk
2 siblings, 2 replies; 12+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-10-26 18:14 UTC (permalink / raw)
To: xen-devel, ian.jackson; +Cc: Marcos.Matsunaga, Konrad Rzeszutek Wilk
That is the / should be part of the directory name. Otherwise
we get strange files such as: pxelinux.cfgC0A86A3C
in the TftpPath directory.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
README | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README b/README
index 167c1bd..512f64b 100644
--- a/README
+++ b/README
@@ -497,9 +497,10 @@ Tftp*
TftpPath The path to the root of the directory which is exposed by
the tftpserver (e.g. /tftpboot).
TftpTmpDir A directory under `Path' to use for temporary files.
+ Make sure you have the / postfix included (e.g. tmp/)
TftpPxeDir The path under `Path' to the PXE configuration directory
- (e.g. pxelinux.cfg)
+ (e.g. pxelinux.cfg/) Make sure you have the / included.
TftpPxeGroup The Unix group which should own files under `PxeDir'.
TftpPxeTemplates See TftpPxeTemplates
TftpPxeTemplatesReal
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir
2016-10-26 18:14 ` [PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir Konrad Rzeszutek Wilk
@ 2016-10-26 15:12 ` Ian Jackson
2016-10-26 15:16 ` Konrad Rzeszutek Wilk
2016-10-26 18:51 ` [PATCH] standalone-reset: Check for TftpPxeDir Konrad Rzeszutek Wilk
1 sibling, 1 reply; 12+ messages in thread
From: Ian Jackson @ 2016-10-26 15:12 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: xen-devel, Marcos.Matsunaga
Konrad Rzeszutek Wilk writes ("[PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir"):
> That is the / should be part of the directory name. Otherwise
> we get strange files such as: pxelinux.cfgC0A86A3C
> in the TftpPath directory.
I've edited this slightly.
Ian.
From 9f0b83ebefc90c46fafd8efdba2b258926d18be0 Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 26 Oct 2016 14:14:09 -0400
Subject: [OSSTEST PATCH] README: Mention the / requirement in Tftp[Dir|Tmp]Dir
That is the / should be part of the directory name. Otherwise
we get strange files such as: pxelinux.cfgC0A86A3C
in the TftpPath directory.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: Slightly improved wording.
---
README | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README b/README
index 167c1bd..e3519a4 100644
--- a/README
+++ b/README
@@ -497,9 +497,10 @@ Tftp*
TftpPath The path to the root of the directory which is exposed by
the tftpserver (e.g. /tftpboot).
TftpTmpDir A directory under `Path' to use for temporary files.
+ Make sure you include the trailing / (e.g. tmp/)
TftpPxeDir The path under `Path' to the PXE configuration directory
- (e.g. pxelinux.cfg)
+ (e.g. pxelinux.cfg/). Include the trailing /.
TftpPxeGroup The Unix group which should own files under `PxeDir'.
TftpPxeTemplates See TftpPxeTemplates
TftpPxeTemplatesReal
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir
2016-10-26 15:12 ` Ian Jackson
@ 2016-10-26 15:16 ` Konrad Rzeszutek Wilk
2016-10-26 15:38 ` Ian Jackson
0 siblings, 1 reply; 12+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-10-26 15:16 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Marcos.Matsunaga
On Wed, Oct 26, 2016 at 04:12:47PM +0100, Ian Jackson wrote:
> Konrad Rzeszutek Wilk writes ("[PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir"):
> > That is the / should be part of the directory name. Otherwise
> > we get strange files such as: pxelinux.cfgC0A86A3C
> > in the TftpPath directory.
>
> I've edited this slightly.
>
> Ian.
>
> >From 9f0b83ebefc90c46fafd8efdba2b258926d18be0 Mon Sep 17 00:00:00 2001
> From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Date: Wed, 26 Oct 2016 14:14:09 -0400
> Subject: [OSSTEST PATCH] README: Mention the / requirement in Tftp[Dir|Tmp]Dir
^^^ - > Pxe
Ooops:
s/[Dir/[Pxe/
+1!
>
> That is the / should be part of the directory name. Otherwise
> we get strange files such as: pxelinux.cfgC0A86A3C
> in the TftpPath directory.
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
> ---
> v2: Slightly improved wording.
> ---
> README | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/README b/README
> index 167c1bd..e3519a4 100644
> --- a/README
> +++ b/README
> @@ -497,9 +497,10 @@ Tftp*
> TftpPath The path to the root of the directory which is exposed by
> the tftpserver (e.g. /tftpboot).
> TftpTmpDir A directory under `Path' to use for temporary files.
> + Make sure you include the trailing / (e.g. tmp/)
>
> TftpPxeDir The path under `Path' to the PXE configuration directory
> - (e.g. pxelinux.cfg)
> + (e.g. pxelinux.cfg/). Include the trailing /.
> TftpPxeGroup The Unix group which should own files under `PxeDir'.
> TftpPxeTemplates See TftpPxeTemplates
> TftpPxeTemplatesReal
> --
> 2.1.4
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] standalone-reset: Check for TftpPxeDir
2016-10-26 18:14 ` [PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir Konrad Rzeszutek Wilk
2016-10-26 15:12 ` Ian Jackson
@ 2016-10-26 18:51 ` Konrad Rzeszutek Wilk
2016-10-26 15:48 ` Ian Jackson
1 sibling, 1 reply; 12+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-10-26 18:51 UTC (permalink / raw)
To: xen-devel, ian.jackson; +Cc: Marcos.Matsunaga, Konrad Rzeszutek Wilk
While patch: "README: Mention the / requirement in Tftp[Dir|Tmp]Dir"
we should also double-check that the directory actually exists.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
standalone-reset | 3 +++
1 file changed, 3 insertions(+)
diff --git a/standalone-reset b/standalone-reset
index c587e60..69a3226 100755
--- a/standalone-reset
+++ b/standalone-reset
@@ -101,6 +101,9 @@ else
tftptmp=`getconfig TftpTmpDir`
ensure_dir "$tftp$tftptmp"
+ tftpconfig=`getconfig TftpPxeDir`
+ ensure_dir "$tftp$tftpconfig"
+
dibase=`getconfig TftpDiBase`
suite=`getconfig DebianSuite`
diver=`getconfig_TftpDiVersion_suite $suite`
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] standalone-reset: Check for TftpPxeDir
2016-10-26 18:51 ` [PATCH] standalone-reset: Check for TftpPxeDir Konrad Rzeszutek Wilk
@ 2016-10-26 15:48 ` Ian Jackson
2016-10-26 15:52 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 12+ messages in thread
From: Ian Jackson @ 2016-10-26 15:48 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: xen-devel, Marcos.Matsunaga
Konrad Rzeszutek Wilk writes ("[PATCH] standalone-reset: Check for TftpPxeDir"):
> While patch: "README: Mention the / requirement in Tftp[Dir|Tmp]Dir"
> we should also double-check that the directory actually exists.
>
> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH] standalone-reset: Check for TftpPxeDir
2016-10-26 15:48 ` Ian Jackson
@ 2016-10-26 15:52 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 12+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-10-26 15:52 UTC (permalink / raw)
To: Ian Jackson; +Cc: xen-devel, Marcos.Matsunaga
On Wed, Oct 26, 2016 at 04:48:33PM +0100, Ian Jackson wrote:
> Konrad Rzeszutek Wilk writes ("[PATCH] standalone-reset: Check for TftpPxeDir"):
> > While patch: "README: Mention the / requirement in Tftp[Dir|Tmp]Dir"
Garh
s/[Dir/[Pxe
now that you fixed that up.
Sorry for that!
> > we should also double-check that the directory actually exists.
> >
> > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-10-26 15:52 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-26 18:14 [PATCH OSSTEST] Various fixes when using standalone Konrad Rzeszutek Wilk
2016-10-26 18:14 ` [PATCH 1/3] DhcpWatch: Print what is wrong with the line Konrad Rzeszutek Wilk
2016-10-26 15:10 ` Ian Jackson
2016-10-26 15:15 ` Konrad Rzeszutek Wilk
2016-10-26 18:14 ` [PATCH 2/3] standalong-reset: Use the $suite when recreating soft links Konrad Rzeszutek Wilk
2016-10-26 18:14 ` [PATCH 3/3] README: Mention the / requirement in Tftp[Dir|Tmp]Dir Konrad Rzeszutek Wilk
2016-10-26 15:12 ` Ian Jackson
2016-10-26 15:16 ` Konrad Rzeszutek Wilk
2016-10-26 15:38 ` Ian Jackson
2016-10-26 18:51 ` [PATCH] standalone-reset: Check for TftpPxeDir Konrad Rzeszutek Wilk
2016-10-26 15:48 ` Ian Jackson
2016-10-26 15:52 ` Konrad Rzeszutek Wilk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).