diff options
| -rw-r--r-- | base/aaabasicfs/.footprint | 2 | ||||
| -rw-r--r-- | base/aaabasicfs/.md5sum | 3 | ||||
| -rw-r--r-- | base/aaabasicfs/Pkgfile | 9 | ||||
| -rw-r--r-- | base/aaabasicfs/inittab | 32 | ||||
| -rwxr-xr-x | base/aaabasicfs/rc | 116 |
5 files changed, 149 insertions, 13 deletions
diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint index 6d565116d..1ba3e2ac7 100644 --- a/base/aaabasicfs/.footprint +++ b/base/aaabasicfs/.footprint @@ -90,7 +90,7 @@ lrwxrwxrwx root/root etc/rc.d/rc6.d/S80mountfs -> ../init.d/mountfs lrwxrwxrwx root/root etc/rc.d/rc6.d/S90localnet -> ../init.d/localnet lrwxrwxrwx root/root etc/rc.d/rc6.d/S99reboot -> ../init.d/reboot drwxr-xr-x root/root etc/rc.d/rcsysinit.d/ -lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S00mountkernfs -> ../init.d/mountkernfs +lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S01mountkernfs -> ../init.d/mountkernfs lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S02consolelog -> ../init.d/consolelog lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S05modules -> ../init.d/modules lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S10udev -> ../init.d/udev diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum index a8e41b53e..6090d7677 100644 --- a/base/aaabasicfs/.md5sum +++ b/base/aaabasicfs/.md5sum @@ -9,7 +9,7 @@ f6b42961b3c2bd3b2e0bf0082d80d216 X.sh ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh 0286a09ca5d7515c29ad5ff8f88fb9f3 fstab 57ddbea584220ac4e74d0504a03721f4 hosts -00ead57ee36e532fa3e88a0a99e2de3b inittab +773f0b8c464ff970b2206d576a822871 inittab 2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc 5d7c952bd09d718298dd60d3b976c349 lfs-bootscripts-01.patch 5a8b2aacde330663828176064c77b72d lfs-bootscripts-20100124.tar.bz2 @@ -17,5 +17,6 @@ ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh f6c548de7fc44b0fbc503ba0189d5c91 network 5478e2141b3d5504cd201b23dcc70531 nu 210fdabd07248f79617508807715167b profile +8581f546f9dce86f2f04be09cc7773ad rc fa6ce99e0329c7854e0a83d022da6fe3 readline.sh 87a81331c2241707ab494584eb49a80b unmask.sh diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index ac743569f..a60a7a25e 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -2,16 +2,15 @@ # URL: http://www.nutyx.org/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: name=aaabasicfs version=2010 -release=rc1a +release=rc2 scriptsversion=lfs-bootscripts-20100124 BLFSscriptsversion=20090302 source=( http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\ http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2 - hosts console fstab inittab message inputrc network \ + hosts console fstab inittab message inputrc network rc \ profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-01.patch \ nu readline.sh unmask.sh X.sh bashrc ) @@ -152,6 +151,7 @@ EOF # Rename network script mv $PKG/etc/rc.d/init.d/{network,iplink} cp $SRC/network $PKG/etc/rc.d/init.d/ + cp $SRC/rc $PKG/etc/rc.d/init.d/ # We want to start the network when init 2 mv $PKG/etc/rc.d/rc2.d/{K80,S20}network cd .. @@ -164,7 +164,7 @@ EOF cp -v {dircolors.sh,extrapaths.sh,readline.sh,unmask.sh,X.sh}\ $PKG/etc/profile.d/ cp -v console $PKG/etc/sysconfig/ - echo "HOSTNAME=nutyx" > $PKG/etc/sysconfig/network + echo "HOSTNAME=NuTyX" > $PKG/etc/sysconfig/network cp -v bash_profile $PKG/etc/skel/.bash_profile cp -v bashrc $PKG/etc/skel/.bashrc ln -s /etc/slim.xinitrc $PKG/etc/skel/.xinitrc @@ -224,6 +224,7 @@ EOF mv $PKG/etc/rc.d/$i/S{70,80}mountfs done ln -s ../init.d/setclock $PKG/etc/rc.d/rcsysinit.d/S15setclock + mv $PKG/etc/rc.d/rcsysinit.d/S{00,01}mountkernfs mv $PKG/etc/rc.d/rcsysinit.d/S{20,40}swap mv $PKG/etc/rc.d/rcsysinit.d/S{30,20}checkfs mv $PKG/etc/rc.d/rcsysinit.d/S{40,30}mountfs diff --git a/base/aaabasicfs/inittab b/base/aaabasicfs/inittab index eb33db080..0be544355 100644 --- a/base/aaabasicfs/inittab +++ b/base/aaabasicfs/inittab @@ -4,7 +4,7 @@ # Pour le lancement de gdm: id:4 # Pour le lancement de kdm: id:5 -id:4:initdefault: +id:3:initdefault: si::sysinit:/etc/rc.d/init.d/rc sysinit @@ -20,11 +20,29 @@ ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -h now su:S016:once:/sbin/sulogin -1:2345:respawn:/usr/sbin/qingy tty1 -2:2345:respawn:/usr/sbin/qingy tty2 -3:2345:respawn:/usr/sbin/qingy tty3 -4:2345:respawn:/usr/sbin/qingy tty4 -5:2345:respawn:/usr/sbin/qingy tty5 -6:2345:respawn:/usr/sbin/qingy tty6 +1:2:respawn:/sbin/agetty tty1 9600 +2:2:respawn:/sbin/agetty tty2 9600 +3:2:respawn:/sbin/agetty tty3 9600 +4:2:respawn:/sbin/agetty tty4 9600 +5:2:respawn:/sbin/agetty tty5 9600 +6:2:respawn:/sbin/agetty tty6 9600 + + + +7:3:respawn:/usr/sbin/qingy tty1 +8:3:respawn:/usr/sbin/qingy tty2 +9:3:respawn:/usr/sbin/qingy tty3 +10:3:respawn:/usr/sbin/qingy tty4 +11:3:respawn:/usr/sbin/qingy tty5 +12:3:respawn:/usr/sbin/qingy tty6 + + + +20:4:respawn:/usr/bin/gdm + +30:5:respawn:/usr/bin/kdm + +sp:2345:once:[ -f /sbin/splashy_update ] && /sbin/splashy_update "exit" + # End /etc/inittab diff --git a/base/aaabasicfs/rc b/base/aaabasicfs/rc new file mode 100755 index 000000000..56d61c399 --- /dev/null +++ b/base/aaabasicfs/rc @@ -0,0 +1,116 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/rc +# +# Description : Main Run Level Control Script +# +# Authors : Gerard Beekmans - gerard@linuxfromscratch.org +# +# Version : 00.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +stty sane + +trap "" INT QUIT TSTP + +[ "${1}" != "" ] && runlevel=${1} + +STEPS_DIR=/lib/init/rw/splashy +SPL_UPD=/sbin/splashy_update + + +splashy_update_progress(){ + STEPS_DIR=/lib/init/rw/splashy + SPL_UPD=/sbin/splashy_update + SPL_PRG=$STEPS_DIR/${runlevel}-progress + # load some default variables + [ -r "/etc/default/splashy" ] && . "/etc/default/splashy" + if ! ( pidof splashy > /dev/null ); then + /sbin/splashy boot 2>/dev/null + sleep 1 + else + PER=`sed -n 's+'${1}' ++ p' $SPL_PRG` + $SPL_UPD "progress $PER" + fi +} + +if [ "${runlevel}" = "" ]; then + echo "Usage: ${0} <runlevel>" >&2 + exit 1 +fi + +previous=${PREVLEVEL} +[ "${previous}" = "" ] && previous=N + +if [ ! -d ${rc_base}/rc${runlevel}.d ]; then + boot_mesg "${rc_base}/rc${runlevel}.d does not exist." ${WARNING} + boot_mesg_flush + exit 1 +fi +# Attempt to stop all service started by previous runlevel, +# and killed in this runlevel +if [ "${previous}" != "N" ]; then + for i in $(ls -v ${rc_base}/rc${runlevel}.d/K* 2> /dev/null) + do + check_script_status + + suffix=${i#$rc_base/rc$runlevel.d/K[0-9][0-9]} + prev_start=$rc_base/rc$previous.d/S[0-9][0-9]$suffix + sysinit_start=$rc_base/rcsysinit.d/S[0-9][0-9]$suffix + + if [ "${runlevel}" != "0" ] && [ "${runlevel}" != "6" ]; then + if [ ! -f ${prev_start} ] && [ ! -f ${sysinit_start} ]; then + boot_mesg -n "WARNING:\n\n${i} can't be" ${WARNING} + boot_mesg -n " executed because it was not" + boot_mesg -n " not started in the previous" + boot_mesg -n " runlevel (${previous})." + boot_mesg "" ${NORMAL} + boot_mesg_flush + continue + fi + fi + ${i} stop + error_value=${?} + + if [ "${error_value}" != "0" ]; then + print_error_msg + fi + done +fi + +#Start all functions in this runlevel +for i in $( ls -v ${rc_base}/rc${runlevel}.d/S* 2> /dev/null) +do + if [ "${previous}" != "N" ]; then + suffix=${i#$rc_base/rc$runlevel.d/S[0-9][0-9]} + stop=$rc_base/rc$runlevel.d/K[0-9][0-9]$suffix + prev_start=$rc_base/rc$previous.d/S[0-9][0-9]$suffix + + [ -f ${prev_start} ] && [ ! -f ${stop} ] && continue + fi + + check_script_status + + case ${runlevel} in + 0|6) + [ -f /sbin/splashy ] && splashy_update_progress ${i} + ${i} stop + ;; + *) + [ -f /sbin/splashy ] && splashy_update_progress ${i} + ${i} start + ;; + esac + error_value=${?} + + if [ "${error_value}" != "0" ]; then + print_error_msg + fi +done +# End $rc_base/init.d/rc |