source: patches/bootscripts-cross-lfs-2.1-pre1-updates-1.patch@ 241eded2

bootscripts-cross-lfs-2.1-pre1

@@ -118 +118 @@
         if [ ! -f ${EXTDIR}/sysconfig/i18n        ]; then install -m ${CONFMODE} clfs/sysconfig/i18n        ${EXTDIR}/sysconfig/; fi
         if [ ! -f ${EXTDIR}/sysconfig/modules     ]; then install -m ${CONFMODE} clfs/sysconfig/modules     ${EXTDIR}/sysconfig/; fi
         if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} clfs/sysconfig/rc          ${EXTDIR}/sysconfig/; fi
-        @$(MAKE) mknod_devices
 
 install-network: create-dirs create-service-dir
 
@@ -138 +137 @@
 install-service-mtu: create-service-dir
         install -m ${MODE} contrib/sysconfig/network-devices/services/mtu ${EXTDIR}/sysconfig/network-devices/services
 
-install-minimal: create-dirs create-service-dir udev_device_dirs udev_device_links
+install-minimal: create-dirs create-service-dir
         sed -e 's|/bin:/usr/bin:/sbin:/usr/sbin|/tools/bin:/tools/sbin:/bin:/sbin|g' clfs/init.d/functions > clfs/init.d/functions.minimal
         install -m ${MODE} clfs/init.d/checkfs                  ${EXTDIR}/rc.d/init.d/
         install -m ${MODE} clfs/init.d/cleanfs                  ${EXTDIR}/rc.d/init.d/
@@ -170 +169 @@
         ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
         if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} clfs/sysconfig/rc          ${EXTDIR}/sysconfig/; fi
         if [ ! -f ${EXTDIR}/sysconfig/createfiles ]; then install -m ${CONFMODE} clfs/sysconfig/createfiles ${EXTDIR}/sysconfig/; fi
-        @$(MAKE) mknod_devices
 
 install-raq2: create-dirs
         install -m ${MODE} clfs/init.d/paneld        ${EXTDIR}/rc.d/init.d/

bootscripts-cross-lfs-2.1-pre1

@@ -25 +25 @@
 #
 #########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 # Function to create files/directory on boot.
 create_files() {
         # Read in the configuration file.
-        exec 9>&0 < /etc/sysconfig/createfiles
+        exec 9>&0 < /tools/etc/sysconfig/createfiles
                 while read name type perm usr grp dtype maj min junk
                 do
 
@@ -87 +87 @@
                 (exit ${failed})
                 evaluate_retval
                 boot_mesg "" ${NORMAL}
-                if [ -e /etc/sysconfig/createfiles ]; then
-                        if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
+                if [ -e /tools/etc/sysconfig/createfiles ]; then
+                        if egrep -qv '^(#|$)' /tools/etc/sysconfig/createfiles 2>/dev/null; then
                                 boot_mesg "Creating files and directories..."
                                 create_files
                                 evaluate_retval

bootscripts-cross-lfs-2.1-pre1

@@ -13 +13 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 # set the default loglevel
 LOGLEVEL=7
-if [ -r /etc/sysconfig/console ]; then
-        . /etc/sysconfig/console
+if [ -r /tools/etc/sysconfig/console ]; then
+        . /tools/etc/sysconfig/console
 fi
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -13 +13 @@
 #
 ########################################################################
 
-if [ -e /etc/sysconfig/lcd ]; then
+if [ -e /tools/etc/sysconfig/lcd ]; then
         if [ -e /dev/lcd ]; then
-                source /etc/sysconfig/lcd
+                source /tools/etc/sysconfig/lcd
         fi
 fi
 
-if [ -e /etc/sysconfig/bootscripts ]; then
-        source /etc/sysconfig/bootscripts
+if [ -e /tools/etc/sysconfig/bootscripts ]; then
+        source /tools/etc/sysconfig/bootscripts
 fi
 
 ## Environmental setup

clfs/init.d/functions.minimal

@@ -13 +13 @@
 #
 ########################################################################
 
-if [ -e /etc/sysconfig/lcd ]; then
+if [ -e /tools/etc/sysconfig/lcd ]; then
         if [ -e /dev/lcd ]; then
-                source /etc/sysconfig/lcd
+                source /tools/etc/sysconfig/lcd
         fi
 fi
 
-if [ -e /etc/sysconfig/bootscripts ]; then
-        source /etc/sysconfig/bootscripts
+if [ -e /tools/etc/sysconfig/bootscripts ]; then
+        source /tools/etc/sysconfig/bootscripts
 fi
 
 ## Environmental setup

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
-if [ -f /etc/sysconfig/i18n ]; then
-        . /etc/sysconfig/i18n
+if [ -f /tools/etc/sysconfig/i18n ]; then
+        . /tools/etc/sysconfig/i18n
 fi
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
-. /etc/sysconfig/network
+. /tools/etc/sysconfig/network
 
 case "${1}" in
         start)

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 # Assure that the kernel has module support.
@@ -23 +23 @@
 
                 # Exit if there's no modules file or there are no
                 # valid entries
-                [ -r /etc/sysconfig/modules ] &&
-                        egrep -qv '^($|#)' /etc/sysconfig/modules ||
+                [ -r /tools/etc/sysconfig/modules ] &&
+                        egrep -qv '^($|#)' /tools/etc/sysconfig/modules ||
                         exit 0
 
                 boot_mesg -n "Loading modules:" ${INFO}
@@ -49 +49 @@
                         else
                                 failedmod="${failedmod} ${module}"
                         fi
-                done < /etc/sysconfig/modules
+                done < /tools/etc/sysconfig/modules
 
                 boot_mesg "" ${NORMAL}
                 # Print a message about successfully loaded

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -14 +14 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
-. /etc/sysconfig/network
+. /tools/etc/sysconfig/network
 
 case "${1}" in
         start)
@@ -70 +70 @@
                 ;;
 esac
 
-# End /etc/rc.d/init.d/network
+# End /tools/etc/rc.d/init.d/network

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . $rc_functions
 
 case "$1" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 # This sets a few default terminal options.

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
-. /etc/sysconfig/clock
+. /tools/etc/sysconfig/clock
 
 CLOCKPARAMS=
 

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . $rc_functions
 
 case "$1" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -14 +14 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -12 +12 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "${1}" in

bootscripts-cross-lfs-2.1-pre1

@@ -16 +16 @@
 #
 ########################################################################
 
-. /etc/sysconfig/rc
+. /tools/etc/sysconfig/rc
 . ${rc_functions}
 
 case "$1" in
@@ -25 +25 @@
 
         # start udevd
         boot_mesg "\nStarting udevd..."
-        /sbin/udevd --daemon
+        /tools/sbin/udevd --daemon
         evaluate_retval
 
         # start coldplugging
@@ -35 +35 @@
         #mkdir -p /run/.udev/queue
 
         # configure all devices
-        /sbin/udevadm trigger --action=add --type=subsystems
-        /sbin/udevadm trigger --action=add --type=devices
+        /tools/sbin/udevadm trigger --action=add --type=subsystems
+        /tools/sbin/udevadm trigger --action=add --type=devices
         
         # this replaces the old loop, exits after all devices are done
-        /sbin/udevadm settle
+        /tools/sbin/udevadm settle
 
         echo_ok
         ;;
 
     stop)
         boot_mesg "Stopping udevd..."
-        killproc /sbin/udevd
+        killproc /tools/sbin/udevd
         ;;
 
     restart)
         boot_mesg "Restarting udevd..."
-        killproc /sbin/udevd
-        loadproc /sbin/udevd --daemon
+        killproc /tools/sbin/udevd
+        loadproc /tools/sbin/udevd --daemon
         evaluate_retval
         ;;
 
     status)
-        statusproc /sbin/udevd
+        statusproc /tools/sbin/udevd
         ;;
 
     *)

bootscripts-cross-lfs-2.1-pre1

@@ -11 +11 @@
 #
 ########################################################################
 
-rc_base=/etc/rc.d
+rc_base=/tools/etc/rc.d
 rc_functions=${rc_base}/init.d/functions
 network_devices=/etc/sysconfig/network-devices