[SCM] live-config branch, debian-next, updated. debian/3.0_a14-1-20-gf9fc622
Daniel Baumann
daniel at debian.org
Sat Jan 1 17:20:59 UTC 2011
The following commit has been merged in the debian-next branch:
commit f9fc6229f8175d3e82d5ab5fce8b85264606cb70
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jan 1 18:20:01 2011 +0100
Setting distribution specific defaults in config.sh with update-live-config.sh at build-time.
diff --git a/bin/update-live-config.sh b/bin/update-live-config.sh
index 4a8f8e0..07720bb 100755
--- a/bin/update-live-config.sh
+++ b/bin/update-live-config.sh
@@ -37,3 +37,30 @@ case "${_DISTRIBUTION}" in
rm -f "${_DIRECTORY}"/*-gdm3
;;
esac
+
+echo "Setting distribution specific defaults..."
+
+case "${_DISTRIBUTION}" in
+ debian)
+ LIVE_HOSTNAME="debian"
+ LIVE_USERNAME="user"
+ LIVE_USER_FULLNAME="Debian Live user"
+ ;;
+
+ progress)
+ LIVE_HOSTNAME="progress"
+ LIVE_USERNAME="user"
+ LIVE_USER_FULLNAME="Progress Linux user"
+ ;;
+
+ ubuntu)
+ LIVE_HOSTNAME="ubuntu"
+ LIVE_USERNAME="user"
+ LIVE_USER_FULLNAME="Ubuntu Live user"
+ ;;
+esac
+
+sed -i -e "s|^LIVE_HOSTNAME=.*$|LIVE_HOSTNAME=\"${LIVE_HOSTNAME}\"|" \
+ -e "s|^LIVE_USERNAME=.*$|LIVE_USERNAME=\"${LIVE_USERNAME}\"|" \
+ -e "s|^LIVE_USER_FULLNAME=.*$|LIVE_USER_FULLNAME=\"${LIVE_USER_FULLNAME}\"|" \
+"$(dirname ${_DIRECTORY})/config.sh"
--
live-config
More information about the debian-live-changes
mailing list