Install only common node config in preseed

* Personalize admin nodes in the post-install. This will leave the
  machine open to general logins for a few minutes.

diff --git a/navajos-postinstall.sh b/navajos-postinstall.sh
index 9ad6c7b..2b06162 100755 (executable)
--- a/navajos-postinstall.sh
+++ b/navajos-postinstall.sh
@@ -9,6 +9,8 @@ set -x
 # Misc postinst stuff
 # Unfortunately has to be run after the first reboot by an admin user
 
 # Misc postinst stuff
 # Unfortunately has to be run after the first reboot by an admin user
 

+sudo apt-get install hcoop-admin-common-config
+

 # Extract host keytab
 sudo kadmin -p ${USER}@HCOOP.NET -r HCOOP.NET -q "ktadd -k /etc/krb5.keytab host/navajos.hcoop.net@HCOOP.NET"
 sudo chown root:root /etc/krb5.keytab
 # Extract host keytab
 sudo kadmin -p ${USER}@HCOOP.NET -r HCOOP.NET -q "ktadd -k /etc/krb5.keytab host/navajos.hcoop.net@HCOOP.NET"
 sudo chown root:root /etc/krb5.keytab

diff --git a/preseed/preseed-test-0.cfg b/preseed/preseed-test-0.cfg
index 666f5a8..378bbb6 100644 (file)
--- a/preseed/preseed-test-0.cfg
+++ b/preseed/preseed-test-0.cfg
@@ -366,7 +366,7 @@ tasksel     tasksel/first   multiselect     SSH server, Standard system utilities
 #tasksel tasksel/desktop multiselect kde, xfce
 
 # Individual additional packages to install
 #tasksel tasksel/desktop multiselect kde, xfce
 
 # Individual additional packages to install

-d-i pkgsel/include string build-essential less sudo vim emacs23-nox etckeeper changetrack openssh-server debsums logcheck bzip2 denyhosts rkhunter openafs-client ntp nscd krb5-user libpam-krb5 kstart ssmtp libpam-afs-session openafs-krb5 ferm libnss-afs hcoop-nsswitch-config hcoop-admin-common-config hcoop-firewall-config hcoop-krb5-config hcoop-openssh-server-config \
+d-i pkgsel/include string build-essential less sudo vim emacs23-nox etckeeper changetrack openssh-server debsums logcheck bzip2 denyhosts rkhunter openafs-client ntp nscd krb5-user libpam-krb5 kstart ssmtp libpam-afs-session openafs-krb5 ferm libnss-afs hcoop-nsswitch-config hcoop-common-config hcoop-firewall-config hcoop-krb5-config hcoop-openssh-server-config \

     mlton-compiler mlton-tools libssl-dev libpcre3-dev # domtool deps, a metapackage would be useful here
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
     mlton-compiler mlton-tools libssl-dev libpcre3-dev # domtool deps, a metapackage would be useful here
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade