remove and regenerate ssh-server keys; dpkg configure on 1st boot

2 files changed, 14 insertions, 19 deletions

diff --git a/freedom-maker/bin/install.sh b/freedom-maker/bin/install.sh
index 7743740..480e135 100755
--- a/freedom-maker/bin/install.sh
+++ b/freedom-maker/bin/install.sh
@@ -75,6 +75,9 @@ echo "Creating $user user, password: $userpassword"
 useradd $user
 echo $user:$userpassword | /usr/sbin/chpasswd
 
+echo "Removing SSH server keys (will re-generate them on first boot)"
+rm -f /etc/ssh/ssh_host_*
+
 echo "Deleting this very same script"
 rm -f /install.sh
 
diff --git a/freedom-maker/source/etc/init.d/first-run b/freedom-maker/source/etc/init.d/first-run
index c811ae0..07a0db6 100755
--- a/freedom-maker/source/etc/init.d/first-run
+++ b/freedom-maker/source/etc/init.d/first-run
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Script to complete the post-install process on first FBX boot.
+# Script to complete the post-install process on first torouter boot.
 
 ### BEGIN INIT INFO
 # Provides:          first-run
@@ -8,7 +8,7 @@
 # Required-Start:    2
 # Required-Stop:
 # Default-Stop:
-# Short-Description: Finish FBX install on DreamPlug
+# Short-Description: Finish torouter install on DreamPlug
 ### END INIT INFO
 
 function tweak-kernel {
@@ -26,31 +26,23 @@ function tweak-kernel {
     fi
 }
 
-function wifi-ap-setup {
-    # configure wireless access point with spinifex's prebuilt firmware
-
-    echo "Sleeping 30s for DHCP"
-    sleep 30    # wait for dhcp
-
-    echo "Installing UAP Firmware."
-    wget -O /tmp/marvell_wifi_firmware.tar.gz http://www.spinifex.com.au/plugs/downloads/dreamplug/marvell_wifi_firmware.tar.gz
-    tar -C /tmp -zxf /tmp/marvell_wifi_firmware.tar.gz
-    mkdir -p /lib/firmware/mrvl
-    cp /tmp/lib/firmware/mrvl/* /lib/firmware/mrvl
-}
-
 function create-keys {
     echo "Creating Keys."
 
-    echo "Creating SSH keys."
-    rm /etc/ssh/ssh_host_*
+    echo "(re)creating SSH keys."
+    rm -f /etc/ssh/ssh_host_*
     dpkg-reconfigure openssh-server
 
-    echo "Need to create other keys."
+    #echo "Need to create other keys."
     # gpg --batch --gen-key
     # see http://lists.gnupg.org/pipermail/gnupg-users/2003-March/017376.html
 }
 
+function final-configure {
+    echo "Catching up on any dpkg configurations..."
+    dpkg -a --configure
+}
+
 function remove-self {
     rm -f /etc/init.d/first-run
     rm -f /etc/rc1.d/S01first-run
@@ -61,7 +53,7 @@ function remove-self {
 }
 
 create-keys
-# wifi-ap-setup
+final-configure
 
 # the last things we do before quitting.
 #tweak-kernel