Ignore:
Timestamp:
May 17, 2014, 8:41:51 AM (11 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
3205da5
Parents:
b4badbd (diff), 156c0fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Fix conflicts with merge.

File:
1 moved

Legend:

Unmodified
Added
Removed

  • patches/bootscripts-cross-lfs-3.0-pre1-tools_updates-1.patch

    rb4badbd r1ab9a96  
    1 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/Makefile bootscripts-cross-lfs-2.1-pre1/Makefile
    2 --- bootscripts-cross-lfs-2.1-pre1.orig/Makefile        2014-04-12 13:37:45.000000000 -0400
    3 +++ bootscripts-cross-lfs-2.1-pre1/Makefile     2014-04-13 15:52:56.000000000 -0400
     1Submitted By: William Harrington (kb0iic at cross-lfs dot org)
     2Date: 2014-05-16
     3Initial Package Version: 3.1-pre1
     4Origin: Idea for cleaning up boot chapter by Chris Staub
     5Upstream Status: Not Applied - CLFS Specific
     6Description: Reduces ${CLFS}/ pollution by using ${CLFS}/tools as much as possible.
     7
     8diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/Makefile bootscripts-cross-lfs-3.0-pre1/Makefile
     9--- bootscripts-cross-lfs-3.0-pre1.orig/Makefile        2011-01-09 02:43:16.000000000 +0000
     10+++ bootscripts-cross-lfs-3.0-pre1/Makefile     2014-05-17 00:02:04.100001526 +0000
    411@@ -118,7 +118,6 @@
    512        if [ ! -f ${EXTDIR}/sysconfig/i18n        ]; then install -m ${CONFMODE} clfs/sysconfig/i18n        ${EXTDIR}/sysconfig/; fi
    … …  
    2734 install-raq2: create-dirs
    2835        install -m ${MODE} clfs/init.d/paneld        ${EXTDIR}/rc.d/init.d/
    29 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/checkfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/checkfs
    30 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/checkfs     2014-04-12 13:37:45.000000000 -0400
    31 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/checkfs  2014-04-13 15:53:20.000000000 -0400
     36diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/checkfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/checkfs
     37--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/checkfs     2009-07-07 01:39:12.000000000 +0000
     38+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/checkfs  2014-05-17 00:02:04.100001526 +0000
    3239@@ -25,7 +25,7 @@
    3340 #
    … …  
    3946 
    4047 case "${1}" in
    41 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/cleanfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/cleanfs
    42 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/cleanfs     2014-04-12 13:37:45.000000000 -0400
    43 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/cleanfs  2014-04-13 15:53:20.000000000 -0400
     48diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/cleanfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/cleanfs
     49--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/cleanfs     2012-09-05 02:21:09.000000000 +0000
     50+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/cleanfs  2014-05-17 00:02:04.100001526 +0000
    4451@@ -12,13 +12,13 @@
    4552 #
    … …  
    6976                                create_files
    7077                                evaluate_retval
    71 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/consolelog bootscripts-cross-lfs-2.1-pre1/clfs/init.d/consolelog
    72 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/consolelog  2014-04-12 13:37:45.000000000 -0400
    73 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/consolelog       2014-04-13 15:53:20.000000000 -0400
     78diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/consolelog bootscripts-cross-lfs-3.0-pre1/clfs/init.d/consolelog
     79--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/consolelog  2009-07-07 01:39:12.000000000 +0000
     80+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/consolelog       2014-05-17 00:02:04.100001526 +0000
    7481@@ -13,13 +13,13 @@
    7582 #
    … …  
    8996 
    9097 case "${1}" in
    91 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions
    92 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions   2014-04-12 13:37:45.000000000 -0400
    93 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions        2014-04-13 15:53:20.000000000 -0400
     98diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions
     99--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions   2009-07-07 01:39:12.000000000 +0000
     100+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions        2014-05-17 00:03:00.800003131 +0000
    94101@@ -13,14 +13,14 @@
    95102 #
    … …  
    111118 
    112119 ## Environmental setup
    113 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions.minimal bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions.minimal
    114 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/functions.minimal   2014-04-12 13:37:45.000000000 -0400
    115 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/functions.minimal        2014-04-13 15:53:20.000000000 -0400
     120@@ -54,7 +54,7 @@
     121 # If formatting is needed, $ECHO should be used
     122 case "`echo -e -n test`" in
     123        -[en]*)
     124-               ECHO=/bin/echo
     125+               ECHO=/tools/bin/echo
     126                ;;
     127        *)
     128                ECHO=echo
     129@@ -153,7 +153,7 @@
     130 boot_log()
     131 {
     132        if [ "$LOGGING" ]; then
     133-               /bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
     134+               /tools/bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
     135        else
     136                return 0
     137        fi
     138diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions.minimal bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions.minimal
     139--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/functions.minimal   2012-03-13 18:41:15.000000000 +0000
     140+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/functions.minimal        2014-05-17 00:03:59.963337110 +0000
    116141@@ -13,14 +13,14 @@
    117142 #
    … …  
    133158 
    134159 ## Environmental setup
    135 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/halt bootscripts-cross-lfs-2.1-pre1/clfs/init.d/halt
    136 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/halt        2014-04-12 13:37:45.000000000 -0400
    137 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/halt     2014-04-13 15:53:20.000000000 -0400
    138 @@ -12,7 +12,7 @@
    139  #
    140  ########################################################################
    141  
    142 -. /etc/sysconfig/rc
    143 +. /tools/etc/sysconfig/rc
    144  . ${rc_functions}
    145  
    146  case "${1}" in
    147 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/i18n bootscripts-cross-lfs-2.1-pre1/clfs/init.d/i18n
    148 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/i18n        2014-04-12 13:37:45.000000000 -0400
    149 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/i18n     2014-04-13 15:53:20.000000000 -0400
     160@@ -54,7 +54,7 @@
     161 # If formatting is needed, $ECHO should be used
     162 case "`echo -e -n test`" in
     163        -[en]*)
     164-               ECHO=/bin/echo
     165+               ECHO=/tools/bin/echo
     166                ;;
     167        *)
     168                ECHO=echo
     169@@ -153,7 +153,7 @@
     170 boot_log()
     171 {
     172        if [ "$LOGGING" ]; then
     173-               /bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
     174+               /tools/bin/logger -p local2.info -t bootlog "${DISPLAYLOG} ${1}"
     175        else
     176                return 0
     177        fi
     178diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/halt bootscripts-cross-lfs-3.0-pre1/clfs/init.d/halt
     179--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/halt        2009-07-07 01:39:12.000000000 +0000
     180+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/halt     2014-05-17 00:02:04.103335102 +0000
     181@@ -12,7 +12,7 @@
     182 #
     183 ########################################################################
     184 
     185-. /etc/sysconfig/rc
     186+. /tools/etc/sysconfig/rc
     187 . ${rc_functions}
     188 
     189 case "${1}" in
     190diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/i18n bootscripts-cross-lfs-3.0-pre1/clfs/init.d/i18n
     191--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/i18n        2009-07-07 01:39:12.000000000 +0000
     192+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/i18n     2014-05-17 00:02:04.103335102 +0000
    150193@@ -12,11 +12,11 @@
    151194 #
    … …  
    163206 
    164207 case "${1}" in
    165 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/localnet bootscripts-cross-lfs-2.1-pre1/clfs/init.d/localnet
    166 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/localnet    2014-04-12 13:37:45.000000000 -0400
    167 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/localnet 2014-04-13 15:53:20.000000000 -0400
     208diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/localnet bootscripts-cross-lfs-3.0-pre1/clfs/init.d/localnet
     209--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/localnet    2009-07-07 01:39:12.000000000 +0000
     210+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/localnet 2014-05-17 00:02:04.103335102 +0000
    168211@@ -12,9 +12,9 @@
    169212 #
    … …  
    178221 case "${1}" in
    179222        start)
    180 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/modules bootscripts-cross-lfs-2.1-pre1/clfs/init.d/modules
    181 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/modules     2014-04-12 13:37:45.000000000 -0400
    182 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/modules  2014-04-13 15:53:20.000000000 -0400
     223diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/modules bootscripts-cross-lfs-3.0-pre1/clfs/init.d/modules
     224--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/modules     2009-07-07 01:39:12.000000000 +0000
     225+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/modules  2014-05-17 00:02:04.103335102 +0000
    183226@@ -12,7 +12,7 @@
    184227 #
    … …  
    210253                boot_mesg "" ${NORMAL}
    211254                # Print a message about successfully loaded
    212 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountfs
    213 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountfs     2014-04-12 13:37:45.000000000 -0400
    214 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountfs  2014-04-13 15:53:20.000000000 -0400
    215 @@ -12,7 +12,7 @@
    216  #
    217  ########################################################################
    218  
    219 -. /etc/sysconfig/rc
    220 +. /tools/etc/sysconfig/rc
    221  . ${rc_functions}
    222  
    223  case "${1}" in
    224 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountkernfs bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountkernfs
    225 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/mountkernfs 2014-04-12 13:37:45.000000000 -0400
    226 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/mountkernfs      2014-04-13 15:53:20.000000000 -0400
    227 @@ -12,7 +12,7 @@
    228  #
    229  ########################################################################
    230  
    231 -. /etc/sysconfig/rc
    232 +. /tools/etc/sysconfig/rc
    233  . ${rc_functions}
    234  
    235  case "${1}" in
    236 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/network bootscripts-cross-lfs-2.1-pre1/clfs/init.d/network
    237 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/network     2014-04-12 13:37:45.000000000 -0400
    238 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/network  2014-04-13 15:53:20.000000000 -0400
     255diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountfs
     256--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountfs     2012-09-05 02:21:09.000000000 +0000
     257+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountfs  2014-05-17 00:02:34.460003607 +0000
     258@@ -12,7 +12,7 @@
     259 #
     260 ########################################################################
     261 
     262-. /etc/sysconfig/rc
     263+. /tools/etc/sysconfig/rc
     264 . ${rc_functions}
     265 
     266 case "${1}" in
     267@@ -24,16 +24,6 @@
     268                # Remove fsck-related file system watermarks.
     269                rm -f /fastboot /forcefsck
     270 
     271-               boot_mesg "Recording existing mounts in /etc/mtab..."
     272-               > /etc/mtab
     273-               mount -f / || failed=1
     274-               mount -f /proc || failed=1
     275-               mount -f /sys || failed=1
     276-               mount -f /run || failed=1
     277-               mount -f /dev || failed=1
     278-               (exit ${failed})
     279-               evaluate_retval
     280-
     281                # This will mount all filesystems that do not have _netdev in
     282                # their option list.  _netdev denotes a network filesystem.
     283                boot_mesg "Mounting remaining file systems..."
     284diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountkernfs bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountkernfs
     285--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/mountkernfs 2012-09-05 02:21:09.000000000 +0000
     286+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/mountkernfs      2014-05-17 00:02:04.103335102 +0000
     287@@ -12,7 +12,7 @@
     288 #
     289 ########################################################################
     290 
     291-. /etc/sysconfig/rc
     292+. /tools/etc/sysconfig/rc
     293 . ${rc_functions}
     294 
     295 case "${1}" in
     296diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/network bootscripts-cross-lfs-3.0-pre1/clfs/init.d/network
     297--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/network     2009-07-07 01:39:12.000000000 +0000
     298+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/network  2014-05-17 00:02:04.106668584 +0000
    239299@@ -14,9 +14,9 @@
    240300 #
    … …  
    255315-# End /etc/rc.d/init.d/network
    256316+# End /tools/etc/rc.d/init.d/network
    257 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/paneld bootscripts-cross-lfs-2.1-pre1/clfs/init.d/paneld
    258 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/paneld      2014-04-12 13:37:45.000000000 -0400
    259 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/paneld   2014-04-13 15:53:20.000000000 -0400
     317diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/paneld bootscripts-cross-lfs-3.0-pre1/clfs/init.d/paneld
     318--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/paneld      2009-07-07 01:39:12.000000000 +0000
     319+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/paneld   2014-05-17 00:02:04.106668584 +0000
    260320@@ -12,7 +12,7 @@
    261321 #
    … …  
    267327 
    268328 case "$1" in
    269 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rc bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rc
    270 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rc  2014-04-12 13:37:45.000000000 -0400
    271 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rc       2014-04-13 15:53:20.000000000 -0400
     329diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rc bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rc
     330--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rc  2009-07-07 01:39:12.000000000 +0000
     331+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rc       2014-05-17 00:02:04.106668584 +0000
    272332@@ -12,7 +12,7 @@
    273333 #
    … …  
    279339 
    280340 # This sets a few default terminal options.
    281 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/reboot bootscripts-cross-lfs-2.1-pre1/clfs/init.d/reboot
    282 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/reboot      2014-04-12 13:37:45.000000000 -0400
    283 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/reboot   2014-04-13 15:53:20.000000000 -0400
    284 @@ -12,7 +12,7 @@
    285  #
    286  ########################################################################
    287  
    288 -. /etc/sysconfig/rc
    289 +. /tools/etc/sysconfig/rc
    290  . ${rc_functions}
    291  
    292  case "${1}" in
    293 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rsyslog bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rsyslog
    294 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/rsyslog     2014-04-12 13:37:45.000000000 -0400
    295 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/rsyslog  2014-04-13 15:53:20.000000000 -0400
    296 @@ -12,7 +12,7 @@
    297  #
    298  ########################################################################
    299  
    300 -. /etc/sysconfig/rc
    301 +. /tools/etc/sysconfig/rc
    302  . ${rc_functions}
    303  
    304  case "${1}" in
    305 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sendsignals bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sendsignals
    306 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sendsignals 2014-04-12 13:37:45.000000000 -0400
    307 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sendsignals      2014-04-13 15:53:20.000000000 -0400
    308 @@ -12,7 +12,7 @@
    309  #
    310  ########################################################################
    311  
    312 -. /etc/sysconfig/rc
    313 +. /tools/etc/sysconfig/rc
    314  . ${rc_functions}
    315  
    316  case "${1}" in
    317 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setclock bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setclock
    318 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setclock    2014-04-12 13:37:45.000000000 -0400
    319 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setclock 2014-04-13 15:53:20.000000000 -0400
     341diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/reboot bootscripts-cross-lfs-3.0-pre1/clfs/init.d/reboot
     342--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/reboot      2009-07-07 01:39:12.000000000 +0000
     343+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/reboot   2014-05-17 00:02:04.106668584 +0000
     344@@ -12,7 +12,7 @@
     345 #
     346 ########################################################################
     347 
     348-. /etc/sysconfig/rc
     349+. /tools/etc/sysconfig/rc
     350 . ${rc_functions}
     351 
     352 case "${1}" in
     353diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rsyslog bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rsyslog
     354--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/rsyslog     2009-07-07 01:39:12.000000000 +0000
     355+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/rsyslog  2014-05-17 00:02:04.106668584 +0000
     356@@ -12,7 +12,7 @@
     357 #
     358 ########################################################################
     359 
     360-. /etc/sysconfig/rc
     361+. /tools/etc/sysconfig/rc
     362 . ${rc_functions}
     363 
     364 case "${1}" in
     365diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sendsignals bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sendsignals
     366--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sendsignals 2012-09-05 02:21:09.000000000 +0000
     367+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sendsignals      2014-05-17 00:02:04.110002078 +0000
     368@@ -12,7 +12,7 @@
     369 #
     370 ########################################################################
     371 
     372-. /etc/sysconfig/rc
     373+. /tools/etc/sysconfig/rc
     374 . ${rc_functions}
     375 
     376 case "${1}" in
     377diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setclock bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setclock
     378--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setclock    2009-07-07 01:39:12.000000000 +0000
     379+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setclock 2014-05-17 00:02:04.110002078 +0000
    320380@@ -12,9 +12,9 @@
    321381 #
    … …  
    330390 CLOCKPARAMS=
    331391 
    332 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setlcd bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setlcd
    333 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/setlcd      2014-04-12 13:37:45.000000000 -0400
    334 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setlcd   2014-04-13 15:53:20.000000000 -0400
     392diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setlcd bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setlcd
     393--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/setlcd      2009-07-07 01:39:12.000000000 +0000
     394+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/setlcd   2014-05-17 00:02:04.110002078 +0000
    335395@@ -12,7 +12,7 @@
    336396 #
    … …  
    342402 
    343403 case "$1" in
    344 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/swap bootscripts-cross-lfs-2.1-pre1/clfs/init.d/swap
    345 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/swap        2014-04-12 13:37:45.000000000 -0400
    346 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/swap     2014-04-13 15:53:20.000000000 -0400
    347 @@ -12,7 +12,7 @@
    348  #
    349  ########################################################################
    350  
    351 -. /etc/sysconfig/rc
    352 +. /tools/etc/sysconfig/rc
    353  . ${rc_functions}
    354  
    355  case "${1}" in
    356 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sysctl bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sysctl
    357 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/sysctl      2014-04-12 13:37:45.000000000 -0400
    358 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/sysctl   2014-04-13 15:53:20.000000000 -0400
     404diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/swap bootscripts-cross-lfs-3.0-pre1/clfs/init.d/swap
     405--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/swap        2009-07-07 01:39:12.000000000 +0000
     406+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/swap     2014-05-17 00:02:04.110002078 +0000
     407@@ -12,7 +12,7 @@
     408 #
     409 ########################################################################
     410 
     411-. /etc/sysconfig/rc
     412+. /tools/etc/sysconfig/rc
     413 . ${rc_functions}
     414 
     415 case "${1}" in
     416diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sysctl bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sysctl
     417--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/sysctl      2009-07-07 01:39:12.000000000 +0000
     418+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/sysctl   2014-05-17 00:02:04.110002078 +0000
    359419@@ -14,7 +14,7 @@
    360420 #
    … …  
    366426 
    367427 case "${1}" in
    368 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/template bootscripts-cross-lfs-2.1-pre1/clfs/init.d/template
    369 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/template    2014-04-12 13:37:45.000000000 -0400
    370 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/template 2014-04-13 15:53:20.000000000 -0400
    371 @@ -12,7 +12,7 @@
    372  #
    373  ########################################################################
    374  
    375 -. /etc/sysconfig/rc
    376 +. /tools/etc/sysconfig/rc
    377  . ${rc_functions}
    378  
    379  case "${1}" in
    380 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/udev bootscripts-cross-lfs-2.1-pre1/clfs/init.d/udev
    381 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/init.d/udev        2014-04-12 13:37:45.000000000 -0400
    382 +++ bootscripts-cross-lfs-2.1-pre1/clfs/init.d/udev     2014-04-13 15:53:20.000000000 -0400
     428diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/template bootscripts-cross-lfs-3.0-pre1/clfs/init.d/template
     429--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/template    2009-07-07 01:39:12.000000000 +0000
     430+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/template 2014-05-17 00:02:04.110002078 +0000
     431@@ -12,7 +12,7 @@
     432 #
     433 ########################################################################
     434 
     435-. /etc/sysconfig/rc
     436+. /tools/etc/sysconfig/rc
     437 . ${rc_functions}
     438 
     439 case "${1}" in
     440diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/udev bootscripts-cross-lfs-3.0-pre1/clfs/init.d/udev
     441--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/init.d/udev        2013-08-07 19:54:26.000000000 +0000
     442+++ bootscripts-cross-lfs-3.0-pre1/clfs/init.d/udev     2014-05-17 00:02:04.113335656 +0000
    383443@@ -16,7 +16,7 @@
    384444 #
    … …  
    436496 
    437497     *)
    438 diff -Naur bootscripts-cross-lfs-2.1-pre1.orig/clfs/sysconfig/rc bootscripts-cross-lfs-2.1-pre1/clfs/sysconfig/rc
    439 --- bootscripts-cross-lfs-2.1-pre1.orig/clfs/sysconfig/rc       2014-04-12 13:37:45.000000000 -0400
    440 +++ bootscripts-cross-lfs-2.1-pre1/clfs/sysconfig/rc    2014-04-14 00:33:44.000000000 -0400
    441 @@ -11,7 +11,7 @@
     498diff -Naur bootscripts-cross-lfs-3.0-pre1.orig/clfs/sysconfig/rc bootscripts-cross-lfs-3.0-pre1/clfs/sysconfig/rc
     499--- bootscripts-cross-lfs-3.0-pre1.orig/clfs/sysconfig/rc       2009-07-07 01:39:12.000000000 +0000
     500+++ bootscripts-cross-lfs-3.0-pre1/clfs/sysconfig/rc    2014-05-17 00:03:44.446670264 +0000
     501@@ -11,8 +11,8 @@
    442502 #
    443503 ########################################################################
    … …  
    446506+rc_base=/tools/etc/rc.d
    447507 rc_functions=${rc_base}/init.d/functions
    448  network_devices=/etc/sysconfig/network-devices
    449  
     508-network_devices=/etc/sysconfig/network-devices
     509+network_devices=/tools/etc/sysconfig/network-devices
     510 
     511 # End /etc/sysconfig/rc
Note: See TracChangeset for help on using the changeset viewer.