Run two screens: installer & shell

1 files changed, 7 insertions, 4 deletions

diff --git a/protostar b/protostar
index c2aa1c0..db53aae 100755
--- a/protostar
+++ b/protostar
@@ -50,7 +50,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,illumos-grub-eltorito,illumos-kernel,mc,vim-tiny,screen,openssh-client,wget,bzip2,xz-utils,debootstrap,less,file,lynx,bash-completion \
+    --include=python-newt,truss,illumos-grub-eltorito,illumos-kernel,mc,vim,screen,openssh-client,wget,bzip2,xz-utils,debootstrap,less,file,lynx,bash-completion \
     "${DIST}" \
     "${ROOT}" \
     "${REPO}"
@@ -59,6 +59,8 @@ fi
 
 mkdir "$ROOT/usr/install"
 cp -a install DysonInstaller $ROOT/usr/install/
+cp installer-screenrc $ROOT/etc/screenrc
+
 
 mv $ROOT/var/lib/dpkg $ROOT/usr/dpkg
 ln -sf /usr/dpkg $ROOT/var/lib/dpkg
@@ -92,10 +94,10 @@ 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"
-chmod +x "${ROOT}/lib/svc/method/fs-root"
-
+cat console-login > "${ROOT}/lib/svc/method/console-login"
 cat net-physical > "${ROOT}/lib/svc/method/net-physical"
-chmod +x "${ROOT}/lib/svc/method/net-physical"
+
+chmod +x "${ROOT}/lib/svc/method"/*
 
 dummy_prog='#!/sbin/sh
 exit 0
@@ -117,6 +119,7 @@ echo "$dummy_prog" > "${ROOT}/lib/svc/method/manifest-import"
 mkdir -p "${BOOTARCH}"
 mkdir -p "${BOOTARCH}/usr"
 mkdir -p "${BOOTARCH}/cdrom"
+touch "${BOOTARCH}/reconfigure"
 
 pushd "${ROOT}"