All of lore.kernel.org
 help / color / mirror / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: xen-devel@lists.xenproject.org, ian.jackson@eu.citrix.com
Cc: Marcos.Matsunaga@oracle.com,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 2/3] standalong-reset: Use the $suite when recreating soft links.
Date: Wed, 26 Oct 2016 14:14:08 -0400	[thread overview]
Message-ID: <1477505649-84103-3-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1477505649-84103-1-git-send-email-konrad.wilk@oracle.com>

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

  parent reply	other threads:[~2016-10-26 15:05 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 ` Konrad Rzeszutek Wilk [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1477505649-84103-3-git-send-email-konrad.wilk@oracle.com \
    --to=konrad.wilk@oracle.com \
    --cc=Marcos.Matsunaga@oracle.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.