Changeset 1ab9a96
- Timestamp:
- May 17, 2014, 3:41:51 PM (10 years ago)
- 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. - Files:
-
- 7 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
BOOK/boot/common/bootscripts.xml
rb4badbd r1ab9a96 26 26 <title>Installation of Bootscripts</title> 27 27 28 <para os="p1">Apply a patch which modifies the scripts for use in 29 <filename class="directory">/tools</filename>:</para> 30 31 <screen os="p2"><userinput>patch -Np1 -i ../&bootscripts-clfs-tools_updates-patch;</userinput></screen> 32 28 33 <para os="a">Install the package:</para> 29 34 30 <screen os="b"><userinput>make DESTDIR=/tools install- bootscripts</userinput></screen>35 <screen os="b"><userinput>make DESTDIR=/tools install-minimal</userinput></screen> 31 36 32 37 <para os="c">The <command>setclock</command> script reads the time from the -
BOOK/bootable/x86/kernel.xml
rb4badbd r1ab9a96 42 42 43 43 <para>Be sure to enable or disable following features or the system might 44 not work correctly or boot at all.<!-- Refer to 45 <filename>/usr/share/doc/systemd-&systemd-version;/README</filename> -->:</para> 44 not work correctly or boot at all:</para> 46 45 47 46 <screen role="nodump">Device Drivers ---> … … 53 52 <note os="kd"><para>While "The IPv6 Protocol" is not strictly required, it 54 53 is highly recommended by the Systemd developers. "EFI Variable support" and 55 "EFI GUID Partition support" are for UEFI systems. "Collect scheduler 56 debugging info" and "Collect scheduler statistics" is for systemd-bootchart. 57 </para></note> 54 "EFI GUID Partition support" are for UEFI systems.</para></note> 58 55 59 56 <para os="h">Configure the kernel via a menu-driven interface. -
BOOK/final-system/common/kbd.xml
rb4badbd r1ab9a96 43 43 <screen os="h"><userinput>make install</userinput></screen> 44 44 45 <para os="i">Some of the programs from Kbd are used by systemd to46 initialize the system,those binaries need to be on the root45 <para os="i">Some of the programs from Kbd are used by the CLFS Bootscripts 46 to initialize the system, so those binaries need to be on the root 47 47 partition:</para> 48 48 49 <screen os="j"><userinput>mv -v /usr/bin/{ loadkeys,setfont} /bin</userinput></screen>49 <screen os="j"><userinput>mv -v /usr/bin/{dumpkeys,kbd_mode,loadkeys,setfont} /bin</userinput></screen> 50 50 51 51 <para os="k">Install the documentation:</para> -
BOOK/introduction/common/changelog.xml
rb4badbd r1ab9a96 43 43 <para>[William Harrington] - Move <command>logger</command> to 44 44 <filename class="directory">/bin</filename> for CLFS-Bootscripts 45 </listitem> 46 <listitem> 45 47 requirement..</para> 48 <para>[Chris] - Changed "systemd" reference on Kbd page to 49 CLFS Bootscripts, and added dumpkeys and kbd_mode to list of 50 programs moved to /bin as they're used in the bootscripts.</para> 46 51 </listitem> 47 52 </itemizedlist> -
BOOK/materials/common/patches.xml
rb4badbd r1ab9a96 38 38 </varlistentry> 39 39 --> 40 <varlistentry> 41 <term>Bootscripts Cross-LFS Updates Patch - <token>&bootscripts-clfs-tools_updates-patch-size;</token>:</term> 42 <listitem> 43 <para>Download: <ulink 44 url="&patches-root;&bootscripts-clfs-tools_updates-patch;"/></para> 45 <para>MD5 sum: <literal>&bootscripts-clfs-tools_updates-patch-md5;</literal></para> 46 </listitem> 47 </varlistentry> 48 40 49 <varlistentry> 41 50 <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term> -
BOOK/patches.ent
rb4badbd r1ab9a96 14 14 <!ENTITY binutils-branch_update-patch-size "5,268 KB"> 15 15 --> 16 17 <!ENTITY bootscripts-clfs-tools_updates-patch "bootscripts-cross-lfs-&bootscripts-clfs-version;-tools_updates-1.patch"> 18 <!ENTITY bootscripts-clfs-tools_updates-patch-md5 "9bbc4c0d5caed7f50be7ac5ea2897e3f"> 19 <!ENTITY bootscripts-clfs-tools_updates-patch-size "18.718 KB"> 16 20 17 21 <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch"> -
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 1 Submitted By: William Harrington (kb0iic at cross-lfs dot org) 2 Date: 2014-05-16 3 Initial Package Version: 3.1-pre1 4 Origin: Idea for cleaning up boot chapter by Chris Staub 5 Upstream Status: Not Applied - CLFS Specific 6 Description: Reduces ${CLFS}/ pollution by using ${CLFS}/tools as much as possible. 7 8 diff -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 4 11 @@ -118,7 +118,6 @@ 5 12 if [ ! -f ${EXTDIR}/sysconfig/i18n ]; then install -m ${CONFMODE} clfs/sysconfig/i18n ${EXTDIR}/sysconfig/; fi … … 27 34 install-raq2: create-dirs 28 35 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/checkfs30 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/checkfs 2014-04-12 13:37:45.000000000 -040031 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/checkfs 2014-04-13 15:53:20.000000000 -040036 diff -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 32 39 @@ -25,7 +25,7 @@ 33 40 # … … 39 46 40 47 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/cleanfs42 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/cleanfs 2014-04-12 13:37:45.000000000 -040043 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/cleanfs 2014-04-13 15:53:20.000000000 -040048 diff -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 44 51 @@ -12,13 +12,13 @@ 45 52 # … … 69 76 create_files 70 77 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/consolelog72 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/consolelog 2014-04-12 13:37:45.000000000 -040073 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/consolelog 2014-04-13 15:53:20.000000000 -040078 diff -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 74 81 @@ -13,13 +13,13 @@ 75 82 # … … 89 96 90 97 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/functions92 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/functions 2014-04-12 13:37:45.000000000 -040093 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/functions 2014-04-13 15:53:20.000000000 -040098 diff -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 94 101 @@ -13,14 +13,14 @@ 95 102 # … … 111 118 112 119 ## 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 138 diff -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 116 141 @@ -13,14 +13,14 @@ 117 142 # … … 133 158 134 159 ## 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 178 diff -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 190 diff -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 150 193 @@ -12,11 +12,11 @@ 151 194 # … … 163 206 164 207 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/localnet166 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/localnet 2014-04-12 13:37:45.000000000 -0400167 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/localnet 2014-04-13 15:53:20.000000000 -0400208 diff -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 168 211 @@ -12,9 +12,9 @@ 169 212 # … … 178 221 case "${1}" in 179 222 start) 180 diff -Naur bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/modules bootscripts-cross-lfs-2.1-pre1/clfs/init.d/modules181 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/modules 2014-04-12 13:37:45.000000000 -0400182 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/modules 2014-04-13 15:53:20.000000000 -0400223 diff -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 183 226 @@ -12,7 +12,7 @@ 184 227 # … … 210 253 boot_mesg "" ${NORMAL} 211 254 # 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 255 diff -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..." 284 diff -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 296 diff -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 239 299 @@ -14,9 +14,9 @@ 240 300 # … … 255 315 -# End /etc/rc.d/init.d/network 256 316 +# 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/paneld258 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/paneld 2014-04-12 13:37:45.000000000 -0400259 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/paneld 2014-04-13 15:53:20.000000000 -0400317 diff -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 260 320 @@ -12,7 +12,7 @@ 261 321 # … … 267 327 268 328 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/rc270 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/rc 2014-04-12 13:37:45.000000000 -0400271 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/rc 2014-04-13 15:53:20.000000000 -0400329 diff -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 272 332 @@ -12,7 +12,7 @@ 273 333 # … … 279 339 280 340 # 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/reboot282 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/reboot 2014-04-12 13:37:45.000000000 -0400283 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/reboot 2014-04-13 15:53:20.000000000 -0400284 @@ -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/rsyslog294 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/rsyslog 2014-04-12 13:37:45.000000000 -0400295 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/rsyslog 2014-04-13 15:53:20.000000000 -0400296 @@ -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/sendsignals306 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/sendsignals 2014-04-12 13:37:45.000000000 -0400307 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/sendsignals 2014-04-13 15:53:20.000000000 -0400308 @@ -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/setclock318 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/setclock 2014-04-12 13:37:45.000000000 -0400319 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/setclock 2014-04-13 15:53:20.000000000 -0400341 diff -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 353 diff -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 365 diff -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 377 diff -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 320 380 @@ -12,9 +12,9 @@ 321 381 # … … 330 390 CLOCKPARAMS= 331 391 332 diff -Naur bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/setlcd bootscripts-cross-lfs-2.1-pre1/clfs/init.d/setlcd333 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/setlcd 2014-04-12 13:37:45.000000000 -0400334 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/setlcd 2014-04-13 15:53:20.000000000 -0400392 diff -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 335 395 @@ -12,7 +12,7 @@ 336 396 # … … 342 402 343 403 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/swap345 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/swap 2014-04-12 13:37:45.000000000 -0400346 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/swap 2014-04-13 15:53:20.000000000 -0400347 @@ -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/sysctl357 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/sysctl 2014-04-12 13:37:45.000000000 -0400358 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/sysctl 2014-04-13 15:53:20.000000000 -0400404 diff -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 416 diff -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 359 419 @@ -14,7 +14,7 @@ 360 420 # … … 366 426 367 427 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/template369 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/template 2014-04-12 13:37:45.000000000 -0400370 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/template 2014-04-13 15:53:20.000000000 -0400371 @@ -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/udev381 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/init.d/udev 2014-04-12 13:37:45.000000000 -0400382 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/init.d/udev 2014-04-13 15:53:20.000000000 -0400428 diff -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 440 diff -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 383 443 @@ -16,7 +16,7 @@ 384 444 # … … 436 496 437 497 *) 438 diff -Naur bootscripts-cross-lfs- 2.1-pre1.orig/clfs/sysconfig/rc bootscripts-cross-lfs-2.1-pre1/clfs/sysconfig/rc439 --- bootscripts-cross-lfs- 2.1-pre1.orig/clfs/sysconfig/rc 2014-04-12 13:37:45.000000000 -0400440 +++ bootscripts-cross-lfs- 2.1-pre1/clfs/sysconfig/rc 2014-04-14 00:33:44.000000000 -0400441 @@ -11, 7 +11,7@@498 diff -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 @@ 442 502 # 443 503 ######################################################################## … … 446 506 +rc_base=/tools/etc/rc.d 447 507 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 -
patches/sysvinit-2.88dsf-tools_updates-1.patch
rb4badbd r1ab9a96 1 Submitted By: William Harrington (kb0iic at cross-lfs dot org) 2 Date: 2014-05-16 3 Initial Package Version: 2.88dsf 4 Origin: Idea for cleaning up boot chapter by Chris Staub 5 Upstream Status: Not Applied - CLFS Specific 6 Description: Reduces ${CLFS}/ pollution by using ${CLFS}/tools as much as possible. 7 1 8 diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile 2 9 --- sysvinit-2.88dsf.orig/src/Makefile 2010-04-11 05:30:27.000000000 -0400
Note:
See TracChangeset
for help on using the changeset viewer.