=== modified file '.pc/applied-patches' --- .pc/applied-patches 2010-12-09 15:43:58 +0000 +++ .pc/applied-patches 2010-12-16 13:50:58 +0000 @@ -28,3 +28,4 @@ test-bin.patch static-sh-alias.patch grep-o-loop.patch +recognize-compressed-hibernate-swap.patch === added directory '.pc/recognize-compressed-hibernate-swap.patch' === added file '.pc/recognize-compressed-hibernate-swap.patch/.timestamp' === added directory '.pc/recognize-compressed-hibernate-swap.patch/util-linux' === added directory '.pc/recognize-compressed-hibernate-swap.patch/util-linux/volume_id' === added file '.pc/recognize-compressed-hibernate-swap.patch/util-linux/volume_id/linux_swap.c' --- .pc/recognize-compressed-hibernate-swap.patch/util-linux/volume_id/linux_swap.c 1970-01-01 00:00:00 +0000 +++ .pc/recognize-compressed-hibernate-swap.patch/util-linux/volume_id/linux_swap.c 2010-12-16 13:50:58 +0000 @@ -0,0 +1,78 @@ +/* + * volume_id - reads filesystem label and uuid + * + * Copyright (C) 2004 Kay Sievers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "volume_id_internal.h" + +struct swap_header_v1_2 { + uint8_t bootbits[1024]; + uint32_t version; + uint32_t last_page; + uint32_t nr_badpages; + uint8_t uuid[16]; + uint8_t volume_name[16]; +} PACKED; + +#define LARGEST_PAGESIZE 0x4000 + +int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/) +{ +#define off ((uint64_t)0) + struct swap_header_v1_2 *sw; + const uint8_t *buf; + unsigned page; + + dbg("probing at offset 0x%llx", (unsigned long long) off); + + /* the swap signature is at the end of the PAGE_SIZE */ + for (page = 0x1000; page <= LARGEST_PAGESIZE; page <<= 1) { + buf = volume_id_get_buffer(id, off + page-10, 10); + if (buf == NULL) + return -1; + + if (memcmp(buf, "SWAP-SPACE", 10) == 0) { +// id->type_version[0] = '1'; +// id->type_version[1] = '\0'; + goto found; + } + + if (memcmp(buf, "SWAPSPACE2", 10) == 0 + || memcmp(buf, "S1SUSPEND", 9) == 0 + || memcmp(buf, "S2SUSPEND", 9) == 0 + || memcmp(buf, "ULSUSPEND", 9) == 0 + ) { + sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2)); + if (sw == NULL) + return -1; +// id->type_version[0] = '2'; +// id->type_version[1] = '\0'; +// volume_id_set_label_raw(id, sw->volume_name, 16); + volume_id_set_label_string(id, sw->volume_name, 16); + volume_id_set_uuid(id, sw->uuid, UUID_DCE); + goto found; + } + } + return -1; + +found: +// volume_id_set_usage(id, VOLUME_ID_OTHER); +// id->type = "swap"; + + return 0; +} === modified file 'debian/changelog' --- debian/changelog 2010-12-09 15:43:58 +0000 +++ debian/changelog 2010-12-16 13:50:58 +0000 @@ -1,3 +1,9 @@ +busybox (1:1.17.1-7ubuntu5) natty; urgency=low + + * Added patch recognize-compressed-hibernate-swap.patch + + -- James Hunt Thu, 16 Dec 2010 13:45:41 +0000 + busybox (1:1.17.1-7ubuntu4) natty; urgency=low * Drop if-header-conflicts patch from 1:1.17.1-7ubuntu2; linux-libc-dev === added file 'debian/patches/recognize-compressed-hibernate-swap.patch' --- debian/patches/recognize-compressed-hibernate-swap.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/recognize-compressed-hibernate-swap.patch 2010-12-16 13:50:58 +0000 @@ -0,0 +1,20 @@ +Description: Recognize compressed hibernate swap signature. + util-linux/volume_id/linux_swap.c: Added the new magic LINHIB0001 + signature. +Author: James Hunt +Bug-Ubuntu: https://bugs.launchpad.net/bugs/683605 +Forwarded: http://lists.busybox.net/pipermail/busybox/2010-December/074126.html +Last-Update: 2010-12-16 + +Index: ubuntu-busybox/util-linux/volume_id/linux_swap.c +=================================================================== +--- ubuntu-busybox.orig/util-linux/volume_id/linux_swap.c 2010-12-16 13:34:00.790507002 +0000 ++++ ubuntu-busybox/util-linux/volume_id/linux_swap.c 2010-12-16 13:34:35.290507001 +0000 +@@ -55,6 +55,7 @@ + if (memcmp(buf, "SWAPSPACE2", 10) == 0 + || memcmp(buf, "S1SUSPEND", 9) == 0 + || memcmp(buf, "S2SUSPEND", 9) == 0 ++ || memcmp(buf, "LINHIB0001", 10) == 0 + || memcmp(buf, "ULSUSPEND", 9) == 0 + ) { + sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2)); === modified file 'debian/patches/series' --- debian/patches/series 2010-12-09 15:43:58 +0000 +++ debian/patches/series 2010-12-16 13:50:58 +0000 @@ -36,3 +36,4 @@ test-bin.patch static-sh-alias.patch grep-o-loop.patch +recognize-compressed-hibernate-swap.patch === modified file 'util-linux/volume_id/linux_swap.c' --- util-linux/volume_id/linux_swap.c 2010-08-03 06:42:39 +0000 +++ util-linux/volume_id/linux_swap.c 2010-12-16 13:50:58 +0000 @@ -55,6 +55,7 @@ if (memcmp(buf, "SWAPSPACE2", 10) == 0 || memcmp(buf, "S1SUSPEND", 9) == 0 || memcmp(buf, "S2SUSPEND", 9) == 0 + || memcmp(buf, "LINHIB0001", 10) == 0 || memcmp(buf, "ULSUSPEND", 9) == 0 ) { sw = volume_id_get_buffer(id, off, sizeof(struct swap_header_v1_2));