Cleanup

1 files changed, 15 insertions, 25 deletions

diff --git a/protostar b/protostar
index 9bb8954..cdb75c0 100755
--- a/protostar
+++ b/protostar
@@ -164,29 +164,19 @@ find "${BOOTARCH}" > bootarch.list
 echo "Making boot archive..."
 sync; sync
 
-if false; then
-genisoimage \
-    -o "${ROOT}/boot/boot_archive" \
-    -N -l -R -U \
-    -allow-multidot \
-    -quiet -no-iso-translate -cache-inodes -d -D \
-    -V "root" \
-    "${BOOTARCH}"
-else
-    size=$(du -s -m "${BOOTARCH}" | cut -f1)
-    ((size+=10)) # +10 MB of free space
-    dd if=/dev/zero of="${ROOT}/boot/boot_archive" bs=1M count="$size"
-    lofidev=$(lofiadm -a "${ROOT}/boot/boot_archive")
-    rlofidev="${lofidev/lofi/rlofi}"
-    yes | newfs -m 0 "${rlofidev}"
-    mkdir -p "${ROOT}/boot/boot_archive.mount"
-    mount "${lofidev}" "${ROOT}/boot/boot_archive.mount"
-    mv "${BOOTARCH}"/* "${ROOT}/boot/boot_archive.mount"/
-    umount "${ROOT}/boot/boot_archive.mount"
-    lofiadm -d "${lofidev}"
-    rmdir "${BOOTARCH}"
-    rmdir "${ROOT}/boot/boot_archive.mount"
-fi
+size=$(du -s -m "${BOOTARCH}" | cut -f1)
+((size+=10)) # +10 MB of free space
+dd if=/dev/zero of="${ROOT}/boot/boot_archive" bs=1M count="$size"
+lofidev=$(lofiadm -a "${ROOT}/boot/boot_archive")
+rlofidev="${lofidev/lofi/rlofi}"
+yes | newfs -m 0 "${rlofidev}"
+mkdir -p "${ROOT}/boot/boot_archive.mount"
+mount "${lofidev}" "${ROOT}/boot/boot_archive.mount"
+mv "${BOOTARCH}"/* "${ROOT}/boot/boot_archive.mount"/
+umount "${ROOT}/boot/boot_archive.mount"
+lofiadm -d "${lofidev}"
+rmdir "${BOOTARCH}"
+rmdir "${ROOT}/boot/boot_archive.mount"
 gzip -9 -f "${ROOT}/boot/boot_archive"
 
 
@@ -212,8 +202,8 @@ splashimage=/boot/grub/splash.xpm.gz
 foreground=ffffff
 background=215ECA
 title Dyson ($DIST), $DATE
-    kernel$ /platform/i86pc/kernel/amd64/unix -k -m verbose
-    module$ /boot/boot_archive.gz
+    kernel /platform/i86pc/kernel/amd64/unix -k -m verbose
+    module /boot/boot_archive.gz
 
 GRUB