[Glibc-bsd-commits] r1352 - in trunk/freebsd-utils: . debian
scripts/bin scripts/sbin
Robert Millan
rmh at costa.debian.org
Sat Mar 18 15:48:55 UTC 2006
Author: rmh
Date: 2006-03-18 15:48:45 +0000 (Sat, 18 Mar 2006)
New Revision: 1352
Added:
trunk/freebsd-utils/debian/install
trunk/freebsd-utils/scripts/bin/mount
trunk/freebsd-utils/scripts/sbin/umount
Removed:
trunk/freebsd-utils/scripts/bin/umount
trunk/freebsd-utils/scripts/sbin/mount
Modified:
trunk/freebsd-utils/debian/control
trunk/freebsd-utils/debian/dirs
trunk/freebsd-utils/debian/rules
trunk/freebsd-utils/fetch
trunk/freebsd-utils/scripts/bin/dmesg
trunk/freebsd-utils/scripts/bin/sysctl
trunk/freebsd-utils/scripts/sbin/swapoff
trunk/freebsd-utils/scripts/sbin/swapon
Log:
Move freebsd legacy utils to /lib/freebsd. Install wrappers in /bin|/sbin.
Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/debian/control 2006-03-18 15:48:45 UTC (rev 1352)
@@ -9,6 +9,6 @@
Package: freebsd-utils
Architecture: kfreebsd-i386 kfreebsd-amd64
Essential: yes
-Depends: ufsutils, kldutils
+Depends: ufsutils, kldutils, freebsd-hackedutils
Description: FreeBSD utilities needed for GNU/kFreeBSD.
FreeBSD utilities needed for GNU/kFreeBSD.
Modified: trunk/freebsd-utils/debian/dirs
===================================================================
--- trunk/freebsd-utils/debian/dirs 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/debian/dirs 2006-03-18 15:48:45 UTC (rev 1352)
@@ -1 +1 @@
-usr/share/man/man8
+lib/freebsd
Added: trunk/freebsd-utils/debian/install
===================================================================
--- trunk/freebsd-utils/debian/install 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/debian/install 2006-03-18 15:48:45 UTC (rev 1352)
@@ -0,0 +1,11 @@
+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
Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/debian/rules 2006-03-18 15:48:45 UTC (rev 1352)
@@ -30,11 +30,6 @@
$(PMAKE) -C $(DEB_SRCDIR)/$$i ; \
done
-binary/$(package):: common-install-prehook-arch
- set -e ; for i in $(dirs) ; do \
- $(PMAKE) -C $(DEB_SRCDIR)/$$i install ; \
- done
-
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/tarball.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
Modified: trunk/freebsd-utils/fetch
===================================================================
--- trunk/freebsd-utils/fetch 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/fetch 2006-03-18 15:48:45 UTC (rev 1352)
@@ -14,7 +14,9 @@
for i in \
src/sbin/dmesg \
- src/sbin/{,u}mount src/usr.sbin/rpc.umntall \
+ src/sbin/mount \
+ src/sbin/mount_linprocfs \
+ src/usr.sbin/rpc.umntall \
src/sbin/swapon \
src/sbin/sysctl \
; do
Modified: trunk/freebsd-utils/scripts/bin/dmesg
===================================================================
--- trunk/freebsd-utils/scripts/bin/dmesg 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/scripts/bin/dmesg 2006-03-18 15:48:45 UTC (rev 1352)
@@ -10,4 +10,4 @@
shift
done
-exec -a dmesg dmesg.real ${args}
+exec -a dmesg /lib/freebsd/dmesg ${args}
Copied: trunk/freebsd-utils/scripts/bin/mount (from rev 1341, trunk/freebsd-utils/scripts/sbin/mount)
===================================================================
--- trunk/freebsd-utils/scripts/sbin/mount 2006-03-18 11:19:47 UTC (rev 1341)
+++ trunk/freebsd-utils/scripts/bin/mount 2006-03-18 15:48:45 UTC (rev 1352)
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+args=""
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -n) ;;
+ *) if [ -n "${args}" ] ; then args="${args} $1" ; else args="$1" ; fi ;;
+ esac
+ shift
+done
+
+args=`echo ${args} | sed -e "s/ remount,/ /g" -e "s/,remount,/,/g" \
+ -e "s/,remount / /g" -e "s/-o remount / /g"`
+
+exec -a mount /lib/freebsd/mount ${args}
Modified: trunk/freebsd-utils/scripts/bin/sysctl
===================================================================
--- trunk/freebsd-utils/scripts/bin/sysctl 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/scripts/bin/sysctl 2006-03-18 15:48:45 UTC (rev 1352)
@@ -19,13 +19,13 @@
sed /etc/sysctl.conf -e "s/\( \|\t\)*//g" -e "/^#/d" -e "/^$/d" \
| (while read i ; do sysctl.real ${args} ${i} >/dev/null ; done)
else
- sysctl.real ${args} >/dev/null
+ /lib/freebsd/sysctl ${args} >/dev/null
fi
else
if ${use_sysctl_conf} ; then
sed /etc/sysctl.conf -e "s/\( \|\t\)*//g" -e "/^#/d" -e "/^$/d" \
| (while read i ; do sysctl.real ${args} ${i} ; done)
else
- exec -a sysctl sysctl.real ${args}
+ exec -a sysctl /lib/freebsd/sysctl ${args}
fi
fi
Deleted: trunk/freebsd-utils/scripts/bin/umount
===================================================================
--- trunk/freebsd-utils/scripts/bin/umount 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/scripts/bin/umount 2006-03-18 15:48:45 UTC (rev 1352)
@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-
-args=""
-dirs=""
-remount_readonly=false
-
-while [ $# -gt 0 ]; do
- case "$1" in
- -d|-l) ;;
- -r) remount_readonly=true ;;
- -*) if [ -n "${args}" ] ; then args="${args} $1" ; else args="$1" ; fi ;;
- *) dirs="${dirs} $1" ;;
- esac
- shift
-done
-
-for i in ${dirs} ; do
- if ! umount.real ${args} ${i} && ${remount_readonly} ; then
- mount.real -o ro ${i}
- fi
-done
Deleted: trunk/freebsd-utils/scripts/sbin/mount
===================================================================
--- trunk/freebsd-utils/scripts/sbin/mount 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/scripts/sbin/mount 2006-03-18 15:48:45 UTC (rev 1352)
@@ -1,16 +0,0 @@
-#!/bin/sh
-set -e
-
-args=""
-while [ $# -gt 0 ]; do
- case "$1" in
- -n) ;;
- *) if [ -n "${args}" ] ; then args="${args} $1" ; else args="$1" ; fi ;;
- esac
- shift
-done
-
-args=`echo ${args} | sed -e "s/ remount,/ /g" -e "s/,remount,/,/g" \
- -e "s/,remount / /g" -e "s/-o remount / /g"`
-
-exec -a mount mount.real ${args}
Modified: trunk/freebsd-utils/scripts/sbin/swapoff
===================================================================
--- trunk/freebsd-utils/scripts/sbin/swapoff 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/scripts/sbin/swapoff 2006-03-18 15:48:45 UTC (rev 1352)
@@ -15,4 +15,4 @@
exec >/dev/null
fi
-exec -a swapoff swapoff.real ${args}
+exec -a swapoff /lib/freebsd/swapon ${args}
Modified: trunk/freebsd-utils/scripts/sbin/swapon
===================================================================
--- trunk/freebsd-utils/scripts/sbin/swapon 2006-03-18 15:04:42 UTC (rev 1351)
+++ trunk/freebsd-utils/scripts/sbin/swapon 2006-03-18 15:48:45 UTC (rev 1352)
@@ -16,4 +16,4 @@
exec >/dev/null
fi
-exec -a swapon swapon.real ${args}
+exec -a swapon /lib/freebsd/swapon ${args}
Copied: trunk/freebsd-utils/scripts/sbin/umount (from rev 1341, trunk/freebsd-utils/scripts/bin/umount)
===================================================================
--- trunk/freebsd-utils/scripts/bin/umount 2006-03-18 11:19:47 UTC (rev 1341)
+++ trunk/freebsd-utils/scripts/sbin/umount 2006-03-18 15:48:45 UTC (rev 1352)
@@ -0,0 +1,22 @@
+#!/bin/sh
+set -e
+
+args=""
+dirs=""
+remount_readonly=false
+
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -d|-l) ;;
+ -r) remount_readonly=true ;;
+ -*) if [ -n "${args}" ] ; then args="${args} $1" ; else args="$1" ; fi ;;
+ *) dirs="${dirs} $1" ;;
+ esac
+ shift
+done
+
+for i in ${dirs} ; do
+ if ! /lib/freebsd/umount ${args} ${i} && ${remount_readonly} ; then
+ /lib/freebsd/mount -o ro ${i}
+ fi
+done
More information about the Glibc-bsd-commits
mailing list