Merging casper 1.115.

grml · Feb 26, 2008 · cf3c2b4 · cf3c2b4
1 parent dd7c11b
commit cf3c2b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper
@@ -1,5 +1,12 @@
+casper (1.115) hardy; urgency=low
+
+  * Add the user to the groups specified by user-setup-udeb.
+
+ -- Evan Dandrea <evand@ubuntu.com>  Thu, 24 Jan 2008 19:08:33 +0000
+
 casper (1.114) hardy; urgency=low
 
+  [ Colin Watson ]
   * casper-md5check: Close md5_file before exiting.
   * Disable tracker-applet as well as trackerd, otherwise the former starts
     the latter.

diff --git a/scripts/live-bottom/18hostname b/scripts/live-bottom/18hostname
@@ -46,4 +46,6 @@ ff02::2 ip6-allrouters
 ff02::3 ip6-allhosts
 EOF
 
+hostname "${HOSTNAME}"
+
 log_end_msg