[Glibc-bsd-commits] r1412 - in trunk/freebsd-utils: debian debian/patches scripts/bin scripts/sbin

[Robert Millan]

Author: rmh
Date: 2006-03-30 14:12:58 +0000 (Thu, 30 Mar 2006)
New Revision: 1412

Added:
   trunk/freebsd-utils/debian/patches/006_debian_cli_compat_options.diff
Removed:
   trunk/freebsd-utils/scripts/bin/dmesg
   trunk/freebsd-utils/scripts/sbin/swapoff
   trunk/freebsd-utils/scripts/sbin/swapon
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/install
   trunk/freebsd-utils/debian/links
Log:
  * For dmesg, swapon and swapoff, implement the dummy compat options in the
    actual executable, and get rid of the wrapper scripts.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2006-03-30 14:05:31 UTC (rev 1411)
+++ trunk/freebsd-utils/debian/changelog	2006-03-30 14:12:58 UTC (rev 1412)
@@ -6,8 +6,10 @@
   * Use freebsd/stdlib.h instead of bsd/stdlib.h, because we need devname
     declaration.
   * Increase swapctl blocksize to 1024 * 1024 (1 MiB).
+  * For dmesg, swapon and swapoff, implement the dummy compat options in the
+    actual executable, and get rid of the wrapper scripts.
 
- -- Robert Millan <rmh at aybabtu.com>  Thu, 30 Mar 2006 16:04:06 +0200
+ -- Robert Millan <rmh at aybabtu.com>  Thu, 30 Mar 2006 16:12:15 +0200
 
 freebsd-utils (5.4+2-0.1) unreleased; urgency=low
 

Modified: trunk/freebsd-utils/debian/install
===================================================================
--- trunk/freebsd-utils/debian/install	2006-03-30 14:05:31 UTC (rev 1411)
+++ trunk/freebsd-utils/debian/install	2006-03-30 14:12:58 UTC (rev 1412)
@@ -1,16 +1,13 @@
-build-tree/src/sbin/dmesg/dmesg		/lib/freebsd
 build-tree/src/sbin/mount/mount		/lib/freebsd
 build-tree/src/sbin/umount/umount	/lib/freebsd
-build-tree/src/sbin/swapon/swapon	/lib/freebsd
 build-tree/src/sbin/sysctl/sysctl	/lib/freebsd
 
-scripts/bin/dmesg			/bin
 scripts/bin/mount			/bin
 scripts/bin/sysctl			/bin
 scripts/sbin/umount			/sbin
-scripts/sbin/swapon			/sbin
-scripts/sbin/swapoff			/sbin
 
+build-tree/src/sbin/dmesg/dmesg				/bin
+build-tree/src/sbin/swapon/swapon			/sbin
 build-tree/src/sbin/mdconfig/mdconfig			/sbin
 build-tree/src/sbin/mount_std/mount_std			/sbin
 build-tree/src/sbin/mount_autofs/mount_autofs		/sbin

Modified: trunk/freebsd-utils/debian/links
===================================================================
--- trunk/freebsd-utils/debian/links	2006-03-30 14:05:31 UTC (rev 1411)
+++ trunk/freebsd-utils/debian/links	2006-03-30 14:12:58 UTC (rev 1412)
@@ -6,4 +6,5 @@
 /sbin/mount_ext2fs	/sbin/mount_ext2
 /sbin/mount_ext2fs	/sbin/mount_ext3
 
-/lib/freebsd/swapon	/bin/swapctl
+/sbin/swapon		/sbin/swapoff
+/sbin/swapon		/bin/swapctl

Added: trunk/freebsd-utils/debian/patches/006_debian_cli_compat_options.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/006_debian_cli_compat_options.diff	2006-03-30 14:05:31 UTC (rev 1411)
+++ trunk/freebsd-utils/debian/patches/006_debian_cli_compat_options.diff	2006-03-30 14:12:58 UTC (rev 1412)
@@ -0,0 +1,41 @@
+--- src/sbin/dmesg/dmesg.c~	2006-03-30 12:40:23.000000000 +0200
++++ src/sbin/dmesg/dmesg.c	2006-03-30 12:41:26.000000000 +0200
+@@ -82,7 +82,7 @@
+ 	all = 0;
+ 	(void) setlocale(LC_CTYPE, "");
+ 	memf = nlistf = NULL;
+-	while ((ch = getopt(argc, argv, "aM:N:")) != -1)
++	while ((ch = getopt(argc, argv, "aM:N:s:n:")) != -1)
+ 		switch(ch) {
+ 		case 'a':
+ 			all++;
+@@ -93,6 +93,9 @@
+ 		case 'N':
+ 			nlistf = optarg;
+ 			break;
++		case 's':
++		case 'n':
++			break;
+ 		case '?':
+ 		default:
+ 			usage();
+--- src/sbin/swapon/swapon.c~	2006-03-30 12:40:23.000000000 +0200
++++ src/sbin/swapon/swapon.c	2006-03-30 12:43:08.000000000 +0200
+@@ -80,7 +80,7 @@
+ 	orig_prog = which_prog;
+ 	
+ 	doall = 0;
+-	while ((ch = getopt(argc, argv, "AadlhksU")) != -1) {
++	while ((ch = getopt(argc, argv, "AadlhksUv")) != -1) {
+ 		switch(ch) {
+ 		case 'A':
+ 			if (which_prog == SWAPCTL) {
+@@ -122,6 +122,8 @@
+ 				usage();
+ 			}
+ 			break;
++		case 'v':
++			break;
+ 		case '?':
+ 		default:
+ 			usage();

Deleted: trunk/freebsd-utils/scripts/bin/dmesg
===================================================================
--- trunk/freebsd-utils/scripts/bin/dmesg	2006-03-30 14:05:31 UTC (rev 1411)
+++ trunk/freebsd-utils/scripts/bin/dmesg	2006-03-30 14:12:58 UTC (rev 1412)
@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-
-args=""
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -s|-n) shift ;;
-    *)  if [ -n "${args}" ] ; then args="${args} $1" ; else args="$1" ; fi ;;
-  esac
-  shift
-done
-
-exec -a dmesg /lib/freebsd/dmesg ${args}

Deleted: trunk/freebsd-utils/scripts/sbin/swapoff
===================================================================
--- trunk/freebsd-utils/scripts/sbin/swapoff	2006-03-30 14:05:31 UTC (rev 1411)
+++ trunk/freebsd-utils/scripts/sbin/swapoff	2006-03-30 14:12:58 UTC (rev 1412)
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-
-args=""
-verbose=false
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -v) verbose=true ;;
-    *)  if [ -n "${args}" ] ; then args="${args} $1" ; else args="$1" ; fi ;;
-  esac
-  shift
-done
-
-if ! ${verbose} ; then
-  exec >/dev/null
-fi
-
-exec -a swapoff /lib/freebsd/swapon ${args}

Deleted: trunk/freebsd-utils/scripts/sbin/swapon
===================================================================
--- trunk/freebsd-utils/scripts/sbin/swapon	2006-03-30 14:05:31 UTC (rev 1411)
+++ trunk/freebsd-utils/scripts/sbin/swapon	2006-03-30 14:12:58 UTC (rev 1412)
@@ -1,19 +0,0 @@
-#!/bin/sh
-set -e
-
-args=""
-verbose=false
-while [ $# -gt 0 ]; do
-  case "$1" in
-    -v) verbose=true ;;
-    -e) ;;
-    *)  if [ -n "${args}" ] ; then args="${args} $1" ; else args="$1" ; fi ;;
-  esac
-  shift
-done
-
-if ! ${verbose} ; then
-  exec >/dev/null
-fi
-
-exec -a swapon /lib/freebsd/swapon ${args}