Run installgrub from CD, not from chroot.

 Device nodes can differ. If we get c1d0 on CD,
 same disk can be c0d0 in chroot

1 files changed, 8 insertions, 3 deletions

diff --git a/protostar b/protostar
index 56d61b8..e1dd6eb 100755
--- a/protostar
+++ b/protostar
@@ -51,7 +51,7 @@ echo "Preparing base system (debootstrap)..."
 debootstrap \
     --no-check-gpg \
     --exclude=locales,syslogd,gawk,aptitude,aptitude-common,libboost-iostreams1.48.0,libboost-iostreams1.49.0,libcwidget3 \
-    --include=python-newt,truss,illumos-grub-eltorito,illumos-kernel,mc,vim,screen,openssh-client,wget,bzip2,xz-utils,debootstrap,less,file,lynx,bash-completion \
+    --include=python-newt,truss,installgrub,illumos-grub-eltorito,illumos-kernel,mc,vim,screen,openssh-client,wget,bzip2,xz-utils,debootstrap,less,file,lynx,bash-completion \
     "${DIST}" \
     "${ROOT}" \
     "${REPO}"
@@ -79,7 +79,6 @@ rm -rf "${ROOT}"/usr/share/doc/*
 rm -rf "${ROOT}"/usr/share/locale/*/LC_MESSAGES
 rm -rf "${ROOT}"/usr/share/man/*/man[0-9]*
 
-
 #sed -i '/^PermitRootLogin/ s,no,yes,' /etc/ssh/sshd_config
 
 cat <<VFSTAB > $ROOT/etc/vfstab
@@ -96,7 +95,6 @@ echo "dyson-${DIST}-live" > "${ROOT}/etc/nodename"
 
 # Set root password (just "root"):
 echo 'root:root' | chpasswd -R "$ROOT"
-echo 'User: root, password: root' >> "${ROOT}/etc/issue"
 
 # Script to find and mount usr.lzma:
 sed "s/##USR_IMG##/$USR_IMG/g" "fs-root" > "${ROOT}/lib/svc/method/fs-root"
@@ -129,6 +127,13 @@ touch "${BOOTARCH}/reconfigure"
 
 pushd "${ROOT}"
 
+# We use 32-bit installgrub, but is not required to boot ;-)
+if [ -e lib32 ]; then
+    mkdir -p usr/lib32
+    mv lib32/* usr/lib32/
+    ln -sf usr/lib32 $BOOTARCH/lib32
+fi
+
 # Move some critical libs:
 march=`dpkg-architecture -qDEB_HOST_MULTIARCH`
 mkdir -p lib/$march