Subversion Repositories svn LFS-FR

Compare Revisions

Ignore whitespace Rev 706 → Rev 707

/trunk/lfs/bootscripts/contrib/lsb-v3/init.d/console
78,19 → 78,6
loadkeys ${KEYMAP_CORRECTIONS} >/dev/null 2>&1 ||
failed=1
 
# Linux kernel generates wrong bytes when composing
# in Unicode mode. That's why we disable dead keys in Unicode
# mode by default. If you need them, download and apply
# http://www.linuxfromscratch.org/~alexander/patches/linux-2.6.12.5-utf8_input-2.patch
# After patching, add "-m charset_of_your_keymap" to the FONT
# variable and set BROKEN_COMPOSE=false
# in /etc/sysconfig/console
 
[ -n "$BROKEN_COMPOSE" ] || BROKEN_COMPOSE="$UNICODE"
! is_true "$BROKEN_COMPOSE" ||
echo "" | loadkeys -c >/dev/null 2>&1 ||
failed=1
# Convert the keymap from $LEGACY_CHARSET to UTF-8
[ -z "$LEGACY_CHARSET" ] ||
dumpkeys -c "$LEGACY_CHARSET" |
/trunk/lfs/bootscripts/contrib/lsb-v3/ChangeLog
1,4 → 1,7
ChangeLog
20081023 - [dj] * Removed BROKEN_COMPOSE handling in console script because
kernel patch was accepted upstream.
 
20080908 - [dj] * Corrected echo command in rc script - Thanks to
Michael Tremer at IPFire.
 
/trunk/lfs/bootscripts/lfs/init.d/console
76,19 → 76,6
loadkeys ${KEYMAP_CORRECTIONS} >/dev/null 2>&1 ||
failed=1
 
# Linux kernel generates wrong bytes when composing
# in Unicode mode. That's why we disable dead keys in Unicode
# mode by default. If you need them, download and apply
# http://www.linuxfromscratch.org/~alexander/patches/linux-2.6.12.5-utf8_input-2.patch
# After patching, add "-m charset_of_your_keymap" to the FONT
# variable and set BROKEN_COMPOSE=false
# in /etc/sysconfig/console
 
[ -n "$BROKEN_COMPOSE" ] || BROKEN_COMPOSE="$UNICODE"
! is_true "$BROKEN_COMPOSE" ||
echo "" | loadkeys -c >/dev/null 2>&1 ||
failed=1
# Convert the keymap from $LEGACY_CHARSET to UTF-8
[ -z "$LEGACY_CHARSET" ] ||
dumpkeys -c "$LEGACY_CHARSET" |
/trunk/lfs/bootscripts/lfs/init.d/functions
291,6 → 291,12
pidofproc -s -p "${pidfile}" "${1}"
fi
 
# Warn about stale pid file
if [ "$?" = 1 ]; then
boot_mesg -n "Removing stale pid file: ${pidfile}. " ${WARNING}
rm -f "${pidfile}"
fi
 
if [ -n "${pidlist}" ]; then
for pid in ${pidlist}
do
504,7 → 510,7
# warning in stdout
# return 4 - Program or service status is unknown
#
# Dependencies: nice
# Dependencies: nice, rm
#
# Todo: LSB says this should be called start_daemon
# LSB does not say that it should call evaluate_retval
567,8 → 573,8
return 0 # 4
;;
1)
log_warning_msg "Unable to continue: ${pidfile} exists"
return 0 # 4
boot_mesg "Removing stale pid file: ${pidfile}" ${WARNING}
rm -f "${pidfile}"
;;
3)
;;
598,7 → 604,7
# warning in stdout
# return 4 - Unknown Status
#
# Dependencies: kill
# Dependencies: kill, rm
#
# Todo: LSB does not say that it should call evaluate_retval
# It checks for PIDFILE, which is deprecated.
648,6 → 654,12
pidofproc -s -p "${pidfile}" "${1}"
fi
 
# Remove stale pidfile
if [ "$?" = 1 ]; then
boot_mesg "Removing stale pid file: ${pidfile}." ${WARNING}
rm -f "${pidfile}"
fi
 
# If running, send the signal
if [ -n "${pidlist}" ]; then
for pid in ${pidlist}
/trunk/lfs/bootscripts/lfs/init.d/cleanfs
80,11 → 80,11
 
boot_mesg -n " /var/lock" ${NORMAL}
cd /var/lock &&
find . -type f ! -newer /proc -exec rm -f {} \; || failed=1
find . -type f -exec rm -f {} \; || failed=1
 
boot_mesg " /var/run" ${NORMAL}
cd /var/run &&
find . ! -type d ! -name utmp ! -newer /proc \
find . ! -type d ! -name utmp \
-exec rm -f {} \; || failed=1
> /var/run/utmp
if grep -q '^utmp:' /etc/group ; then
/trunk/lfs/bootscripts/ChangeLog
1,7 → 1,24
2008-10-27 DJ Lucas <dj@linuxfromscratch.org>
* lfs/init.d/cleanfs: Removed '! -newer /proc' from find commands in
check for stale files in /var/lock and /var/run.
* Makefile: Reversed cleanfs and udev_retry scripts so that cleanfs
runs immediately after mountfs.
 
2008-10-26 Dan Nicholson <dnicholson@linuxfromscratch.org>
* lfs/init.d/functions: Remove stale pid files when encountered
in loadproc/killproc/reloadproc. When the bootscript specifies
a pid file to use with the "-p pidfile" argument, *proc
functions previously bailed out when the referenced file
contains an invalid pid.
 
2008-10-23 DJ Lucas <dj@linuxfromscratch.org>
* lfs/init.d/console: Removed BROKEN_COMPOSE as kernel patch has
been accepted upstream.
 
2008-05-21 Bryan Kadzban <bryan@linuxfromscratch.org>
* lfs/init.d/udev, lfs/init.d/udev_retry: Use new udevadm program.
 
2007-08-20 DJ Lucas <dj@linuxfromscratch.org>
2007-08-20 DJ Lucas <dj@linuxfromscratch.org>
* lfs/init.d/setclock: Added missing 'stop' argument to usage text
 
2007-08-13 Dan Nicholson <dnicholson@linuxfromscratch.org>
96,7 → 113,8
n/a - June 2, 2006
* Removed console config file and makefile targets.
* Removed references to /dev/bug and bugreport in udevand
udev_retry bootscripts. (DJ Lucas)
udev_retry bootscripts. (DJ Lucas)
 
n/a - April 17, 2006
* Updated udev script to use the new udevsettle program.
* Added udev_retry script for systems that have /usr on a different
104,26 → 122,26
 
n/a - April 15, 2006
* Cleaned up contrib directory. Removed: contrib/init.d,
contrib/enhanced, contrib/livecd, contrib/hotplug, and raq2
contrib/enhanced, contrib/livecd, contrib/hotplug, and raq2
patch. (DJ Lucas)
 
n/a - April 14, 2006
* Merged changes from udev_update branch (DJ Lucas)
* Merged changes from udev_update branch (DJ Lucas)
* Replaced a return with an exit and reversed comment changes in
udev bootscript. (Dan Nicholson)
udev bootscript. (Dan Nicholson)
* Replaced walk_sysfs function in udev bootscript with new udevtrigger
program and move wait_for_uevents function inline. (DJ Lucas)
program and move wait_for_uevents function inline. (DJ Lucas)
* Removed extra evaluate_retval in udev bootscript. (Ken Moffat)
* Wait for uevents to be processed in the udev script. See ticket #1720
for details. (Matthew Burgess)
* Wait for uevents to be processed in the udev script. See ticket
#1720 for details. (Matthew Burgess)
 
n/a - March 21, 2006
* Removed old references to boot_log function and arguments passed
to boot_mesg_flush in echo_* functions. (DJ Lucas)
* Removed old references to boot_log function and arguments passed
to boot_mesg_flush in echo_* functions. (DJ Lucas)
 
n/a - March 10, 2006
* Moved src argument to ipv4-static-route service script and
removed from ipv4-static service script. (DJ Lucas)
removed from ipv4-static service script. (DJ Lucas)
 
n/a - March 8. 2006
* Correct sourced path in checkfs script. (Matthew Burgess)
283,7 → 301,8
related to boot_mesg changes (DJ Lucas, Alexander Patrakov)
* syslog-ng is now installed by default (Jeremy Utley)
* hotplug is now installed by default (Jeremy Utley)
* udev now uses /sbin/hotplug as the default hotplug handler (Nathan Coulson)
* udev now uses /sbin/hotplug as the default hotplug handler
(Nathan Coulson)
* udev now mounts a tmpfs instead of a ramfs onto /dev,
as suggested by Greg K-H (Nathan Coulson)
* Created contrib/lsb, and added a LSB compliant functions file
350,8 → 369,8
* All scriptes have been converted to use boot_mesg
 
n/a - September 21, 2004
* boot_mesg has been enhanced. Subsequent calls will overwrite previous
text, and it will wrap text basedupon the variable ${WCOL}.
* boot_mesg has been enhanced. Subsequent calls will overwrite
previous text, and it will wrap text basedupon the variable ${WCOL}.
(James Robertson)
* Fixed mtu optional service typo (Kevin P Fleming)
* Added SOURCE variable to ipv4-static-route (Kevin P Fleming)
802,7 → 821,7
* Fixed network shutdown script
* Fixed Makefile rc.6 to reboot
* Added -s flag to grep command in rc.d/init.d/network -
suppresses an error if no ifconfig.* files exist
suppresses an error if no ifconfig.* files exist
 
n/a - January 30, 2004:
 
823,8 → 842,8
n/a - January 30, 2004:
 
* New maintainers for the lfs-bootscripts package are:
Jeremy Utley (jeremy@linuxfromscratch.org)
Nathan Coulson (nathan@linuxfromscratch.org)
Jeremy Utley (jeremy@linuxfromscratch.org)
Nathan Coulson (nathan@linuxfromscratch.org)
 
1.11 - February 3rd, 2003:
 
834,7 → 853,7
1.10 - September 12th, 2002:
 
* Fixed up checkfs to work with non-ext2 filesystems too (such as
minix).
minix).
 
1.9 - April 5th, 2002:
 
880,9 → 899,9
1.6 - February 26th, 2002:
 
* replaced -o %PPID with -o $PPID throughout the functions script. This
construct does what it's supposed to do (don't take PPID into account
because this would fail if a running daemon and the bootscript have
the same name).
construct does what it's supposed to do (don't take PPID into account
because this would fail if a running daemon and the bootscript have
the same name).
 
* added 'restart' to the swap script
 
910,7 → 929,7
variable is set
 
* removed the emptying of /etc/mtab since it's a symlink to
/proc/mounts now
/proc/mounts now
 
* added the mountproc script which mounts the proc system. This is done
because we need proc mounted even before the mountfs script is ran
/trunk/lfs/bootscripts/Makefile
75,8 → 75,8
ln -sf ../init.d/setclock ${EXTDIR}/rc.d/rcsysinit.d/S25setclock
ln -sf ../init.d/checkfs ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
ln -sf ../init.d/udev_retry ${EXTDIR}/rc.d/rcsysinit.d/S45udev_retry
ln -sf ../init.d/cleanfs ${EXTDIR}/rc.d/rcsysinit.d/S50cleanfs
ln -sf ../init.d/cleanfs ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs
ln -sf ../init.d/udev_retry ${EXTDIR}/rc.d/rcsysinit.d/S50udev_retry
ln -sf ../init.d/console ${EXTDIR}/rc.d/rcsysinit.d/S70console
ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rcsysinit.d/S80localnet
ln -sf ../init.d/sysctl ${EXTDIR}/rc.d/rcsysinit.d/S90sysctl
126,7 → 126,7
ln -sf ../init.d/setclock ${EXTDIR}/rc.d/rcsysinit.d/S25setclock
ln -sf ../init.d/checkfs ${EXTDIR}/rc.d/rcsysinit.d/S30checkfs
ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rcsysinit.d/S40mountfs
ln -sf ../init.d/cleanfs ${EXTDIR}/rc.d/rcsysinit.d/S50cleanfs
ln -sf ../init.d/cleanfs ${EXTDIR}/rc.d/rcsysinit.d/S45cleanfs
if [ ! -f ${EXTDIR}/sysconfig/rc ]; then install -m ${CONFMODE} lfs/sysconfig/rc ${EXTDIR}/sysconfig/; fi
 
.PHONY: all create-dirs create-service-dir \