add vim-nox, xz-utils; move some libs to /lib; fix init issue

1 files changed, 18 insertions, 4 deletions

diff --git a/protostar b/protostar
index cdb75c0..837c286 100755
--- a/protostar
+++ b/protostar
@@ -28,7 +28,7 @@ echo "Preparing base system (debootstrap)..."
 debootstrap \
     --no-check-gpg \
     --exclude=syslogd,gawk,aptitude \
-    --include=illumos-grub,illumos-kernel,mc,vim,openssh-client,wget,bzip2,debootstrap,less \
+    --include=illumos-grub,illumos-kernel,mc,vim-nox,openssh-client,wget,bzip2,xz-utils,debootstrap,less \
     "${DIST}" \
     "${ROOT}" \
     "${REPO}"
@@ -77,6 +77,9 @@ touch "${ROOT}/etc/dhcp.e1000g0"
 # Set root password (just "root"):
 echo 'root:root' | chpasswd -R "$ROOT"
 
+# See http://osdyson.org/issues/107
+stty -F /dev/syscon -g > $ROOT/etc/ioctl.syscon
+
 # Script to find and mount usr.lzma:
 sed "s/USR_IMG/$USR_IMG/" "find-usr" > "${ROOT}/lib/svc/method/find-usr"
 chmod +x "${ROOT}/lib/svc/method/find-usr"
@@ -93,6 +96,7 @@ exit 0
 echo "$dummy_prog" > "${ROOT}/lib/svc/method/boot-archive"
 echo "$dummy_prog" > "${ROOT}/lib/svc/method/boot-archive-update"
 
+
 echo "Importing manifests..."
 rm "${ROOT}/lib/svc/manifest/system/early-manifest-import.xml"
 
@@ -111,7 +115,19 @@ mkdir -p "${BOOTARCH}/cdrom"
 
 ( cd "${ROOT}"
 
-mv -v -f usr/lib32/* lib32/ || true
+march=`dpkg-architecture -qDEB_HOST_MULTIARCH`
+mkdir -p lib/$march
+for lib in \
+    libfmevent \
+    liblzma \
+    libsunavl \
+    libxml2 \
+    libz \
+    libzonecfg \
+    ; do
+    mv -v -f usr/lib/$march/$lib.so.* lib/$march/ || \
+        mv -v -f usr/lib/$lib.so.* lib/$march/
+done
 
 # List here files or directories which
 # should be *moved* to boot archive.
@@ -127,7 +143,6 @@ tar --remove-files -c -f - \
     home \
     kernel \
     lib \
-    lib32 \
     media \
     mnt \
     opt \
@@ -153,7 +168,6 @@ tar -c -f - \
     usr/sbin \
 | tar xf - -C "${BOOTARCH}"
 
-
 # We need only kernel itself for GRUB.
 # BTW, kernel should be in boot archive as well (WTF?)
 find platform -type f -a ! -name unix -delete