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

[PATCH] Do not set VARIANTS in CONF.sh by default



Specifying VARIANTS in CONF.sh seems to stop command lines such as "....
VARIANTS=blah ./build.sh" from working because it overrides the command
line supplied value. Commenting out the variable is consistent with how
other such variables are treated.

I suspect the only reason VARIANTS=xen has been working in the daily
cronjobs is because the CONF.sh in debian-cd/setup SVN is out of date
WRT that in debian-cd/trunk SVN and so doesn't include the VARIANTS line
at all.

--- a/CONF.sh
+++ b/CONF.sh
@@ -205,7 +205,7 @@ export DISKTYPE=CD
 export TASK_LANGLIST=tasksel_d-i.languages
 
 # Extra variants to enable. See docs/README.variants for more information.
-export VARIANTS=
+#export VARIANTS=
 
 # We don't want certain packages to take up space on CD1...
 #export EXCLUDE1=exclude

-- 
Ian Campbell

Pray to God, but keep rowing to shore.
		-- Russian Proverb

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: