~ubuntu-branches/ubuntu/precise/silo/precise

« back to all changes in this revision

Viewing changes to debian/patches/20-silo_cdrom_boot_fix.patch

  • Committer: Bazaar Package Importer
  • Author(s): Fabio M. Di Nitto
  • Date: 2006-11-08 02:51:05 UTC
  • mfrom: (1.1.2 etch)
  • Revision ID: james.westby@ubuntu.com-20061108025105-u198k1hko17zldtf
Tags: 1.4.13-1ubuntu1
* Merge from debian unstable:
  * Change build-dep from linux-kernel-headers to linux-libc-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
diff -aur a/first-isofs/isofs.c b/first-isofs/isofs.c
2
 
--- a/first-isofs/isofs.c       2006-06-01 10:24:53.000000000 -0700
3
 
+++ b/first-isofs/isofs.c       2006-06-18 19:56:18.000000000 -0700
4
 
@@ -101,6 +101,23 @@
5
 
        return 0;
6
 
 }
7
 
 
8
 
+static void cd_fini(void)
9
 
+{
10
 
+       switch (prom_vers) {
11
 
+       case PROM_V0:
12
 
+               romvec->pv_v0devops.v0_devclose(fd);
13
 
+               break;
14
 
+
15
 
+       case PROM_V2:
16
 
+       case PROM_V3:
17
 
+               romvec->pv_v2devops.v2_dev_close(fd);
18
 
+               break;
19
 
+
20
 
+       case PROM_P1275:
21
 
+               p1275_cmd("close", 1, fd);
22
 
+               break;
23
 
+       };
24
 
+}
25
 
 
26
 
 static int cd_read_block(unsigned long long offset, int size, void *data)
27
 
 {
28
 
@@ -445,6 +462,8 @@
29
 
        sinfo->conf_part = 1;
30
 
        strcpy(sinfo->conf_file, silo_conf);
31
 
 
32
 
+       cd_fini();
33
 
+
34
 
        prom_putchar(sinfo->id);
35
 
 
36
 
        return dest;