← Back to branch summary

~ubuntu-branches/debian/sid/ltsp/sid

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes-5.2.3-2

  • Committer: Bazaar Package Importer
  • Author(s): Petter Reinholdtsen
  • Date: 2010-07-21 21:44:40 UTC
  • mfrom: (51.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100721214440-5rvai0qgjg3x9evu
Tags: 5.2.3-2
http://bugs.debian.org/589646
http://bugs.debian.org/589820
* Change /cdrom to /media/cdrom, to work with the new d-i paths
  (Closes: #589646).  Using urgency=high to fix this RC bug.
* Disable package signature checking when installing from CD using
  the ltsp-client-builder udeb.
* Use sleep 1 instead of sleep 0.1 to work with busybox
  (Closes: 589820).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/debian-changes-5.2.3-2
 
1
Description: Upstream changes introduced in version 5.2.3-2
 
2
 This patch has been created by dpkg-source during the package build.
 
3
 Here's the last changelog entry, hopefully it gives details on why
 
4
 those changes were made:
 
5
 .
 
6
 ltsp (5.2.3-2) unstable; urgency=high
 
7
 .
 
8
   * Change /cdrom to /media/cdrom, to work with the new d-i paths
 
9
     (Closes: #589646).  Using urgency=high to fix this RC bug.
 
10
   * Disable package signature checking when installing from CD using
 
11
     the ltsp-client-builder udeb.
 
12
   * Use sleep 1 instead of sleep 0.1 to work with busybox
 
13
     (Closes: 589820).
 
14
 .
 
15
 The person named in the Author field signed this changelog entry.
 
16
Author: Petter Reinholdtsen <pere@debian.org>
 
17
Bug-Debian: http://bugs.debian.org/589646
 
18
Bug-Debian: http://bugs.debian.org/589820
 
19
 
 
20
---
 
21
The information above should follow the Patch Tagging Guidelines, please
 
22
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
 
23
are templates for supplementary fields that you might want to add:
 
24
 
 
25
Origin: <vendor|upstream|other>, <url of original patch>
 
26
Bug: <url in upstream bugtracker>
 
27
Bug-Debian: http://bugs.debian.org/<bugnumber>
 
28
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 
29
Forwarded: <no|not-needed|url proving that it has been forwarded>
 
30
Reviewed-By: <name and email of someone who approved the patch>
 
31
Last-Update: <YYYY-MM-DD>
 
32
 
 
33
--- ltsp-5.2.3.orig/server/plugins/ltsp-build-client/Debian/099-mount-cdrom
 
34
+++ ltsp-5.2.3/server/plugins/ltsp-build-client/Debian/099-mount-cdrom
 
35
@@ -11,12 +11,12 @@ case "$MODE" in
 
36
         ;;
 
37
     before-install)
 
38
         if [ "$MOUNT_CDROM" = "true" ]; then
 
39
-            mount /cdrom
 
40
+            mount /media/cdrom
 
41
         fi
 
42
         ;;
 
43
     finalization)
 
44
         if [ "$MOUNT_CDROM" = "true" ]; then
 
45
-            umount /cdrom
 
46
+            umount /media/cdrom
 
47
         fi
 
48
         ;;
 
49
 esac
 
50
--- ltsp-5.2.3.orig/client/initramfs/scripts/init-premount/udhcp
 
51
+++ ltsp-5.2.3/client/initramfs/scripts/init-premount/udhcp
 
52
@@ -54,7 +54,7 @@ bring_up_interfaces()
 
53
 # TODO: Find a better way. Setting PREREQs="udev", accessing /proc/net/dev,
 
54
 # calling ifconfig or ipconfig... something better than calling sleep
 
55
 while ! ip link show > /dev/null 2>&1; do
 
56
-    sleep 0.1
 
57
+    sleep 1
 
58
 done
 
59
 sleep 1
 
60
 
 
61
@@ -68,7 +68,7 @@ fi
 
62
 for i in $interfaces; do
 
63
     ip link set $i up
 
64
 done
 
65
-sleep 0.1
 
66
+sleep 1
 
67
 }
 
68
 
 
69
 # Analyze whatever information was provided in the kernel command line