[Debian-live-changes] r2286 - in dists/trunk/live-helper: helpers includes/sid includes/sid/common includes/sid/install includes/sid/live

daniel at alioth.debian.org daniel at alioth.debian.org
Fri Jun 29 19:49:07 UTC 2007


Author: daniel
Date: 2007-06-29 19:49:07 +0000 (Fri, 29 Jun 2007)
New Revision: 2286

Added:
   dists/trunk/live-helper/includes/sid/common.386/
   dists/trunk/live-helper/includes/sid/common.amd/
   dists/trunk/live-helper/includes/sid/common.ppc/
   dists/trunk/live-helper/includes/sid/common/
   dists/trunk/live-helper/includes/sid/common/doc/
   dists/trunk/live-helper/includes/sid/live/parameters.txt
Removed:
   dists/trunk/live-helper/includes/sid/install/doc/
   dists/trunk/live-helper/includes/sid/live/boot-parameters.txt
Modified:
   dists/trunk/live-helper/helpers/lh_binary_disk
   dists/trunk/live-helper/helpers/lh_binary_hacks
   dists/trunk/live-helper/helpers/lh_binary_includes
   dists/trunk/live-helper/helpers/lh_source_disk
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_disk
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_disk	2007-06-29 19:37:52 UTC (rev 2285)
+++ dists/trunk/live-helper/helpers/lh_binary_disk	2007-06-29 19:49:07 UTC (rev 2286)
@@ -72,11 +72,11 @@
 			TYPE="LIVE"
 		fi
 
-		echo "Debian GNU/Linux \"${DISTRIBUTION}\" ${VERSION} - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
 		;;
 
 	ubuntu)
-		echo "Ubuntu Linux \"${DISTRIBUTION}\" ${VERSION} - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+		echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
 		;;
 esac
 

Modified: dists/trunk/live-helper/helpers/lh_binary_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_hacks	2007-06-29 19:37:52 UTC (rev 2285)
+++ dists/trunk/live-helper/helpers/lh_binary_hacks	2007-06-29 19:49:07 UTC (rev 2286)
@@ -49,7 +49,7 @@
 # Removing live-initramfs docs
 if [ "${LH_INITRAMFS}" = "casper" ]
 then
-	rm -f binary/boot-parameters.txt
+	rm -f binary/parameters.txt
 fi
 
 # Creating stage file

Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes	2007-06-29 19:37:52 UTC (rev 2285)
+++ dists/trunk/live-helper/helpers/lh_binary_includes	2007-06-29 19:49:07 UTC (rev 2286)
@@ -84,14 +84,41 @@
 		;;
 esac
 
+# Working arround vfat limitations
+if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
+then
+	CP_OPTIONS="-L"
+fi
+
+# Copying common templates
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* binary
+fi
+
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}" ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* binary
+fi
+
+# Copying live templates
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* binary
+fi
+
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}" ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
+fi
+
+
 if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
 then
-	# Working arround vfat limitations
-	if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
-	then
-		CP_OPTIONS="-L"
-	fi
-
 	# Copying install templates
 	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
 	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
@@ -106,7 +133,19 @@
 	fi
 
 	# Adjusting install templates
-	DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+	ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
+	DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+	DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
+	eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
+
+	if [ -d binary/pool/main/l/live-installer ]
+	then
+		TYPE="LIVE/INSTALL"
+	fi
+
+	TYPE="LIVE/NETINST"
+
+	DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`"
 	DEBIAN_DATE="`date +%Y%m%d-%H:%M`"
 
 	if [ "${LIVE_ARCHITECTURE}" = "i386" ]
@@ -122,18 +161,5 @@
 	sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
 fi
 
-# Copying live templates
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* &> /dev/null
-then
-	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* binary
-fi
-
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}" ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
-then
-	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
-fi
-
 # Creating stage file
 Create_stagefile .stage/binary_includes

Modified: dists/trunk/live-helper/helpers/lh_source_disk
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_disk	2007-06-29 19:37:52 UTC (rev 2285)
+++ dists/trunk/live-helper/helpers/lh_source_disk	2007-06-29 19:49:07 UTC (rev 2286)
@@ -72,11 +72,11 @@
 			TYPE="LIVE"
 		fi
 
-		echo "Debian GNU/Linux \"${DISTRIBUTION}\" ${VERSION} - Official ${ARCHITECTURE} ${TYPE} Source `date +%Y%m%d-%H:%M`" > source/.disk/info
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Source `date +%Y%m%d-%H:%M`" > source/.disk/info
 		;;
 
 	ubuntu)
-		echo "Ubuntu Linux \"${DISTRIBUTION}\" ${VERSION} - Unofficial ${ARCHITECTURE} LIVE/NETINST Source `date +%Y%m%d-%H:%M`" > source/.disk/info
+		echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Source `date +%Y%m%d-%H:%M`" > source/.disk/info
 		;;
 esac
 

Copied: dists/trunk/live-helper/includes/sid/common/doc (from rev 2273, dists/trunk/live-helper/includes/sid/install/doc)

Deleted: dists/trunk/live-helper/includes/sid/live/boot-parameters.txt
===================================================================
--- dists/trunk/live-helper/includes/sid/live/boot-parameters.txt	2007-06-29 19:37:52 UTC (rev 2285)
+++ dists/trunk/live-helper/includes/sid/live/boot-parameters.txt	2007-06-29 19:49:07 UTC (rev 2286)
@@ -1,40 +0,0 @@
-Boot Parameters for Debian Live
--------------------------------
-
-Updated for live-initramfs 1.90.1-1 on 2007-06-11.
-
-These options (can be combined) work from the ISOLINUX bootprompt:
-
-live access=v1|v2|v3|m1|m2		specify accessibility level
-live console=TTY,SPEED			setting default console for live-getty
-live hostname=HOSTNAME			override hostname value
-live integrity-check			check media data integrity and md5sums
-live ip=IFACE,ADDRESS,NETMASK,GATEWAY	specify network interface(s)
-live ip[=frommedia]			skips dhcp/static, uses preconfiguration
-live keyb|kbd-chooser/method=KEYBOARD
-live klayout|console-setup/layoutcode=LAYOUT
-live kvariant|console-setup/variantcode=VARIANT
-live kmodel|console-setup/modelcode=CODE
-live koptions=OPTIONS
-live live-getty
-live live-media|bootfrom=DEVICE
-live live-media-encryption|encryption=TYPE
-live live-media-offset=BYTES
-live live-media-timeout=SECONDS
-live locale|debian-installer/local=LOCALE
-live module=NAME
-live netboot[=nfs|cifs]
-live noautologin
-live noxautologin
-live nopersistent
-live nosudo
-live noswap
-live persistent
-live quickreboot
-live showmounts
-live todisk=DEVICE
-live toram				copy media to RAM and run from there
-live preseed/file|file=FILE
-live package/question=VALUE
-live xdebconf
-live xvideomode=RESOLUTION

Copied: dists/trunk/live-helper/includes/sid/live/parameters.txt (from rev 2273, dists/trunk/live-helper/includes/sid/live/boot-parameters.txt)
===================================================================
--- dists/trunk/live-helper/includes/sid/live/parameters.txt	                        (rev 0)
+++ dists/trunk/live-helper/includes/sid/live/parameters.txt	2007-06-29 19:49:07 UTC (rev 2286)
@@ -0,0 +1,40 @@
+Boot Parameters for Debian Live
+-------------------------------
+
+Updated for live-initramfs 1.90.1-1 on 2007-06-11.
+
+These options (can be combined) work from the ISOLINUX bootprompt:
+
+live access=v1|v2|v3|m1|m2		specify accessibility level
+live console=TTY,SPEED			setting default console for live-getty
+live hostname=HOSTNAME			override hostname value
+live integrity-check			check media data integrity and md5sums
+live ip=IFACE,ADDRESS,NETMASK,GATEWAY	specify network interface(s)
+live ip[=frommedia]			skips dhcp/static, uses preconfiguration
+live keyb|kbd-chooser/method=KEYBOARD
+live klayout|console-setup/layoutcode=LAYOUT
+live kvariant|console-setup/variantcode=VARIANT
+live kmodel|console-setup/modelcode=CODE
+live koptions=OPTIONS
+live live-getty
+live live-media|bootfrom=DEVICE
+live live-media-encryption|encryption=TYPE
+live live-media-offset=BYTES
+live live-media-timeout=SECONDS
+live locale|debian-installer/local=LOCALE
+live module=NAME
+live netboot[=nfs|cifs]
+live noautologin
+live noxautologin
+live nopersistent
+live nosudo
+live noswap
+live persistent
+live quickreboot
+live showmounts
+live todisk=DEVICE
+live toram				copy media to RAM and run from there
+live preseed/file|file=FILE
+live package/question=VALUE
+live xdebconf
+live xvideomode=RESOLUTION




More information about the Debian-live-changes mailing list