Set distribution codename in livecd builder

2 files changed, 9 insertions, 3 deletions

diff --git a/install b/install
index 5eed92d..7e00ba1 100755
--- a/install
+++ b/install
@@ -64,6 +64,7 @@ bootenv = None
 rootdir = None
 
 # Version to install:
+# XXX this line will be replaced by protostar
 codename = 'lacaille'
 
 # Arch to install:
diff --git a/protostar b/protostar
index 0e0b0ce..f5c67b5 100755
--- a/protostar
+++ b/protostar
@@ -10,6 +10,7 @@ TMP="${TMP:-/var/tmp}"
 
 DATE=$(date '+%Y-%m-%d-%H%M')
 DIST="${DIST:-bok}"
+INSTALL_DIST="${INSTALL_DIST:-lacaille}"
 REPO="${REPO:-http://apt.osdyson.org}"
 
 # We will search for usr archive on CD:
@@ -132,8 +133,12 @@ fi
 dpkg -l --root "${ROOT}" > pkg.list
 
 mkdir "$ROOT/usr/install"
-cp -a install DysonInstaller $ROOT/usr/install/
-cat installer-screenrc > $ROOT/etc/screenrc
+cp -a DysonInstaller $ROOT/usr/install/
+sed -r "s/^codename *= *.*/codename = '${INSTALL_DIST}'/" \
+    install > $ROOT/usr/install/install
+chmod +x $ROOT/usr/install/install
+sed -r "s/Dyson *Installer/Dyson '${INSTALL_DIST}' Installer/g" \
+    installer-screenrc > $ROOT/etc/screenrc
 cat bash_profile > $ROOT/root/.bash_profile
 cat vimrc > $ROOT/root/.vimrc
 
@@ -343,7 +348,7 @@ default=0
 timeout=3
 foreground=ffffff
 background=215ECA
-title Dyson ($DIST) installer and LiveCD, $DATE
+title Dyson LiveCD and '${INSTALL_DIST}' installer, $DATE
     kernel /platform/i86pc/kernel/amd64/unix
     module /boot/boot_archive.gz
 GRUB