diff options
Diffstat (limited to 'debian/patches/bootshell0003-libdiskfs-fixes-XXX.patch')
-rw-r--r-- | debian/patches/bootshell0003-libdiskfs-fixes-XXX.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/debian/patches/bootshell0003-libdiskfs-fixes-XXX.patch b/debian/patches/bootshell0003-libdiskfs-fixes-XXX.patch deleted file mode 100644 index 5afb2bb5..00000000 --- a/debian/patches/bootshell0003-libdiskfs-fixes-XXX.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 3a7a90a40f9920fa613dd648aff34b09af124781 Mon Sep 17 00:00:00 2001 -From: Justus Winter <4winter@informatik.uni-hamburg.de> -Date: Tue, 13 Jan 2015 18:59:29 +0100 -Subject: [PATCH hurd 03/11] libdiskfs: fixes XXX - ---- - libdiskfs/boot-start.c | 3 ++- - libdiskfs/init-init.c | 10 +++++----- - libdiskfs/init-startup.c | 3 ++- - 3 files changed, 9 insertions(+), 7 deletions(-) - -diff --git a/libdiskfs/boot-start.c b/libdiskfs/boot-start.c -index 731d8c6..511dd61 100644 ---- a/libdiskfs/boot-start.c -+++ b/libdiskfs/boot-start.c -@@ -466,7 +466,8 @@ diskfs_S_fsys_init (struct diskfs_control *pt, - struct peropen *rootpo; - - if (!pt -- || pt->pi.class != diskfs_initboot_class) -+ || (pt->pi.class != diskfs_initboot_class -+ && pt->pi.class != diskfs_control_class)) // XXX - return EOPNOTSUPP; - - if (initdone) -diff --git a/libdiskfs/init-init.c b/libdiskfs/init-init.c -index 357960b..3c42b3d 100644 ---- a/libdiskfs/init-init.c -+++ b/libdiskfs/init-init.c -@@ -69,14 +69,14 @@ diskfs_init_diskfs (void) - diskfs_default_pager = MACH_PORT_NULL; - err = vm_set_default_memory_manager (host, &diskfs_default_pager); - mach_port_deallocate (mach_task_self (), host); -- -- if (!err) -- err = maptime_map (1, 0, &diskfs_mtime); - } -+ if (err) -+ return err; - } -- else -- err = maptime_map (0, 0, &diskfs_mtime); - -+ err = maptime_map (0, 0, &diskfs_mtime); -+ if (err) -+ err = maptime_map (1, 0, &diskfs_mtime); - if (err) - return err; - -diff --git a/libdiskfs/init-startup.c b/libdiskfs/init-startup.c -index 14da003..404b1a5 100644 ---- a/libdiskfs/init-startup.c -+++ b/libdiskfs/init-startup.c -@@ -106,7 +106,8 @@ diskfs_startup_diskfs (mach_port_t bootstrap, int flags) - mach_port_deallocate (mach_task_self (), bootstrap); - _diskfs_ncontrol_ports++; - -- _diskfs_init_completed (); -+ if (MACH_PORT_VALID (getproc ())) //XXX -+ _diskfs_init_completed (); - } - else - { --- -2.1.4 - |