RC2013-04-22/netinst

1 files changed, 5 insertions, 6 deletions

diff --git a/protostar b/protostar
index db53aae..a41a757 100755
--- a/protostar
+++ b/protostar
@@ -12,7 +12,8 @@ REPO="${REPO:-http://apt.osdyson.org}"
 # We will search for usr archive on CD:
 USR_IMG=usr.img.$(echo $DATE | md5sum | cut -f1 -d ' ')
 
-ISONAME="${ISONAME:-dyson-${DIST}-${DATE}}.iso"
+ISOLABEL="${ISOLABEL:-dyson-bok-netinst}"
+ISONAME="${ISONAME:-${ISOLABEL}-${DATE}}.iso"
 
 ROOT="${TMP}/ROOT"
 BOOTSTRAPFS="${BOOTSTRAPFS:-dyson/deb}"
@@ -83,6 +84,7 @@ cat <<VFSTAB > $ROOT/etc/vfstab
 #
 /devices/ramdisk:a -            /               ufs     1       no     rw,nologging
 fd              -               /dev/fd         fd      -       no      -
+swap            -               /tmp            tmpfs   -       yes     -
 
 VFSTAB
 
@@ -252,12 +254,9 @@ default=0
 timeout=3
 foreground=ffffff
 background=215ECA
-title Dyson ($DIST) LiveCD, $DATE
+title Dyson ($DIST) installer and LiveCD, $DATE
     kernel /platform/i86pc/kernel/amd64/unix
     module /boot/boot_archive.gz
-title Dyson ($DIST) LiveCD, $DATE - verbose boot
-    kernel /platform/i86pc/kernel/amd64/unix -k -m verbose
-    module /boot/boot_archive.gz
 GRUB
 
 echo "Making final ${ISONAME}..."
@@ -273,7 +272,7 @@ genisoimage \
     -no-iso-translate \
     -cache-inodes \
     -d -D \
-    -V "${ISONAME}" \
+    -V "${ISOLABEL}" \
     "${ROOT}"
 
 ls -lh "${ISONAME}"