Author: jim
Date: 2006-06-29 17:45:45 -0600 (Thu, 29 Jun 2006)
New Revision: 1861

Added:
   trunk/bootscripts/lfs/sysconfig/bootscripts
Modified:
   /
   trunk/bootscripts/
   trunk/bootscripts/Changelog
   trunk/bootscripts/lfs/init.d/cleanfs
   trunk/bootscripts/lfs/init.d/functions
Log:
 [EMAIL PROTECTED] (orig r1939):  jim | 2006-06-29 16:00:45 -0700
  [EMAIL PROTECTED]:  jim | 2006-06-29 16:00:12 -0700
  Disable interactive Prompts. Added ccheck for /etc/sysconfig/createfiles.
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1938
   + b6734a72-470d-0410-b049-f317dca95413:/:1939


Property changes on: trunk/bootscripts
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/bootscripts:3512
3949c430-d905-0410-97b6-f115d20341b5:/bootscripts:1331
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/bootscripts:1109
   + 38c7b366-470d-0410-a457-935707c16d9b:/bootscripts:4177
3949c430-d905-0410-97b6-f115d20341b5:/bootscripts:1331
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/bootscripts:1109

Modified: trunk/bootscripts/Changelog
===================================================================
--- trunk/bootscripts/Changelog 2006-06-29 03:45:21 UTC (rev 1860)
+++ trunk/bootscripts/Changelog 2006-06-29 23:45:45 UTC (rev 1861)
@@ -1,3 +1,7 @@
+jim - June 29, 2006
+       * Disable interactive Prompts
+       * Added Check to see if /etc/sysconfig/createfiles is available
+
 jim - May 15, 2006
        * Hide all the output information from the LCD Program
        * Added support for 1 line LCD screens

Modified: trunk/bootscripts/lfs/init.d/cleanfs
===================================================================
--- trunk/bootscripts/lfs/init.d/cleanfs        2006-06-29 03:45:21 UTC (rev 
1860)
+++ trunk/bootscripts/lfs/init.d/cleanfs        2006-06-29 23:45:45 UTC (rev 
1861)
@@ -95,10 +95,12 @@
                (exit ${failed})
                evaluate_retval
 
-               if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; 
then
-                       boot_mesg "Creating files and directories..."
-                       create_files
-                       evaluate_retval
+               if [ -e /etc/sysconfig/createfiles ]; then
+                       if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 
2>/dev/null; then
+                               boot_mesg "Creating files and directories..."
+                               create_files
+                               evaluate_retval
+                       fi
                fi
                ;;
        *)

Modified: trunk/bootscripts/lfs/init.d/functions
===================================================================
--- trunk/bootscripts/lfs/init.d/functions      2006-06-29 03:45:21 UTC (rev 
1860)
+++ trunk/bootscripts/lfs/init.d/functions      2006-06-29 23:45:45 UTC (rev 
1861)
@@ -19,6 +19,10 @@
        fi
 fi
 
+if [ -e /etc/sysconfig/bootscripts ]; then
+       source /etc/sysconfig/bootscripts
+fi
+
 ## Environmental setup
 # Setup default values for environment
 umask 022
@@ -195,12 +199,14 @@
        boot_mesg -n " the LFS book, please be so kind to inform us at"
        boot_mesg " [EMAIL PROTECTED]"
        boot_mesg_flush
-       boot_mesg -n "Press Enter to continue..." ${INFO}
-       boot_mesg "" ${NORMAL}
-       if [ "$LCD_PROG" ]; then
-               sleep 10
-       else
-               read ENTER
+       if [ "$INTERACTIVE" ]; then
+               boot_mesg -n "Press Enter to continue..." ${INFO}
+               boot_mesg "" ${NORMAL}
+               if [ "$LCD_PROG" ]; then
+                       sleep 10
+               else
+                       read ENTER
+               fi
        fi
 }
 

Added: trunk/bootscripts/lfs/sysconfig/bootscripts
===================================================================
--- trunk/bootscripts/lfs/sysconfig/bootscripts                         (rev 0)
+++ trunk/bootscripts/lfs/sysconfig/bootscripts 2006-06-29 23:45:45 UTC (rev 
1861)
@@ -0,0 +1,19 @@
+########################################################################
+# Begin /etc/sysconfig/bootscripts
+#
+# Description : LCD Screen Control
+#
+# Authors     :
+#
+# Version     : 00.00
+#
+# Notes       : Controls different aspects of the bootscripts.
+#
+########################################################################
+
+# Enable/disable interactive Prompts
+# Enable       - INTERACTIVE=y
+# Disable      - INTERACTIVE=
+INTERACTIVE=y
+
+# End /etc/sysconfig/bootscripts

-- 
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to