diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2013-04-21 21:08:52 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2013-04-21 21:08:52 +0000 |
| commit | 2b17f4f7c892df67d5bfe4cce1dd96ef743abfdd (patch) | |
| tree | e0e906a0a53131e987161abd9200ae6b227d177a | |
| parent | f45d3178e6c053c34e331bcf48ed880e1625feef (diff) | |
| download | live-2b17f4f7c892df67d5bfe4cce1dd96ef743abfdd.tar.gz | |
Run two screens: installer & shell
| -rw-r--r-- | console-login | 9 | ||||
| -rw-r--r-- | installer-screenrc | 12 | ||||
| -rwxr-xr-x | protostar | 11 |
3 files changed, 28 insertions, 4 deletions
diff --git a/console-login b/console-login new file mode 100644 index 0000000..d6e9e76 --- /dev/null +++ b/console-login @@ -0,0 +1,9 @@ +#!/bin/sh + + +TERM=sun-color +USER=root +HOME=/root + +exec screen -q </dev/console >/dev/console 2>&1 + diff --git a/installer-screenrc b/installer-screenrc new file mode 100644 index 0000000..a5cadbc --- /dev/null +++ b/installer-screenrc @@ -0,0 +1,12 @@ +startup_message off + +bindkey -k k1 select 1 +bindkey -k k2 select 2 + +screen -t installer 1 /usr/install/install +screen -t console 2 sh -c "while true; do /bin/bash -l; sleep 1; done" + +hardstatus alwayslastline "%{kB} %w %= | Dyson Installer" + +select 1 + @@ -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}" |