[Pkg-sysvinit-commits] r479 - in sysvinit/trunk/debian/initscripts:
etc/init.d lib/init
Thomas Hood
jdthood-guest at costa.debian.org
Sun Jan 1 20:35:44 UTC 2006
Author: jdthood-guest
Date: 2006-01-01 20:35:43 +0000 (Sun, 01 Jan 2006)
New Revision: 479
Modified:
sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs
sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
sysvinit/trunk/debian/initscripts/lib/init/functions.sh
Log:
Add prefix to init library sh functions
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs 2006-01-01 20:32:08 UTC (rev 478)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs 2006-01-01 20:35:43 UTC (rev 479)
@@ -40,7 +40,7 @@
#
SHM_OPT=
[ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT="-osize=$SHM_SIZE"
- init_domount tmpfs shmfs /dev/shm $SHM_OPT
+ initfunc_domount tmpfs shmfs /dev/shm $SHM_OPT
#
# Mount /dev/pts. Create master ptmx node if needed.
@@ -75,7 +75,7 @@
log_warning_msg "Failed making node /dev/ptmx with error code ${ES}."
fi
fi
- init_domount devpts "" /dev/pts -ogid=$TTYGRP,mode=$TTYMODE
+ initfunc_domount devpts "" /dev/pts -ogid=$TTYGRP,mode=$TTYMODE
fi
fi
}
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2006-01-01 20:32:08 UTC (rev 478)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs 2006-01-01 20:35:43 UTC (rev 479)
@@ -63,7 +63,7 @@
#
# Mount proc filesystem on /proc
#
- init_domount proc "" /proc
+ initfunc_domount proc "" /proc
#
# Mount sysfs on /sys
@@ -71,7 +71,7 @@
# Only mount sysfs if it is supported (kernel >= 2.6)
if grep -E -qs "sysfs\$" /proc/filesystems
then
- init_domount sysfs "" /sys
+ initfunc_domount sysfs "" /sys
fi
#
@@ -86,7 +86,7 @@
#
if [ -d /proc/bus/usb ]
then
- init_domount usbfs usbdevfs /proc/bus/usb
+ initfunc_domount usbfs usbdevfs /proc/bus/usb
fi
}
Modified: sysvinit/trunk/debian/initscripts/lib/init/functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/functions.sh 2006-01-01 20:32:08 UTC (rev 478)
+++ sysvinit/trunk/debian/initscripts/lib/init/functions.sh 2006-01-01 20:35:43 UTC (rev 479)
@@ -8,7 +8,7 @@
# Sourcer must also source /lib/lsb/init-functions.sh
# $1: directory
-is_empty_dir() {
+initfunc_is_empty_dir() {
for FILE in $1/* $1/.*
do
case "$FILE" in
@@ -21,12 +21,11 @@
}
-
# $1: file system type
# $2: alternative file system type (or empty string if none)
# $3: mount point
# $4 and up: extra mount program options
-init_domount () {
+initfunc_domount () {
MTPT="$3"
KERNEL="$(uname -s)"
# Figure out filesystem type
@@ -98,7 +97,7 @@
mount -f -t $FSTYPE $OPTS $4 $FSTYPE $MTPT
fi
else
- is_empty_dir "$MTPT" >/dev/null 2>&1 || log_warning_msg "Files under mount point '$MTPT' will be hidden."
+ initfunc_is_empty_dir "$MTPT" >/dev/null 2>&1 || log_warning_msg "Files under mount point '$MTPT' will be hidden."
mount $MOUNT_N -t $FSTYPE $OPTS $4 $FSTYPE $MTPT
fi
}
More information about the Pkg-sysvinit-commits
mailing list