From 7dc85612036542d3a0e5bf3f54d7240c4e310d4b Mon Sep 17 00:00:00 2001
From: bnewbold <bnewbold@robocracy.org>
Date: Fri, 23 Aug 2013 07:07:53 +0000
Subject: polystrap: update novena config

---
 polystrap/novena/debconfseed.txt             | 11 ++---------
 polystrap/novena/hooks/create_user           |  3 ++-
 polystrap/novena/hooks/empty_password        |  3 ++-
 polystrap/novena/hooks/firstboot             | 24 +++++++++++++++++++++++-
 polystrap/novena/hooks/serial_tty            |  2 +-
 polystrap/novena/packages/base               | 18 ++++++++++++++++++
 polystrap/novena/packages/helpful            | 16 ++++++++++++++++
 polystrap/novena/packages/wireless           |  5 +++++
 polystrap/novena/root/etc/hosts              |  9 +++++++--
 polystrap/novena/root/etc/network/interfaces |  4 ++++
 10 files changed, 80 insertions(+), 15 deletions(-)
 mode change 120000 => 100644 polystrap/novena/hooks/create_user
 mode change 120000 => 100644 polystrap/novena/hooks/empty_password
 mode change 120000 => 100644 polystrap/novena/hooks/firstboot
 mode change 120000 => 100644 polystrap/novena/hooks/serial_tty
 create mode 100644 polystrap/novena/packages/helpful
 create mode 100644 polystrap/novena/packages/wireless

diff --git a/polystrap/novena/debconfseed.txt b/polystrap/novena/debconfseed.txt
index 8502a8d81..b2a4f3d56 100644
--- a/polystrap/novena/debconfseed.txt
+++ b/polystrap/novena/debconfseed.txt
@@ -8,16 +8,9 @@ tzdata	tzdata/Zones/SystemV	select
 tzdata	tzdata/Zones/Arctic	select	
 tzdata	tzdata/Zones/Pacific	select	
 tzdata	tzdata/Zones/Antarctica	select	
-tzdata	tzdata/Zones/Europe	select	Berlin
+tzdata	tzdata/Zones/Europe	select
 tzdata	tzdata/Zones/Africa	select	
 tzdata	tzdata/Zones/America	select	
-tzdata	tzdata/Areas	select	Europe
+tzdata	tzdata/Areas	select	Etc
 tzdata	tzdata/Zones/Atlantic	select	
 tzdata	tzdata/Zones/Indian	select	
-nodm	nodm/xinit	string	/usr/bin/xinit
-nodm	nodm/min_session_time	string	60
-nodm	nodm/enabled	boolean	true
-nodm	nodm/xsession	string	/etc/X11/Xsession
-nodm	nodm/x_options	string	vt7 -nolisten tcp
-nodm	nodm/first_vt	string	7
-nodm	nodm/user	string	user
diff --git a/polystrap/novena/hooks/create_user b/polystrap/novena/hooks/create_user
deleted file mode 120000
index ae9b334a0..000000000
--- a/polystrap/novena/hooks/create_user
+++ /dev/null
@@ -1 +0,0 @@
-../../default/hooks/create_user
\ No newline at end of file
diff --git a/polystrap/novena/hooks/create_user b/polystrap/novena/hooks/create_user
new file mode 100644
index 000000000..0404ea23b
--- /dev/null
+++ b/polystrap/novena/hooks/create_user
@@ -0,0 +1,2 @@
+fakechroot chroot $ROOTDIR useradd user -p `openssl passwd -crypt -salt // ""` -s /bin/bash --create-home
+fakechroot chroot $ROOTDIR usermod -a -G audio,dialout user
diff --git a/polystrap/novena/hooks/empty_password b/polystrap/novena/hooks/empty_password
deleted file mode 120000
index 613fec182..000000000
--- a/polystrap/novena/hooks/empty_password
+++ /dev/null
@@ -1 +0,0 @@
-../../default/hooks/empty_password
\ No newline at end of file
diff --git a/polystrap/novena/hooks/empty_password b/polystrap/novena/hooks/empty_password
new file mode 100644
index 000000000..ce4f51582
--- /dev/null
+++ b/polystrap/novena/hooks/empty_password
@@ -0,0 +1,2 @@
+sed -i 's/\(root:\)[^:]*\(:\)/\1'`openssl passwd -crypt -salt // "" | sed 's/\(\/\|\\\|&\)/\\\&/g'`'\2/' $ROOTDIR/etc/shadow
+sed -i 's/\(PermitEmptyPasswords\) no/\1 yes/' $ROOTDIR/etc/ssh/sshd_config || true
diff --git a/polystrap/novena/hooks/firstboot b/polystrap/novena/hooks/firstboot
deleted file mode 120000
index d9788123d..000000000
--- a/polystrap/novena/hooks/firstboot
+++ /dev/null
@@ -1 +0,0 @@
-../../default/hooks/firstboot
\ No newline at end of file
diff --git a/polystrap/novena/hooks/firstboot b/polystrap/novena/hooks/firstboot
new file mode 100644
index 000000000..7f1119e3c
--- /dev/null
+++ b/polystrap/novena/hooks/firstboot
@@ -0,0 +1,23 @@
+cat > $ROOTDIR/etc/init.d/firstboot << __END__
+#!/bin/sh -e
+### BEGIN INIT INFO
+# Provides: firstboot
+# Required-Start: \$all
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+### END INIT INFO
+
+for f in rsa dsa ecdsa; do rm -rf /etc/ssh/ssh_host_\${f}_key; done
+echo "generating ssh rsa key..."
+ssh-keygen -q -t rsa -f /etc/ssh/ssh_host_rsa_key -C "" -N ""
+echo "generating ssh dsa key..."
+ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -C "" -N ""
+echo "generating ssh ecdsa key..."
+ssh-keygen -q -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C "" -N ""
+
+update-rc.d -f firstboot remove
+__END__
+
+chmod +x $ROOTDIR/etc/init.d/firstboot
+fakechroot chroot $ROOTDIR update-rc.d firstboot start 99 S
diff --git a/polystrap/novena/hooks/serial_tty b/polystrap/novena/hooks/serial_tty
deleted file mode 120000
index f77cf2e61..000000000
--- a/polystrap/novena/hooks/serial_tty
+++ /dev/null
@@ -1 +0,0 @@
-../../default/hooks/serial_tty
\ No newline at end of file
diff --git a/polystrap/novena/hooks/serial_tty b/polystrap/novena/hooks/serial_tty
new file mode 100644
index 000000000..deb6486e3
--- /dev/null
+++ b/polystrap/novena/hooks/serial_tty
@@ -0,0 +1 @@
+echo "T0:2345:respawn:/sbin/getty 115200 ttymxc1" >> $ROOTDIR/etc/inittab
diff --git a/polystrap/novena/packages/base b/polystrap/novena/packages/base
index 6c2dda9c8..17f4aa1e2 100644
--- a/polystrap/novena/packages/base
+++ b/polystrap/novena/packages/base
@@ -1,2 +1,20 @@
+file
+screen
+base-files
+hostname
+udev
+apt
+dialog
 fakeroot
 fakechroot
+less
+openssh-server
+kmod
+isc-dhcp-client
+apt-utils
+sudo
+vim-tiny
+locales
+ifupdown
+net-tools
+firmware-linux-free
diff --git a/polystrap/novena/packages/helpful b/polystrap/novena/packages/helpful
new file mode 100644
index 000000000..5dea3a036
--- /dev/null
+++ b/polystrap/novena/packages/helpful
@@ -0,0 +1,16 @@
+manpages
+man-db
+i2c-tools
+build-essential
+wget
+iproute
+parted
+dosfstools
+iputils-ping
+iptables
+traceroute
+dnsutils
+lsof
+ethtool
+pciutils
+git-core
diff --git a/polystrap/novena/packages/wireless b/polystrap/novena/packages/wireless
new file mode 100644
index 000000000..78abe2020
--- /dev/null
+++ b/polystrap/novena/packages/wireless
@@ -0,0 +1,5 @@
+iw
+wireless-tools
+wpasupplicant
+hostapd
+rfkill
diff --git a/polystrap/novena/root/etc/hosts b/polystrap/novena/root/etc/hosts
index 4c74b7ff0..1e6420c54 100644
--- a/polystrap/novena/root/etc/hosts
+++ b/polystrap/novena/root/etc/hosts
@@ -1,2 +1,7 @@
-127.0.0.1 localhost
-127.0.0.1 novena
+127.0.0.1       localhost.localdomain localhost novena
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
diff --git a/polystrap/novena/root/etc/network/interfaces b/polystrap/novena/root/etc/network/interfaces
index f1bd92ed2..9b03900b0 100644
--- a/polystrap/novena/root/etc/network/interfaces
+++ b/polystrap/novena/root/etc/network/interfaces
@@ -1,2 +1,6 @@
 auto lo
 iface lo inet loopback
+
+auto eth0
+iface eth0 inet dhcp
+    hwaddress ether 00:11:22:33:44:55
-- 
cgit v1.2.3