[163a6701] | 1 | Submitted By: Jim Gifford (patches at jg555 dot com)
|
---|
| 2 | Date: 2005-07-01
|
---|
| 3 | Initial Package Version: 3.2.2
|
---|
| 4 | Origin: Jim Gifford
|
---|
| 5 | Upstream Status: in contrib
|
---|
| 6 | Description: Allows bootscripts to use LCD Screen on RaQ2
|
---|
| 7 |
|
---|
| 8 | diff -Naur bootscripts.orig/Makefile bootscripts/Makefile
|
---|
| 9 | --- bootscripts.orig/Makefile 2005-07-01 19:03:03.000000000 +0000
|
---|
| 10 | +++ bootscripts/Makefile 2005-07-01 19:04:49.000000000 +0000
|
---|
| 11 | @@ -28,6 +28,7 @@
|
---|
| 12 | install -m ${MODE} lfs/init.d/halt ${EXTDIR}/rc.d/init.d/
|
---|
| 13 | install -m ${MODE} lfs/init.d/console ${EXTDIR}/rc.d/init.d/
|
---|
| 14 | install -m ${MODE} lfs/init.d/hotplug ${EXTDIR}/rc.d/init.d/
|
---|
| 15 | + install -m ${MODE} lfs/init.d/paneld ${EXTDIR}/rc.d/init.d/
|
---|
| 16 | install -m ${MODE} lfs/init.d/localnet ${EXTDIR}/rc.d/init.d/
|
---|
| 17 | install -m ${MODE} lfs/init.d/modules ${EXTDIR}/rc.d/init.d/
|
---|
| 18 | install -m ${MODE} lfs/init.d/mountfs ${EXTDIR}/rc.d/init.d/
|
---|
| 19 | @@ -42,26 +43,33 @@
|
---|
| 20 | install -m ${MODE} lfs/init.d/sysctl ${EXTDIR}/rc.d/init.d/
|
---|
| 21 | install -m ${MODE} lfs/init.d/template ${EXTDIR}/rc.d/init.d/
|
---|
| 22 | install -m ${MODE} lfs/init.d/udev ${EXTDIR}/rc.d/init.d/
|
---|
| 23 | + ln -sf ../init.d/paneld ${EXTDIR}/rc.d/rc1.d/K01paneld
|
---|
| 24 | ln -sf ../init.d/network ${EXTDIR}/rc.d/rc0.d/K80network
|
---|
| 25 | - ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc0.d/K90sysklogd
|
---|
| 26 | + ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc0.d/K90sysklogd
|
---|
| 27 | ln -sf ../init.d/hotplug ${EXTDIR}/rc.d/rc0.d/S50hotplug
|
---|
| 28 | ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc0.d/S60sendsignals
|
---|
| 29 | ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rc0.d/S70mountfs
|
---|
| 30 | ln -sf ../init.d/swap ${EXTDIR}/rc.d/rc0.d/S80swap
|
---|
| 31 | ln -sf ../init.d/localnet ${EXTDIR}/rc.d/rc0.d/S90localnet
|
---|
| 32 | ln -sf ../init.d/halt ${EXTDIR}/rc.d/rc0.d/S99halt
|
---|
| 33 | + ln -sf ../init.d/paneld ${EXTDIR}/rc.d/rc1.d/S99paneld
|
---|
| 34 | ln -sf ../init.d/network ${EXTDIR}/rc.d/rc1.d/K80network
|
---|
| 35 | - ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc1.d/K90sysklogd
|
---|
| 36 | + ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc1.d/K90sysklogd
|
---|
| 37 | + ln -sf ../init.d/paneld ${EXTDIR}/rc.d/rc2.d/S99paneld
|
---|
| 38 | ln -sf ../init.d/network ${EXTDIR}/rc.d/rc2.d/K80network
|
---|
| 39 | - ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc2.d/K90sysklogd
|
---|
| 40 | - ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc3.d/S10sysklogd
|
---|
| 41 | + ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc2.d/K90sysklogd
|
---|
| 42 | + ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc3.d/S10sysklogd
|
---|
| 43 | + ln -sf ../init.d/paneld ${EXTDIR}/rc.d/rc3.d/S99paneld
|
---|
| 44 | ln -sf ../init.d/network ${EXTDIR}/rc.d/rc3.d/S20network
|
---|
| 45 | - ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc4.d/S10sysklogd
|
---|
| 46 | + ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc4.d/S10sysklogd
|
---|
| 47 | + ln -sf ../init.d/paneld ${EXTDIR}/rc.d/rc4.d/S99paneld
|
---|
| 48 | ln -sf ../init.d/network ${EXTDIR}/rc.d/rc4.d/S20network
|
---|
| 49 | - ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc5.d/S10sysklogd
|
---|
| 50 | + ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc5.d/S10sysklogd
|
---|
| 51 | + ln -sf ../init.d/paneld ${EXTDIR}/rc.d/rc5.d/S99paneld
|
---|
| 52 | ln -sf ../init.d/network ${EXTDIR}/rc.d/rc5.d/S20network
|
---|
| 53 | + ln -sf ../init.d/paneld ${EXTDIR}/rc.d/rc6.d/K01paneld
|
---|
| 54 | ln -sf ../init.d/network ${EXTDIR}/rc.d/rc6.d/K80network
|
---|
| 55 | - ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc6.d/K90sysklogd
|
---|
| 56 | + ln -sf ../init.d/sysklogd ${EXTDIR}/rc.d/rc6.d/K90sysklogd
|
---|
| 57 | ln -sf ../init.d/hotplug ${EXTDIR}/rc.d/rc6.d/S50hotplug
|
---|
| 58 | ln -sf ../init.d/sendsignals ${EXTDIR}/rc.d/rc6.d/S60sendsignals
|
---|
| 59 | ln -sf ../init.d/mountfs ${EXTDIR}/rc.d/rc6.d/S70mountfs
|
---|
| 60 | diff -Naur bootscripts.orig/lfs/init.d/checkfs bootscripts/lfs/init.d/checkfs
|
---|
| 61 | --- bootscripts.orig/lfs/init.d/checkfs 2005-07-01 19:03:03.000000000 +0000
|
---|
| 62 | +++ bootscripts/lfs/init.d/checkfs 2005-07-01 19:04:01.000000000 +0000
|
---|
| 63 | @@ -33,11 +33,13 @@
|
---|
| 64 | if [ -f /fastboot ]; then
|
---|
| 65 | boot_mesg -n "/fastboot found, will not perform" ${INFO}
|
---|
| 66 | boot_mesg " file system checks as requested."
|
---|
| 67 | + putlcd "Fast boot" "requested"
|
---|
| 68 | echo_ok
|
---|
| 69 | exit 0
|
---|
| 70 | fi
|
---|
| 71 |
|
---|
| 72 | boot_mesg "Mounting root file system in read-only mode..."
|
---|
| 73 | + putlcd "Mounting / in" "read-only mode"
|
---|
| 74 | mount -n -o remount,ro / >/dev/null
|
---|
| 75 | evaluate_retval
|
---|
| 76 |
|
---|
| 77 | @@ -48,15 +50,16 @@
|
---|
| 78 | boot_mesg -n " in read-only mode.\n\nAfter you"
|
---|
| 79 | boot_mesg -n " press Enter, this system will be"
|
---|
| 80 | boot_mesg -n " halted and powered off."
|
---|
| 81 | - boot_mesg -n "\n\nPress enter to continue..." ${INFO}
|
---|
| 82 | boot_mesg "" ${NORMAL}
|
---|
| 83 | - read ENTER
|
---|
| 84 | + putlcd "FileSystem Error" "Halting System"
|
---|
| 85 | + sleep 10
|
---|
| 86 | /etc/rc.d/init.d/halt stop
|
---|
| 87 | fi
|
---|
| 88 |
|
---|
| 89 | if [ -f /forcefsck ]; then
|
---|
| 90 | boot_mesg -n "/forcefsck found, forcing file" ${INFO}
|
---|
| 91 | boot_mesg " system checks as requested."
|
---|
| 92 | + putlcd "Forcing file" "system check"
|
---|
| 93 | echo_ok
|
---|
| 94 | options="-f"
|
---|
| 95 | else
|
---|
| 96 | @@ -64,6 +67,7 @@
|
---|
| 97 | fi
|
---|
| 98 |
|
---|
| 99 | boot_mesg "Checking file systems..."
|
---|
| 100 | + putlcd "Checking file" "systems..."
|
---|
| 101 | # Note: -a option used to be -p; but this fails e.g.
|
---|
| 102 | # on fsck.minix
|
---|
| 103 | fsck ${options} -a -A -C -T 2>/dev/null
|
---|
| 104 | @@ -90,9 +94,9 @@
|
---|
| 105 | boot_mesg -n " errors require this system to be"
|
---|
| 106 | boot_mesg -n " rebooted.\n\nAfter you press enter,"
|
---|
| 107 | boot_mesg -n " this system will be rebooted"
|
---|
| 108 | - boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
|
---|
| 109 | boot_mesg "" ${NORMAL}
|
---|
| 110 | - read ENTER
|
---|
| 111 | + putlcd "Errors corrected" "Rebooting"
|
---|
| 112 | + sleep 5
|
---|
| 113 | reboot -f
|
---|
| 114 | fi
|
---|
| 115 |
|
---|
| 116 | @@ -107,9 +111,9 @@
|
---|
| 117 | boot_mesg -n " System Administrator.\n\nAfter you"
|
---|
| 118 | boot_mesg -n " press Enter, this system will be"
|
---|
| 119 | boot_mesg -n " halted and powered off."
|
---|
| 120 | - boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
|
---|
| 121 | boot_mesg "" ${NORMAL}
|
---|
| 122 | - read ENTER
|
---|
| 123 | + putlcd "FileSystem Error" "Halting System"
|
---|
| 124 | + sleep 10
|
---|
| 125 | /etc/rc.d/init.d/halt stop
|
---|
| 126 | fi
|
---|
| 127 |
|
---|
| 128 | diff -Naur bootscripts.orig/lfs/init.d/cleanfs bootscripts/lfs/init.d/cleanfs
|
---|
| 129 | --- bootscripts.orig/lfs/init.d/cleanfs 2005-07-01 19:03:03.000000000 +0000
|
---|
| 130 | +++ bootscripts/lfs/init.d/cleanfs 2005-07-01 19:04:01.000000000 +0000
|
---|
| 131 | @@ -72,17 +72,21 @@
|
---|
| 132 | case "${1}" in
|
---|
| 133 | start)
|
---|
| 134 | boot_mesg -n "Cleaning file systems:" ${INFO}
|
---|
| 135 | + putlcd "Cleaning file" "systems:"
|
---|
| 136 |
|
---|
| 137 | boot_mesg -n " /tmp" ${NORMAL}
|
---|
| 138 | + putlcd "Cleaning:" "/tmp"
|
---|
| 139 | cd /tmp &&
|
---|
| 140 | find . -xdev -mindepth 1 ! -name lost+found \
|
---|
| 141 | -delete || failed=1
|
---|
| 142 |
|
---|
| 143 | boot_mesg -n " /var/lock" ${NORMAL}
|
---|
| 144 | + putlcd "Cleaning:" "/var/lock"
|
---|
| 145 | cd /var/lock &&
|
---|
| 146 | find . -type f ! -newer /proc -exec rm -f {} \; || failed=1
|
---|
| 147 |
|
---|
| 148 | boot_mesg " /var/run" ${NORMAL}
|
---|
| 149 | + putlcd "Cleaning:" "/var/run"
|
---|
| 150 | cd /var/run &&
|
---|
| 151 | find . ! -type d ! -name utmp ! -newer /proc \
|
---|
| 152 | -exec rm -f {} \; || failed=1
|
---|
| 153 | @@ -97,6 +101,7 @@
|
---|
| 154 |
|
---|
| 155 | if egrep -qv '^(#|$)' /etc/sysconfig/createfiles 2>/dev/null; then
|
---|
| 156 | boot_mesg "Creating files and directories..."
|
---|
| 157 | + putlcd "Creating files" "and directories"
|
---|
| 158 | create_files
|
---|
| 159 | evaluate_retval
|
---|
| 160 | fi
|
---|
| 161 | diff -Naur bootscripts.orig/lfs/init.d/console bootscripts/lfs/init.d/console
|
---|
| 162 | --- bootscripts.orig/lfs/init.d/console 2005-07-01 19:03:03.000000000 +0000
|
---|
| 163 | +++ bootscripts/lfs/init.d/console 2005-07-01 19:04:01.000000000 +0000
|
---|
| 164 | @@ -25,18 +25,21 @@
|
---|
| 165 | start)
|
---|
| 166 | if [ -n "${KEYMAP}" ]; then
|
---|
| 167 | boot_mesg "Loading keymap: ${KEYMAP}..."
|
---|
| 168 | + putlcd "Loading keymap:" "${KEYMAP}"
|
---|
| 169 | loadkeys ${KEYMAP} &>/dev/null
|
---|
| 170 | evaluate_retval
|
---|
| 171 | fi
|
---|
| 172 |
|
---|
| 173 | if [ -n "${KEYMAP_CORRECTIONS}" ]; then
|
---|
| 174 | boot_mesg "Loading keymap corrections: ${KEYMAP_CORRECTIONS}..."
|
---|
| 175 | + putlcd "Loading keymap" "corrections"
|
---|
| 176 | loadkeys ${KEYMAP_CORRECTIONS} &>/dev/null
|
---|
| 177 | evaluate_retval
|
---|
| 178 | fi
|
---|
| 179 |
|
---|
| 180 | if [ -n "${FONT}" ]; then
|
---|
| 181 | boot_mesg "Setting screen font to ${FONT}..."
|
---|
| 182 | + putlcd "Setting font" "to $FONT"
|
---|
| 183 | setfont $FONT &>/dev/null
|
---|
| 184 | evaluate_retval
|
---|
| 185 | fi
|
---|
| 186 | diff -Naur bootscripts.orig/lfs/init.d/functions bootscripts/lfs/init.d/functions
|
---|
| 187 | --- bootscripts.orig/lfs/init.d/functions 2005-07-01 19:03:03.000000000 +0000
|
---|
| 188 | +++ bootscripts/lfs/init.d/functions 2005-07-01 19:04:01.000000000 +0000
|
---|
| 189 | @@ -263,7 +263,8 @@
|
---|
| 190 | boot_mesg -n " the LFS book, please be so kind to inform us at"
|
---|
| 191 | boot_mesg " lfs-dev@linuxfromscratch.org.\n"
|
---|
| 192 | boot_mesg_flush
|
---|
| 193 | - boot_mesg -n "Press Enter to continue..." ${INFO}
|
---|
| 194 | + putlcd "BootScript Error" "view bootlog"
|
---|
| 195 | + sleep 20
|
---|
| 196 | boot_mesg "" ${NORMAL}
|
---|
| 197 | read ENTER
|
---|
| 198 | }
|
---|
| 199 | diff -Naur bootscripts.orig/lfs/init.d/hotplug bootscripts/lfs/init.d/hotplug
|
---|
| 200 | --- bootscripts.orig/lfs/init.d/hotplug 2005-07-01 19:03:03.000000000 +0000
|
---|
| 201 | +++ bootscripts/lfs/init.d/hotplug 2005-07-01 19:04:01.000000000 +0000
|
---|
| 202 | @@ -18,6 +18,7 @@
|
---|
| 203 | case "${1}" in
|
---|
| 204 | start|restart)
|
---|
| 205 | boot_mesg "Loading modules for system devices..."
|
---|
| 206 | + putlcd "Loading modules" "for devices"
|
---|
| 207 | for rc in /etc/hotplug/*.rc
|
---|
| 208 | do
|
---|
| 209 | ${rc} ${1}
|
---|
| 210 | diff -Naur bootscripts.orig/lfs/init.d/localnet bootscripts/lfs/init.d/localnet
|
---|
| 211 | --- bootscripts.orig/lfs/init.d/localnet 2005-07-01 19:03:03.000000000 +0000
|
---|
| 212 | +++ bootscripts/lfs/init.d/localnet 2005-07-01 19:04:01.000000000 +0000
|
---|
| 213 | @@ -19,17 +19,20 @@
|
---|
| 214 | case "${1}" in
|
---|
| 215 | start)
|
---|
| 216 | boot_mesg "Bringing up the loopback interface..."
|
---|
| 217 | + putlcd "Loopback:" "Up"
|
---|
| 218 | ip addr add 127.0.0.1/8 label lo dev lo
|
---|
| 219 | ip link set lo up
|
---|
| 220 | evaluate_retval
|
---|
| 221 |
|
---|
| 222 | boot_mesg "Setting hostname to ${HOSTNAME}..."
|
---|
| 223 | + putlcd "Hostname:" "${HOSTNAME}"
|
---|
| 224 | hostname ${HOSTNAME}
|
---|
| 225 | evaluate_retval
|
---|
| 226 | ;;
|
---|
| 227 |
|
---|
| 228 | stop)
|
---|
| 229 | boot_mesg "Bringing down the loopback interface..."
|
---|
| 230 | + putlcd "Loopback:" "Down"
|
---|
| 231 | ip link set lo down
|
---|
| 232 | evaluate_retval
|
---|
| 233 | ;;
|
---|
| 234 | diff -Naur bootscripts.orig/lfs/init.d/modules bootscripts/lfs/init.d/modules
|
---|
| 235 | --- bootscripts.orig/lfs/init.d/modules 2005-07-01 19:03:03.000000000 +0000
|
---|
| 236 | +++ bootscripts/lfs/init.d/modules 2005-07-01 19:04:01.000000000 +0000
|
---|
| 237 | @@ -60,6 +60,7 @@
|
---|
| 238 | # otherwise take note.
|
---|
| 239 | if [ ${?} -eq 0 ]; then
|
---|
| 240 | boot_mesg -n " ${module}" ${NORMAL}
|
---|
| 241 | + putlcd "Module:" "${module}"
|
---|
| 242 | else
|
---|
| 243 | failedmod="${failedmod} ${module}"
|
---|
| 244 | fi
|
---|
| 245 | diff -Naur bootscripts.orig/lfs/init.d/mountfs bootscripts/lfs/init.d/mountfs
|
---|
| 246 | --- bootscripts.orig/lfs/init.d/mountfs 2005-07-01 19:03:03.000000000 +0000
|
---|
| 247 | +++ bootscripts/lfs/init.d/mountfs 2005-07-01 19:04:01.000000000 +0000
|
---|
| 248 | @@ -18,6 +18,7 @@
|
---|
| 249 | case "${1}" in
|
---|
| 250 | start)
|
---|
| 251 | boot_mesg "Remounting root file system in read-write mode..."
|
---|
| 252 | + putlcd "Remounting:" "/"
|
---|
| 253 | mount -n -o remount,rw / &>/dev/null
|
---|
| 254 | evaluate_retval
|
---|
| 255 |
|
---|
| 256 | @@ -25,6 +26,7 @@
|
---|
| 257 | rm -f /fastboot /forcefsck
|
---|
| 258 |
|
---|
| 259 | boot_mesg "Recording existing mounts in /etc/mtab..."
|
---|
| 260 | + putlcd "Recording mounts" "in /etc/mtab"
|
---|
| 261 | > /etc/mtab
|
---|
| 262 | mount -f / || failed=1
|
---|
| 263 | mount -f /proc || failed=1
|
---|
| 264 | @@ -35,12 +37,14 @@
|
---|
| 265 | # This will mount all filesystems that do not have _netdev in
|
---|
| 266 | # their option list. _netdev denotes a network filesystem.
|
---|
| 267 | boot_mesg "Mounting remaining file systems..."
|
---|
| 268 | + putlcd "Mounting:" "file systems"
|
---|
| 269 | mount -a -O no_netdev &>/dev/null
|
---|
| 270 | evaluate_retval
|
---|
| 271 | ;;
|
---|
| 272 |
|
---|
| 273 | stop)
|
---|
| 274 | boot_mesg "Unmounting all other currently mounted file systems..."
|
---|
| 275 | + putlcd "Unmounting:" "file systems"
|
---|
| 276 | umount -a -d -r &>/dev/null
|
---|
| 277 | evaluate_retval
|
---|
| 278 | ;;
|
---|
| 279 | diff -Naur bootscripts.orig/lfs/init.d/paneld bootscripts/lfs/init.d/paneld
|
---|
| 280 | --- bootscripts.orig/lfs/init.d/paneld 1970-01-01 00:00:00.000000000 +0000
|
---|
| 281 | +++ bootscripts/lfs/init.d/paneld 2005-07-01 19:04:01.000000000 +0000
|
---|
| 282 | @@ -0,0 +1,63 @@
|
---|
| 283 | +#!/bin/sh
|
---|
| 284 | +########################################################################
|
---|
| 285 | +# Begin $rc_base/init.d/paneld
|
---|
| 286 | +#
|
---|
| 287 | +# Description : Show Messages on the LCD Panel
|
---|
| 288 | +#
|
---|
| 289 | +# Author : Jim Gifford - jim@linuxfromscratch.org
|
---|
| 290 | +#
|
---|
| 291 | +# Version : 00.00
|
---|
| 292 | +#
|
---|
| 293 | +# Notes :
|
---|
| 294 | +#
|
---|
| 295 | +########################################################################
|
---|
| 296 | +
|
---|
| 297 | +. /etc/sysconfig/rc
|
---|
| 298 | +. $rc_functions
|
---|
| 299 | +
|
---|
| 300 | +case "$1" in
|
---|
| 301 | + start)
|
---|
| 302 | + boot_mesg "Setting up LCD Panel"
|
---|
| 303 | + ip addr show dev eth0 > /dev/null 2>&1
|
---|
| 304 | + if [ "$?" = "0" ]; then
|
---|
| 305 | + IFACE1_IP="`ip addr show dev eth0 | grep inet | cut -d / -f 1 | cut -d t -f 2 | cut -d' ' -f 2 `"
|
---|
| 306 | + IFACE1="$IFACE1_IP"
|
---|
| 307 | + fi
|
---|
| 308 | + ip addr show dev eth1 > /dev/null 2>&1
|
---|
| 309 | + if [ "$?" = "0" ]; then
|
---|
| 310 | + IFACE2_IP="`ip addr show dev eth1 | grep inet | cut -d / -f 1 | cut -d t -f 2 | cut -d' ' -f 2 `"
|
---|
| 311 | + IFACE2="$IFACE2_IP"
|
---|
| 312 | + fi
|
---|
| 313 | + COMMON="Hold S & E Menu"
|
---|
| 314 | + if [ "$IFACE2" = "" ]; then
|
---|
| 315 | + loadproc paneld -d "Lan1 $IFACE1" "$COMMON"
|
---|
| 316 | + else
|
---|
| 317 | + loadproc paneld -d "Lan1 $IFACE1" "Lan2 $IFACE2" "$COMMON"
|
---|
| 318 | + fi
|
---|
| 319 | +
|
---|
| 320 | + ;;
|
---|
| 321 | +
|
---|
| 322 | + stop)
|
---|
| 323 | + boot_mesg "Clearing LCD Panel..."
|
---|
| 324 | + putlcd "Clearing" "LCD Panel"
|
---|
| 325 | + killproc paneld
|
---|
| 326 | + ;;
|
---|
| 327 | +
|
---|
| 328 | + restart)
|
---|
| 329 | + ${0} stop
|
---|
| 330 | + sleep 1
|
---|
| 331 | + ${0} start
|
---|
| 332 | + ;;
|
---|
| 333 | +
|
---|
| 334 | + status)
|
---|
| 335 | + statusproc paneld
|
---|
| 336 | + ;;
|
---|
| 337 | +
|
---|
| 338 | + *)
|
---|
| 339 | + echo "Usage: {start|stop|restart|status}"
|
---|
| 340 | + exit 1
|
---|
| 341 | + ;;
|
---|
| 342 | +esac
|
---|
| 343 | +
|
---|
| 344 | +# End $rc_base/init.d/paneld
|
---|
| 345 | +
|
---|
| 346 | diff -Naur bootscripts.orig/lfs/init.d/rc bootscripts/lfs/init.d/rc
|
---|
| 347 | --- bootscripts.orig/lfs/init.d/rc 2005-07-01 19:03:03.000000000 +0000
|
---|
| 348 | +++ bootscripts/lfs/init.d/rc 2005-07-01 19:04:01.000000000 +0000
|
---|
| 349 | @@ -33,6 +33,7 @@
|
---|
| 350 |
|
---|
| 351 | if [ ! -d ${rc_base}/rc${runlevel}.d ]; then
|
---|
| 352 | boot_mesg "${rc_base}/rc${runlevel}.d does not exist." ${WARNING}
|
---|
| 353 | + putlcd "${rc_base}/rc${runlevel}.d" "does not exist."
|
---|
| 354 | boot_mesg_flush
|
---|
| 355 | exit 1
|
---|
| 356 | fi
|
---|
| 357 | @@ -56,6 +57,8 @@
|
---|
| 358 | boot_mesg -n " not started in the previous"
|
---|
| 359 | boot_mesg -n " runlevel (${previous})."
|
---|
| 360 | boot_mesg "" ${NORMAL}
|
---|
| 361 | + putlcd "BootScript Error" "view bootlog"
|
---|
| 362 | + sleep 20
|
---|
| 363 | boot_mesg_flush
|
---|
| 364 | continue
|
---|
| 365 | fi
|
---|
| 366 | @@ -92,7 +95,7 @@
|
---|
| 367 | esac
|
---|
| 368 | error_value=${?}
|
---|
| 369 |
|
---|
| 370 | - if [ "${error_value}" != "0" ]; then
|
---|
| 371 | + if [ "${error_value}" != "0" ]; then
|
---|
| 372 | print_error_msg
|
---|
| 373 | fi
|
---|
| 374 | done
|
---|
| 375 | diff -Naur bootscripts.orig/lfs/init.d/reboot bootscripts/lfs/init.d/reboot
|
---|
| 376 | --- bootscripts.orig/lfs/init.d/reboot 2005-07-01 19:03:03.000000000 +0000
|
---|
| 377 | +++ bootscripts/lfs/init.d/reboot 2005-07-01 19:04:01.000000000 +0000
|
---|
| 378 | @@ -17,7 +17,6 @@
|
---|
| 379 |
|
---|
| 380 | case "${1}" in
|
---|
| 381 | stop)
|
---|
| 382 | - boot_mesg "Restarting system..."
|
---|
| 383 | reboot -d -f -i
|
---|
| 384 | ;;
|
---|
| 385 |
|
---|
| 386 | diff -Naur bootscripts.orig/lfs/init.d/sendsignals bootscripts/lfs/init.d/sendsignals
|
---|
| 387 | --- bootscripts.orig/lfs/init.d/sendsignals 2005-07-01 19:03:03.000000000 +0000
|
---|
| 388 | +++ bootscripts/lfs/init.d/sendsignals 2005-07-01 19:04:01.000000000 +0000
|
---|
| 389 | @@ -18,6 +18,7 @@
|
---|
| 390 | case "${1}" in
|
---|
| 391 | stop)
|
---|
| 392 | boot_mesg "Sending all processes the TERM signal..."
|
---|
| 393 | + putlcd "Sending:" "TERM signal"
|
---|
| 394 | killall5 -15
|
---|
| 395 | error_value=${?}
|
---|
| 396 |
|
---|
| 397 | @@ -30,6 +31,7 @@
|
---|
| 398 | fi
|
---|
| 399 |
|
---|
| 400 | boot_mesg "Sending all processes the KILL signal..."
|
---|
| 401 | + putlcd "Sending:" "KILL signal"
|
---|
| 402 | killall5 -9
|
---|
| 403 | error_value=${?}
|
---|
| 404 |
|
---|
| 405 | diff -Naur bootscripts.orig/lfs/init.d/setclock bootscripts/lfs/init.d/setclock
|
---|
| 406 | --- bootscripts.orig/lfs/init.d/setclock 2005-07-01 19:03:03.000000000 +0000
|
---|
| 407 | +++ bootscripts/lfs/init.d/setclock 2005-07-01 19:04:01.000000000 +0000
|
---|
| 408 | @@ -32,12 +32,14 @@
|
---|
| 409 | case ${1} in
|
---|
| 410 | start)
|
---|
| 411 | boot_mesg "Setting system clock..."
|
---|
| 412 | + putlcd "Setting:" "system clock"
|
---|
| 413 | hwclock --hctosys ${CLOCKPARAMS} &>/dev/null
|
---|
| 414 | evaluate_retval
|
---|
| 415 | ;;
|
---|
| 416 |
|
---|
| 417 | stop)
|
---|
| 418 | boot_mesg "Setting hardware clock..."
|
---|
| 419 | + putlcd "Setting:" "hardware clock"
|
---|
| 420 | hwclock --systohc ${CLOCKPARAMS} &>/dev/null
|
---|
| 421 | evaluate_retval
|
---|
| 422 | ;;
|
---|
| 423 | diff -Naur bootscripts.orig/lfs/init.d/swap bootscripts/lfs/init.d/swap
|
---|
| 424 | --- bootscripts.orig/lfs/init.d/swap 2005-07-01 19:03:03.000000000 +0000
|
---|
| 425 | +++ bootscripts/lfs/init.d/swap 2005-07-01 19:04:01.000000000 +0000
|
---|
| 426 | @@ -18,12 +18,14 @@
|
---|
| 427 | case "${1}" in
|
---|
| 428 | start)
|
---|
| 429 | boot_mesg "Activating all swap files/partitions..."
|
---|
| 430 | + putlcd "Activating:" "swap"
|
---|
| 431 | swapon -a
|
---|
| 432 | evaluate_retval
|
---|
| 433 | ;;
|
---|
| 434 |
|
---|
| 435 | stop)
|
---|
| 436 | boot_mesg "Deactivating all swap files/partitions..."
|
---|
| 437 | + putlcd "Deactivating:" "swap"
|
---|
| 438 | swapoff -a
|
---|
| 439 | evaluate_retval
|
---|
| 440 | ;;
|
---|
| 441 | diff -Naur bootscripts.orig/lfs/init.d/sysctl bootscripts/lfs/init.d/sysctl
|
---|
| 442 | --- bootscripts.orig/lfs/init.d/sysctl 2005-07-01 19:03:03.000000000 +0000
|
---|
| 443 | +++ bootscripts/lfs/init.d/sysctl 2005-07-01 19:04:01.000000000 +0000
|
---|
| 444 | @@ -21,6 +21,7 @@
|
---|
| 445 | start)
|
---|
| 446 | if [ -f "/etc/sysctl.conf" ]; then
|
---|
| 447 | boot_mesg "Setting kernel runtime parameters..."
|
---|
| 448 | + putlcd "Utilizing:" "sysctl"
|
---|
| 449 | sysctl -q -p
|
---|
| 450 | evaluate_retval
|
---|
| 451 | fi
|
---|
| 452 | diff -Naur bootscripts.orig/lfs/init.d/sysklogd bootscripts/lfs/init.d/sysklogd
|
---|
| 453 | --- bootscripts.orig/lfs/init.d/sysklogd 2005-07-01 19:03:03.000000000 +0000
|
---|
| 454 | +++ bootscripts/lfs/init.d/sysklogd 2005-07-01 19:04:01.000000000 +0000
|
---|
| 455 | @@ -18,17 +18,21 @@
|
---|
| 456 | case "${1}" in
|
---|
| 457 | start)
|
---|
| 458 | boot_mesg "Starting system log daemon..."
|
---|
| 459 | + putlcd "Starting:" "system log"
|
---|
| 460 | loadproc syslogd -m 0
|
---|
| 461 |
|
---|
| 462 | boot_mesg "Starting kernel log daemon..."
|
---|
| 463 | + putlcd "Starting:" "kernel log"
|
---|
| 464 | loadproc klogd
|
---|
| 465 | ;;
|
---|
| 466 |
|
---|
| 467 | stop)
|
---|
| 468 | boot_mesg "Stopping kernel log daemon..."
|
---|
| 469 | + putlcd "Stopping:" "system log"
|
---|
| 470 | killproc klogd
|
---|
| 471 |
|
---|
| 472 | boot_mesg "Stopping system log daemon..."
|
---|
| 473 | + putlcd "Stopping:" "kernel log"
|
---|
| 474 | killproc syslogd
|
---|
| 475 | ;;
|
---|
| 476 |
|
---|
| 477 | diff -Naur bootscripts.orig/lfs/init.d/udev bootscripts/lfs/init.d/udev
|
---|
| 478 | --- bootscripts.orig/lfs/init.d/udev 2005-07-01 19:03:03.000000000 +0000
|
---|
| 479 | +++ bootscripts/lfs/init.d/udev 2005-07-01 19:04:01.000000000 +0000
|
---|
| 480 | @@ -39,7 +39,8 @@
|
---|
| 481 | boot_mesg -n " will be halted and powered off."
|
---|
| 482 | boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
|
---|
| 483 | boot_mesg "" ${NORMAL}
|
---|
| 484 | - read ENTER
|
---|
| 485 | + putlcd "BootScript Error" "view bootlog"
|
---|
| 486 | + sleep 20
|
---|
| 487 | /etc/rc.d/init.d/halt stop
|
---|
| 488 | fi
|
---|
| 489 |
|
---|
| 490 | @@ -57,7 +58,8 @@
|
---|
| 491 | boot_mesg -n " will be halted and powered off."
|
---|
| 492 | boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
|
---|
| 493 | boot_mesg "" ${NORMAL}
|
---|
| 494 | - read ENTER
|
---|
| 495 | + putlcd "BootScript Error" "view bootlog"
|
---|
| 496 | + sleep 20
|
---|
| 497 | /etc/rc.d/init.d/halt stop
|
---|
| 498 | fi
|
---|
| 499 |
|
---|
| 500 | diff -Naur bootscripts.orig/lfs/sysconfig/network-devices/ifdown bootscripts/lfs/sysconfig/network-devices/ifdown
|
---|
| 501 | --- bootscripts.orig/lfs/sysconfig/network-devices/ifdown 2005-07-01 19:03:03.000000000 +0000
|
---|
| 502 | +++ bootscripts/lfs/sysconfig/network-devices/ifdown 2005-07-01 19:04:01.000000000 +0000
|
---|
| 503 | @@ -69,6 +69,7 @@
|
---|
| 504 | IFCONFIG=${file} ${network_devices}/services/${SERVICE} ${1} down
|
---|
| 505 | else
|
---|
| 506 | boot_mesg "Interface ${1} doesn't exist." ${WARNING}
|
---|
| 507 | + putlcd "Interface ${1}" "doesn't exist."
|
---|
| 508 | echo_warning
|
---|
| 509 | fi
|
---|
| 510 | else
|
---|
| 511 | @@ -86,6 +87,7 @@
|
---|
| 512 | if [ -n "${link_status}" ]; then
|
---|
| 513 | if echo "${link_status}" | grep -q UP; then
|
---|
| 514 | boot_mesg "Bringing down the ${1} interface..."
|
---|
| 515 | + putlcd "Bringing down" "${1} interface"
|
---|
| 516 | ip link set ${1} down
|
---|
| 517 | evaluate_retval
|
---|
| 518 | fi
|
---|
| 519 | diff -Naur bootscripts.orig/lfs/sysconfig/network-devices/ifup bootscripts/lfs/sysconfig/network-devices/ifup
|
---|
| 520 | --- bootscripts.orig/lfs/sysconfig/network-devices/ifup 2005-07-01 19:03:03.000000000 +0000
|
---|
| 521 | +++ bootscripts/lfs/sysconfig/network-devices/ifup 2005-07-01 19:04:01.000000000 +0000
|
---|
| 522 | @@ -31,6 +31,7 @@
|
---|
| 523 | fi
|
---|
| 524 |
|
---|
| 525 | boot_mesg "Bringing up the ${1} interface..."
|
---|
| 526 | +putlcd "Bringing up" "${1} interface"
|
---|
| 527 | boot_mesg_flush
|
---|
| 528 |
|
---|
| 529 | # Process each configruation file
|
---|
| 530 | @@ -71,6 +72,7 @@
|
---|
| 531 | fi
|
---|
| 532 | else
|
---|
| 533 | boot_mesg "Interface ${1} doesn't exist." ${WARNING}
|
---|
| 534 | + putlcd "Interface ${1}" "doesn't exist."
|
---|
| 535 | echo_warning
|
---|
| 536 | continue
|
---|
| 537 | fi
|
---|
| 538 | diff -Naur bootscripts.orig/lfs/sysconfig/network-devices/services/ipv4-static bootscripts/lfs/sysconfig/network-devices/services/ipv4-static
|
---|
| 539 | --- bootscripts.orig/lfs/sysconfig/network-devices/services/ipv4-static 2005-07-01 19:03:03.000000000 +0000
|
---|
| 540 | +++ bootscripts/lfs/sysconfig/network-devices/services/ipv4-static 2005-07-01 19:04:01.000000000 +0000
|
---|
| 541 | @@ -50,6 +50,7 @@
|
---|
| 542 | case "${2}" in
|
---|
| 543 | up)
|
---|
| 544 | boot_mesg "Adding IPv4 address ${IP} to the ${1} interface..."
|
---|
| 545 | + putlcd "Setting" "${1} IP - ${IP}"
|
---|
| 546 | ip addr add ${args} dev ${1}
|
---|
| 547 | evaluate_retval
|
---|
| 548 |
|
---|
| 549 | @@ -59,6 +60,7 @@
|
---|
| 550 | echo_warning
|
---|
| 551 | else
|
---|
| 552 | boot_mesg "Setting up default gateway..."
|
---|
| 553 | + putlcd "Setting up" "default gateway"
|
---|
| 554 | ip route add default via ${GATEWAY} dev ${1}
|
---|
| 555 | evaluate_retval
|
---|
| 556 | fi
|
---|
| 557 | @@ -68,11 +70,13 @@
|
---|
| 558 | down)
|
---|
| 559 | if [ -n "${GATEWAY}" ]; then
|
---|
| 560 | boot_mesg "Removing default gateway..."
|
---|
| 561 | + putlcd "Removing" "default gateway"
|
---|
| 562 | ip route del default
|
---|
| 563 | evaluate_retval
|
---|
| 564 | fi
|
---|
| 565 |
|
---|
| 566 | boot_mesg "Removing IPv4 address ${IP} from the ${1} interface..."
|
---|
| 567 | + putlcd "Unsetting" "${1} IP - ${IP}"
|
---|
| 568 | ip addr del ${args} dev ${1}
|
---|
| 569 | evaluate_retval
|
---|
| 570 | ;;
|
---|
| 571 | diff -Naur bootscripts.orig/lfs/sysconfig/network-devices/services/ipv4-static-route bootscripts/lfs/sysconfig/network-devices/services/ipv4-static-route
|
---|
| 572 | --- bootscripts.orig/lfs/sysconfig/network-devices/services/ipv4-static-route 2005-07-01 19:03:03.000000000 +0000
|
---|
| 573 | +++ bootscripts/lfs/sysconfig/network-devices/services/ipv4-static-route 2005-07-01 19:04:01.000000000 +0000
|
---|
| 574 | @@ -74,12 +74,14 @@
|
---|
| 575 | case "${2}" in
|
---|
| 576 | up)
|
---|
| 577 | boot_mesg "Adding '${desc}' route to the ${1} interface..."
|
---|
| 578 | + putlcd "Adding route" "${desc}"
|
---|
| 579 | ip route add ${args} dev ${1}
|
---|
| 580 | evaluate_retval
|
---|
| 581 | ;;
|
---|
| 582 |
|
---|
| 583 | down)
|
---|
| 584 | boot_mesg "Removing '${desc}' route from the ${1} interface..."
|
---|
| 585 | + putlcd "Removing route" "${desc}"
|
---|
| 586 | ip route del ${args} dev ${1}
|
---|
| 587 | evaluate_retval
|
---|
| 588 | ;;
|
---|