diff options
Diffstat (limited to 'base')
| -rw-r--r-- | base/aaabasicfs/.footprint | 7 | ||||
| -rw-r--r-- | base/aaabasicfs/.md5sum | 8 | ||||
| -rw-r--r-- | base/aaabasicfs/Pkgfile | 20 | ||||
| -rw-r--r-- | base/aaabasicfs/blfs-bootscripts | 1 | ||||
| -rw-r--r-- | base/aaabasicfs/clock | 5 | ||||
| -rw-r--r-- | base/aaabasicfs/i18n.sh | 2 | ||||
| -rw-r--r-- | base/aaabasicfs/inittab | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | base/aaabasicfs/network | 46 |
8 files changed, 69 insertions, 29 deletions
diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint index 8164755b1..b021ec33e 100644 --- a/base/aaabasicfs/.footprint +++ b/base/aaabasicfs/.footprint @@ -7,7 +7,7 @@ crw------- root/root dev/console (5, 1) crw-rw-rw- root/root dev/null (1, 3) drwxr-xr-x root/root etc/ -rw-r--r-- root/root etc/bashrc --rw-r--r-- root/root etc/blfs-bootscripts +lrwxrwxrwx root/root etc/blfs-bootscripts -> /var/lib/pkg/blfs-bootscripts drwxr-xr-x root/root etc/default/ -rw-r--r-- root/root etc/default/useradd -rw-r--r-- root/root etc/fstab @@ -16,6 +16,7 @@ drwxr-xr-x root/root etc/default/ -rw-r--r-- root/root etc/inittab -rw-r--r-- root/root etc/inputrc -rw-r--r-- root/root etc/mtab (EMPTY) +lrwxrwxrwx root/root etc/nutyx-version -> /var/lib/pkg/nutyx-version drwxr-xr-x root/root etc/opt/ -rw-r--r-- root/root etc/passwd -rw-r--r-- root/root etc/profile @@ -23,7 +24,6 @@ drwxr-xr-x root/root etc/profile.d/ -rw-r--r-- root/root etc/profile.d/X.sh -rw-r--r-- root/root etc/profile.d/dircolors.sh -rw-r--r-- root/root etc/profile.d/extrapaths.sh --rw-r--r-- root/root etc/profile.d/i18n.sh -rw-r--r-- root/root etc/profile.d/readline.sh -rw-r--r-- root/root etc/profile.d/unmask.sh drwxr-xr-x root/root etc/rc.d/ @@ -34,6 +34,7 @@ drwxr-xr-x root/root etc/rc.d/init.d/ -rwxr-xr-- root/root etc/rc.d/init.d/consolelog -rw-r--r-- root/root etc/rc.d/init.d/functions -rwxr-xr-- root/root etc/rc.d/init.d/halt +-rwxr-xr-- root/root etc/rc.d/init.d/iplink -rwxr-xr-- root/root etc/rc.d/init.d/localnet -rwxr-xr-- root/root etc/rc.d/init.d/modules -rwxr-xr-- root/root etc/rc.d/init.d/mountfs @@ -101,7 +102,6 @@ drwxr-xr-x root/root etc/skel/ -rw-r--r-- root/root etc/skel/.dmrc lrwxrwxrwx root/root etc/skel/.xinitrc -> /etc/slim.xinitrc drwxr-xr-x root/root etc/sysconfig/ --rw-r--r-- root/root etc/sysconfig/clock -rw-r--r-- root/root etc/sysconfig/console -rw-r--r-- root/root etc/sysconfig/modules -rw-r--r-- root/root etc/sysconfig/network @@ -229,6 +229,7 @@ drwxr-xr-x root/root var/lib/ drwxr-xr-x root/root var/lib/locate/ drwxr-xr-x root/root var/lib/misc/ drwxr-xr-x root/root var/lib/pkg/ +-rw-r--r-- root/root var/lib/pkg/blfs-bootscripts -rw-r--r-- root/root var/lib/pkg/nutyx-version drwxr-xr-x root/root var/local/ drwxr-xr-x root/root var/lock/ diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum index 5fad92ff6..28a0be1e7 100644 --- a/base/aaabasicfs/.md5sum +++ b/base/aaabasicfs/.md5sum @@ -3,20 +3,18 @@ f6b42961b3c2bd3b2e0bf0082d80d216 X.sh 427f04bb0e7ba3394054a1215fdca87c bashrc 427f04bb0e7ba3394054a1215fdca87c bashrc 3974f1b4242908346f309b096a7a6ed6 bashrc.etc -7e1cc42a760239d55d1985f574c53e13 blfs-bootscripts -4c0a776082e36f89970a9d7e5b7ff04a clock +f61338e6cd5addbd130c92a1c8533a00 blfs-bootscripts 94e5b6c4017e28684a683d39cbe4c72a console 248d4faa838949085a51003b2c0c3f00 dircolors.sh ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh 0286a09ca5d7515c29ad5ff8f88fb9f3 fstab 57ddbea584220ac4e74d0504a03721f4 hosts -7af11664c8a127c2d1e71ee3237ab543 i18n.sh -255dba011debefe08813959042bb56b4 inittab +9099d0e8faf5da80580c1652c919859a inittab 2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc 5d7c952bd09d718298dd60d3b976c349 lfs-bootscripts-01.patch 5a8b2aacde330663828176064c77b72d lfs-bootscripts-20100124.tar.bz2 4e77d38062489bdd53d0eb9065a37b3e message -c90e6466720260c377c89f5aa0c47eca network +54e851ced646c060f045b9e65344c5ae network 5478e2141b3d5504cd201b23dcc70531 nu 210fdabd07248f79617508807715167b profile fa6ce99e0329c7854e0a83d022da6fe3 readline.sh diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index 393f6a9ce..f310f9dad 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -6,12 +6,12 @@ name=aaabasicfs version=2010 -release=beta-2 +release=beta-3 scriptsversion=lfs-bootscripts-20100124 source=( http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\ - hosts clock console fstab inittab message inputrc network \ + hosts console fstab inittab message inputrc network \ profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-01.patch \ - blfs-bootscripts nu readline.sh unmask.sh X.sh i18n.sh bashrc ) + blfs-bootscripts nu readline.sh unmask.sh X.sh bashrc ) build() { @@ -49,6 +49,8 @@ build() { ln -sv bash $PKG/bin/sh mkdir -p $PKG/var/lib/pkg/ echo "$version-$release" > $PKG/var/lib/pkg/nutyx-version + ln -s /var/lib/pkg/nutyx-version $PKG/etc/nutyx-version + cat > $PKG/etc/shells << "EOF" /bin/sh /bin/bash @@ -143,6 +145,9 @@ EOF cd $scriptsversion patch -Np1 -i ../lfs-bootscripts-01.patch make DESTDIR=$PKG install + # Rename network script + mv $PKG/etc/rc.d/init.d/{network,iplink} + cp $SRC/network $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 .. @@ -152,9 +157,10 @@ EOF # Configuration files cp -v {hosts,fstab,inittab,profile,inputrc,bashrc.etc} $PKG/etc/ mv $PKG/etc/bashrc.etc $PKG/etc/bashrc - cp -v {dircolors.sh,extrapaths.sh,readline.sh,unmask.sh,X.sh,i18n.sh}\ + cp -v {dircolors.sh,extrapaths.sh,readline.sh,unmask.sh,X.sh}\ $PKG/etc/profile.d/ - cp -v {clock,console,network} $PKG/etc/sysconfig/ + cp -v console $PKG/etc/sysconfig/ + 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 @@ -163,8 +169,8 @@ EOF mkdir -p $PKG/root/bin cp -v nu $PKG/root/bin # Customise startup scripts - cp blfs-bootscripts $PKG/etc/ - + cp blfs-bootscripts $PKG/var/lib/pkg/ + ln -s /var/lib/pkg/blfs-bootscripts $PKG/etc/blfs-bootscripts cp -v message $PKG/boot/ cat > $PKG/etc/skel/.dmrc << "EOF" diff --git a/base/aaabasicfs/blfs-bootscripts b/base/aaabasicfs/blfs-bootscripts index 0120d82e3..4e46f2ae2 100644 --- a/base/aaabasicfs/blfs-bootscripts +++ b/base/aaabasicfs/blfs-bootscripts @@ -1,3 +1,2 @@ scripts=blfs-bootscripts scriptsversion=20090302 - diff --git a/base/aaabasicfs/clock b/base/aaabasicfs/clock deleted file mode 100644 index ed6f78bfe..000000000 --- a/base/aaabasicfs/clock +++ /dev/null @@ -1,5 +0,0 @@ -# Begin /etc/sysconfig/clock - -UTC=0 - -# End /etc/sysconfig/clock diff --git a/base/aaabasicfs/i18n.sh b/base/aaabasicfs/i18n.sh deleted file mode 100644 index d9b120941..000000000 --- a/base/aaabasicfs/i18n.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Set up i18n variables -export LANG=fr_CH.utf8 diff --git a/base/aaabasicfs/inittab b/base/aaabasicfs/inittab index 6ff95c892..80dd89214 100644 --- a/base/aaabasicfs/inittab +++ b/base/aaabasicfs/inittab @@ -1,11 +1,10 @@ # Begin /etc/inittab -# Pour le lancement de slim, supprimer le commentaire de la ligne ci-dessous +# Pour le lancement de slim: id:3 +# Pour le lancement de gdm: id:4 +# Pour le lancement de kdm: id:5 + id:4:initdefault: -# Pour le lancement de gdm, supprimer le commentaire de la ligne ci-dessous -# id:4:initdefault: -# Pour le lancement de kdm, supprimer le commentaire la ligne ci-dessous -# id:5:initdefault: si::sysinit:/etc/rc.d/init.d/rc sysinit diff --git a/base/aaabasicfs/network b/base/aaabasicfs/network index 199c848f3..411f85b43 100644..100755 --- a/base/aaabasicfs/network +++ b/base/aaabasicfs/network @@ -1 +1,45 @@ -HOSTNAME=nutyx +#!/bin/sh +# Begin $rc_base/init.d/network + +# Based on sysklogd script from LFS-3.1 and earlier. +# Rewritten by thierryn1@hispeed.ch + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + if [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then + boot_mesg "Starting the wicd Daemon..." + loadproc /usr/share/wicd/daemon/wicd-daemon.py + if grep -v ^# /etc/fstab | grep _netdev > /dev/null; then + while ! grep "nameserver" /etc/resolv.conf ; do sleep 1;done + boot_mesg "Network successfully configured..." + echo_ok + fi + + else + if [ -f /etc/rc.d/init.d/iplink ]; then + /etc/rc.d/init.d/iplink start + fi + fi + ;; + + stop) + if [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then + boot_mesg "Stopping the wicd Daemon..." + loadproc /usr/share/wicd/daemon/wicd-daemon.py --kill + else + if [ -f /etc/rc.d/init.d/iplink ]; then + /etc/rc.d/init.d/iplink stop + fi + fi + ;; + + *) + echo "Usage: $0 {start|stop}" + exit 1 + ;; +esac + +# End $rc_base/init.d/network |