[d-i-commits] r32021 - in trunk/installer: build debian

[Colin Watson]

Author: cjwatson
Date: 2005-11-14 09:46:36 +0000 (Mon, 14 Nov 2005)
New Revision: 32021

Modified:
   trunk/installer/build/Makefile
   trunk/installer/debian/changelog
Log:
* Only generate /etc/lsb-release if a udeb hasn't already provided it.

Modified: trunk/installer/build/Makefile
===================================================================
--- trunk/installer/build/Makefile	2005-11-14 09:33:03 UTC (rev 32020)
+++ trunk/installer/build/Makefile	2005-11-14 09:46:36 UTC (rev 32021)
@@ -380,10 +380,13 @@
 endif
 
 	# Create an lsb release file.
-	mkdir -p $(TREE)/etc
-	echo 'DISTRIB_ID=$(LSB_DISTRIB_ID)' > $(TREE)/etc/lsb-release
-	echo 'DISTRIB_DESCRIPTION=$(LSB_DISTRIB_DESCRIPTION)' >> $(TREE)/etc/lsb-release
-	echo 'DISTRIB_RELEASE=$(LSB_DISTRIB_RELEASE)' >> $(TREE)/etc/lsb-release
+	if [ ! -e $(TREE)/etc/lsb-release ]; then \
+		set -e; \
+		mkdir -p $(TREE)/etc; \
+		echo 'DISTRIB_ID=$(LSB_DISTRIB_ID)' > $(TREE)/etc/lsb-release; \
+		echo 'DISTRIB_DESCRIPTION=$(LSB_DISTRIB_DESCRIPTION)' >> $(TREE)/etc/lsb-release; \
+		echo 'DISTRIB_RELEASE=$(LSB_DISTRIB_RELEASE)' >> $(TREE)/etc/lsb-release; \
+	fi
 
 	@touch $@
 

Modified: trunk/installer/debian/changelog
===================================================================
--- trunk/installer/debian/changelog	2005-11-14 09:33:03 UTC (rev 32020)
+++ trunk/installer/debian/changelog	2005-11-14 09:46:36 UTC (rev 32021)
@@ -6,6 +6,9 @@
   [ Kurt Roeckx ]
   * Stop building the monolithic target on amd64.
 
+  [ Colin Watson ]
+  * Only generate /etc/lsb-release if a udeb hasn't already provided it.
+
  -- Stephen R. Marenka <smarenka at debian.org>  Mon, 31 Oct 2005 10:54:50 -0600
 
 debian-installer (20051026) unstable; urgency=low