Author: dj
Date: 2007-08-19 21:50:47 -0600 (Sun, 19 Aug 2007)
New Revision: 8322
Modified:
trunk/bootscripts/ChangeLog
trunk/bootscripts/contrib/lsb-v3/CHANGLOG
trunk/bootscripts/contrib/lsb-v3/init.d/checkfs
trunk/bootscripts/contrib/lsb-v3/init.d/modules
trunk/bootscripts/contrib/lsb-v3/init.d/setclock
trunk/bootscripts/lfs/init.d/setclock
Log:
lsb-v3 sync and text fix in setclock script
Modified: trunk/bootscripts/ChangeLog
===================================================================
--- trunk/bootscripts/ChangeLog 2007-08-15 02:19:18 UTC (rev 8321)
+++ trunk/bootscripts/ChangeLog 2007-08-20 03:50:47 UTC (rev 8322)
@@ -1,3 +1,6 @@
+2007-08-20 DJ Lucas <[EMAIL PROTECTED]>
+ * lfs/init.d/setclock: Added missing 'stop' argument to usage text
+
2007-08-13 Dan Nicholson <[EMAIL PROTECTED]>
* lfs/init.d/checkfs: Don't suppress error messages from the screen.
Modified: trunk/bootscripts/contrib/lsb-v3/CHANGLOG
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/CHANGLOG 2007-08-15 02:19:18 UTC (rev
8321)
+++ trunk/bootscripts/contrib/lsb-v3/CHANGLOG 2007-08-20 03:50:47 UTC (rev
8322)
@@ -1,3 +1,4 @@
+20070820 - [dj] * Synced with LFS-bootscripts
20070705 - [dj] * Synced with LFS-bootscripts
* Removed 'stty' from the environment setup as it breaks
custom key configs when run from the CLI.
Modified: trunk/bootscripts/contrib/lsb-v3/init.d/checkfs
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/init.d/checkfs 2007-08-15 02:19:18 UTC
(rev 8321)
+++ trunk/bootscripts/contrib/lsb-v3/init.d/checkfs 2007-08-20 03:50:47 UTC
(rev 8322)
@@ -52,7 +52,7 @@
# Note: -a option used to be -p; but this fails e.g.
# on fsck.minix
- fsck ${options} -a -A -C -T 2>/dev/null
+ fsck ${options} -a -A -C -T
error_value=${?}
if [ "${error_value}" = 0 ]
Modified: trunk/bootscripts/contrib/lsb-v3/init.d/modules
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/init.d/modules 2007-08-15 02:19:18 UTC
(rev 8321)
+++ trunk/bootscripts/contrib/lsb-v3/init.d/modules 2007-08-20 03:50:47 UTC
(rev 8322)
@@ -24,6 +24,12 @@
case "${1}" in
start)
+ # Exit if there's no modules file or there are no
+ # valid entries
+ [ -r /etc/sysconfig/modules ] &&
+ egrep -qv '^($|#)' /etc/sysconfig/modules ||
+ exit 0
+
# If proc is mounted, find the current kernel
# message level
if [ -f /proc/sys/kernel/printk ]; then
Modified: trunk/bootscripts/contrib/lsb-v3/init.d/setclock
===================================================================
--- trunk/bootscripts/contrib/lsb-v3/init.d/setclock 2007-08-15 02:19:18 UTC
(rev 8321)
+++ trunk/bootscripts/contrib/lsb-v3/init.d/setclock 2007-08-20 03:50:47 UTC
(rev 8322)
@@ -53,7 +53,7 @@
;;
*)
- echo "Usage: ${0} {start}"
+ echo "Usage: ${0} {start|stop}"
;;
esac
Modified: trunk/bootscripts/lfs/init.d/setclock
===================================================================
--- trunk/bootscripts/lfs/init.d/setclock 2007-08-15 02:19:18 UTC (rev
8321)
+++ trunk/bootscripts/lfs/init.d/setclock 2007-08-20 03:50:47 UTC (rev
8322)
@@ -43,7 +43,7 @@
;;
*)
- echo "Usage: ${0} {start}"
+ echo "Usage: ${0} {start|stop}"
;;
esac
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
