Some updates

1 files changed, 1 insertions, 21 deletions

diff --git a/protostar b/protostar
index b8dff4c..fff1e14 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,ufsutils,hsfs,mc,vim,illumos-ssh-client,wget,bzip2,debootstrap,less \
+    --include=illumos-grub,illumos-kernel,mc,vim,openssh-client,wget,bzip2,debootstrap,less \
     "${DIST}" \
     "${ROOT}" \
     "${REPO}"
@@ -42,18 +42,6 @@ rm -rf "${ROOT}"/var/log/*
 rm -rf "${ROOT}"/var/adm/*
 rm -rf "${ROOT}"/usr/share/doc/*
 
-# Remove 32-bit modules:
-( cd "${ROOT}"
-find kernel platform usr/kernel usr/platform -type f -path '*/amd64/*' \
-| while read amd64; do
-    i86=${amd64/amd64\//}
-    if [ -f "$i86" ]; then
-        echo "Removing $i86"
-        rm "$i86"
-    fi
-done
-)
-
 
 devfsadm -r "${ROOT}"
 
@@ -76,8 +64,6 @@ cat <<VFSTAB > $ROOT/etc/vfstab
 #device         device          mount           FS      fsck    mount   mount
 #to mount       to fsck         point           type    pass    at boot options
 #
-fd              -               /dev/fd         fd      -       no      -
-swap            -               /tmp            tmpfs   -       yes     -
 /devices/ramdisk:a -            /               ufs     1       no     rw,nologging
 
 VFSTAB
@@ -87,12 +73,6 @@ echo 'export LD_NOVERSION=1' >> $ROOT/etc/profile
 echo "dyson-${DIST}-live" > "${ROOT}/etc/nodename"
 touch "${ROOT}/etc/hostname.e1000g0"
 touch "${ROOT}/etc/dhcp.e1000g0"
-echo '127.0.0.1 localhost loghost' > "${ROOT}/etc/inet/hosts"
-
-# Hack to know root password:
-sed -i '/^root/d' $ROOT/etc/shadow
-grep root /etc/shadow >> $ROOT/etc/shadow
-echo 'User: root, password: root' >> "${ROOT}/etc/issue"
 
 # Script to find and mount usr.lzma:
 sed "s/USR_IMG/$USR_IMG/" "find-usr" > "${ROOT}/lib/svc/method/find-usr"