Update for new grml-terminalserver-data package, fixed typo, removed bootoption secure

diff --git a/debian/changelog b/debian/changelog
index 8d7afa9..cf17b70 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+grml-terminalserver (0.89) unstable; urgency=low
+
+  * Update for new grml-terminalserver-data package.
+  * Fixed typo in grml-terminalserver-config and removed the
+    not-yet support bootoption 'secure' from examples.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 12 Apr 2007 00:03:49 +0200
+
 grml-terminalserver (0.88) unstable; urgency=low
 
   * Just raising package version so we get in sync with different

diff --git a/debian/control b/debian/control
index d235a09..0511f23 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.2
 
 Package: grml-terminalserver
 Architecture: any
-Depends: grml-shlib (>=1.02.03), grml-terminalserver-data (>=0.62), dialog, dhcp3-server, atftpd (>=0.7.dfsg-1.2), syslinux, gcc-3.3 [i386] | gcc-3.4 [i386], gcc-3.4 [amd64], ipcalc, ash, libc6-dev-i386 [amd64], ia32-libs [amd64]
+Depends: grml-shlib (>=1.02.03), grml-terminalserver-data (>=0.63), dialog, dhcp3-server, atftpd (>=0.7.dfsg-1.2), syslinux, gcc, ipcalc, ash, libc6-dev [i386], libc6-dev-i386 [amd64], ia32-libs [amd64]
 Description: terminalserver for grml
  This software should netboot grml on other computers over the
  network. The terminalserver also works with NON-PXE

diff --git a/grml-terminalserver-config b/grml-terminalserver-config
index ea8777a..194ad98 100755 (executable)
--- a/grml-terminalserver-config
+++ b/grml-terminalserver-config
@@ -397,9 +397,8 @@ Quite usefull examples:
 
 ssh=<pw>              - Start ssh server and set password of user grml to pw
 services=<1,2,3>      - Execute /etc/init.d/{1,2,3} start
-console=ttyS0,9600n8  - Initialise seriell console
-secure                - Boot only restricted clients (without root permissions)
-startx                - Boot into X (should be used with secure)
+console=ttyS0,9600n8  - Initialise serial console
+startx                - Boot into X
 
 
 "

diff --git a/shared_prog_vars b/shared_prog_vars
index c1d3a57..fd882e0 100644 (file)
--- a/shared_prog_vars
+++ b/shared_prog_vars
@@ -62,7 +62,7 @@ TEMPLATE_CONFIG_DIR_="$USR_SHARE_/templates"
 GRUB_NIC_CONF_="$USR_SHARE_/grub_cards"
 
 # this file is provided by another debian package (grml-terminalserver-data)
-GRUB_SOURCE_="$USR_SHARE_/grub-0.96.tar.gz"
+GRUB_SOURCE_="$USR_SHARE_/grub-0.97.tar.gz"
 
 # maximum initrd size
 MAX_INITRD_SIZE_=16000