Bug#283377: Should not copy installer account to /target if network-console-config not installed

[Frans Pop <aragorn@tiscali.nl>]

tags 283377 + pending
thanks

The attached patch (untested) should fix this issue.

Collin Watson also advised me on #d-boot that installation of
network-console-config will currently fail on full CD's as the CD has
already been unmounted when the script is run.
This has been fixed by moving the call to apt-install to the postinst.

The patch has already been committed to SVN for HEAD.
I think this patch should also be considered for the Sarge branch.

Index: debian/changelog
===================================================================
--- debian/changelog	(revision 24042)
+++ debian/changelog	(working copy)
@@ -1,3 +1,14 @@
+network-console (0.0.9) UNRELEASED; urgency=low
+
+  * Frans Pop
+    - Only copy SSH keys and installer account if network-console-config
+      is installed successfully. Closes: #283377.
+    - Queue installation of network-console-config in postinst as for
+      CD-based installations the CD will already be unmounted when the
+      prebaseconfig script is run (tanks to Colin Watson for spotting this).
+
+ -- Frans Pop <aragorn@tiscali.nl>  Mon, 29 Nov 2004 16:25:53 +0100
+
 network-console (0.0.8) unstable; urgency=low
 
   * Frans Pop
Index: debian/network-console.postinst
===================================================================
--- debian/network-console.postinst	(revision 24042)
+++ debian/network-console.postinst	(working copy)
@@ -45,7 +45,9 @@
 
 sshd
 
+# Queue installation of network-console-config
+apt-install network-console-config || true
+
 db_subst $TEMPLATE_ROOT/start fingerprint $KEY_FINGERPRINT
 db_input critical $TEMPLATE_ROOT/start
 db_go
-
Index: prebaseconfig
===================================================================
--- prebaseconfig	(revision 24042)
+++ prebaseconfig	(working copy)
@@ -11,6 +11,19 @@
 
 TEMPLATE_ROOT=debian-installer/network-console
 
+if chroot /target dpkg -l network-console-config 2>/dev/null | grep "^ii" ; then
+    log "Package network-console-config was installed into /target"
+    db_input critical $TEMPLATE_ROOT/prebaseconfig-reminder
+    db_go
+else
+    ## FIXME (see #279090) ##
+    # There really should be a dialog shown here
+    # Not implemented yet because of string freeze for RC2 release
+    log "Package network-console-config was not installed into /target;"
+    log "aborting configuration of base-configuration over SSH"
+    exit 0
+fi
+
 DIR=/etc/ssh/
 
 mkdir /target/$DIR
@@ -19,14 +32,3 @@
 
 echo 'installer:x:0:0:installer:/:/usr/sbin/base-config-network-console' >> /target/etc/passwd
 grep "^installer:" /etc/shadow >> /target/etc/shadow
-
-if apt-install network-console-config ; then
-    log "Installed network-console-config successfully into /target"
-    db_input critical $TEMPLATE_ROOT/prebaseconfig-reminder
-    db_go
-else
-    ## FIXME (see #279090) ##
-    # There really should be a dialog shown here
-    # Not implemented yet because of string freeze for RC2 release
-    log "Installation of network-console-config into /target failed"
-fi