[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#678694: preseed_fetch absolute paths broken when preseed/include isn't used



I noticed the same behavior with the 7.0beta1 d-i snapshot.

preseed_location() only sets /var/run/preseed.last_location for
preseed/include files, not for the original (main) preseed file.
make_absolute_url() in bin/preseed_fetch prepends a null value and returns
"/./path/being/fetched".

The attached patch writes preseed.last_location for the main preseed file,
as well.

john
-- 
John Morrissey          _o            /\         ----  __o
jwm@horde.net        _-< \_          /  \       ----  <  \,
www.horde.net/    __(_)/_(_)________/    \_______(_) /_(_)__
>From 05037bd5f57277dd7c05943e81b0b12809dd4c84 Mon Sep 17 00:00:00 2001
From: John Morrissey <jwm@horde.net>
Date: Fri, 17 Aug 2012 11:08:21 -0700
Subject: [PATCH] always set /var/run/preseed.last_location, not just for includes

---
 preseed.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/preseed.sh b/preseed.sh
index f5225c4..76dd2c9 100644
--- a/preseed.sh
+++ b/preseed.sh
@@ -69,6 +69,7 @@ preseed_location () {
 	log "successfully loaded preseed file from $location"
 	[ -e /var/run/delay_choosers ] && rm /var/run/delay_choosers
 	local last_location="$location"
+	echo $last_location > /var/run/preseed.last_location
 	
 	while true ; do
 		db_get preseed/include
-- 
1.7.2.5


Reply to: