# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1238836150 0
# Node ID b5c440736bca1d892f49b8da35bcd75d3e0aca2c
# Parent  32d8dad532d8cd971ea7216dd8046ce67819156e
busybox/mkswap: gparted needs -L support

diff -r 32d8dad532d8 -r b5c440736bca busybox-pam/receipt
--- a/busybox-pam/receipt	Wed Apr 01 18:21:58 2009 +0000
+++ b/busybox-pam/receipt	Sat Apr 04 09:09:10 2009 +0000
@@ -33,6 +33,7 @@
 modinfo.u
 modprobe.u
 paths.u
+mkswap.u
 EOT
     cp $WOK/busybox/stuff/$SOURCE-$VERSION.config .config
     sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config
diff -r 32d8dad532d8 -r b5c440736bca busybox/receipt
--- a/busybox/receipt	Wed Apr 01 18:21:58 2009 +0000
+++ b/busybox/receipt	Sat Apr 04 09:09:10 2009 +0000
@@ -31,6 +31,7 @@
 modinfo.u
 modprobe.u
 paths.u
+mkswap.u
 EOT
     cp ../stuff/$PACKAGE-$VERSION.config .config
     make oldconfig
diff -r 32d8dad532d8 -r b5c440736bca busybox/stuff/busybox-1.12.0-mkswap.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/busybox/stuff/busybox-1.12.0-mkswap.u	Sat Apr 04 09:09:10 2009 +0000
@@ -0,0 +1,35 @@
+Without label, Gparted call mkswap -L '' <device> 
+--- busybox-1.12.0/util-linux/mkswap.c
++++ busybox-1.12.0/util-linux/mkswap.c
+@@ -92,14 +92,14 @@
+ {
+ 	int fd, pagesize;
+ 	off_t len;
++	char *label = NULL;
+ 
+-	// No options supported.
+-
+-	if (argc != 2) bb_show_usage();
++	getopt32(argv, "L:", &label);
++	argv += optind;
+ 
+ 	// Figure out how big the device is and announce our intentions.
+ 
+-	fd = xopen(argv[1], O_RDWR);
++	fd = xopen(argv[0], O_RDWR);
+ 	/* fdlength was reported to be unreliable - use seek */
+ 	len = xlseek(fd, 0, SEEK_END);
+ #if ENABLE_SELINUX
+@@ -119,6 +119,12 @@
+ 
+ 	xlseek(fd, 1024, SEEK_SET);
+ 	xwrite(fd, hdr, NWORDS * 4);
++	if (label) {
++		if (strlen(label) > 15)
++			label[15] = 0;
++		xlseek(fd, 1024 + 28, SEEK_SET);
++		xwrite(fd, label, strlen(label));
++	}
+ 	xlseek(fd, pagesize - 10, SEEK_SET);
+ 	xwrite(fd, SWAPSPACE2, 10);
+ 	fsync(fd);