From ae058815d84ed3ead6e7dff07df320970bffabf8 Mon Sep 17 00:00:00 2001 From: Thierry N Date: Tue, 29 Sep 2009 22:22:43 +0200 Subject: maj aaabasicfs#2009.1-beta2 --- base/aaabasicfs/.footprint | 17 ++++++++--------- base/aaabasicfs/.md5sum | 4 ++-- base/aaabasicfs/Pkgfile | 28 +++++++++++++++------------- base/aaabasicfs/message | Bin 0 -> 608768 bytes 4 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 base/aaabasicfs/message (limited to 'base/aaabasicfs') diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint index 515cc8739..8cd831ac0 100644 --- a/base/aaabasicfs/.footprint +++ b/base/aaabasicfs/.footprint @@ -1,8 +1,7 @@ drwxr-xr-x root/root bin/ lrwxrwxrwx root/root bin/sh -> bash drwxr-xr-x root/root boot/ -drwxr-xr-x root/root boot/grub/ --rw-r--r-- root/root boot/grub/menu.lst +-rw-r--r-- root/root boot/message drwxr-xr-x root/root dev/ crw------- root/root dev/console (5, 1) crw-rw-rw- root/root dev/null (1, 3) @@ -57,8 +56,8 @@ drwxr-xr-x root/root etc/rc.d/rc0.d/ lrwxrwxrwx root/root etc/rc.d/rc0.d/K80network -> ../init.d/network lrwxrwxrwx root/root etc/rc.d/rc0.d/K90sysklogd -> ../init.d/sysklogd lrwxrwxrwx root/root etc/rc.d/rc0.d/S60sendsignals -> ../init.d/sendsignals -lrwxrwxrwx root/root etc/rc.d/rc0.d/S70mountfs -> ../init.d/mountfs -lrwxrwxrwx root/root etc/rc.d/rc0.d/S80swap -> ../init.d/swap +lrwxrwxrwx root/root etc/rc.d/rc0.d/S70swap -> ../init.d/swap +lrwxrwxrwx root/root etc/rc.d/rc0.d/S80mountfs -> ../init.d/mountfs lrwxrwxrwx root/root etc/rc.d/rc0.d/S90localnet -> ../init.d/localnet lrwxrwxrwx root/root etc/rc.d/rc0.d/S99halt -> ../init.d/halt drwxr-xr-x root/root etc/rc.d/rc1.d/ @@ -80,8 +79,8 @@ drwxr-xr-x root/root etc/rc.d/rc6.d/ lrwxrwxrwx root/root etc/rc.d/rc6.d/K80network -> ../init.d/network lrwxrwxrwx root/root etc/rc.d/rc6.d/K90sysklogd -> ../init.d/sysklogd lrwxrwxrwx root/root etc/rc.d/rc6.d/S60sendsignals -> ../init.d/sendsignals -lrwxrwxrwx root/root etc/rc.d/rc6.d/S70mountfs -> ../init.d/mountfs -lrwxrwxrwx root/root etc/rc.d/rc6.d/S80swap -> ../init.d/swap +lrwxrwxrwx root/root etc/rc.d/rc6.d/S70swap -> ../init.d/swap +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/ @@ -89,9 +88,9 @@ lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S00mountkernfs -> ../init.d/mountkernf 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 -lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S20swap -> ../init.d/swap -lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S30checkfs -> ../init.d/checkfs -lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S40mountfs -> ../init.d/mountfs +lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S20checkfs -> ../init.d/checkfs +lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S30mountfs -> ../init.d/mountfs +lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S40swap -> ../init.d/swap lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S45cleanfs -> ../init.d/cleanfs lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S50udev_retry -> ../init.d/udev_retry lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S70console -> ../init.d/console diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum index cbe2feea2..88553dd66 100644 --- a/base/aaabasicfs/.md5sum +++ b/base/aaabasicfs/.md5sum @@ -14,8 +14,8 @@ ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh 7af11664c8a127c2d1e71ee3237ab543 i18n.sh 255dba011debefe08813959042bb56b4 inittab 2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc -d2d497718127e161a28ef4a9429e29ed lfs-bootscripts-20090523.tar.bz2 -a78518513008df089590b10ae3a3cded menu.lst +c4d94790cc698886eba4f81b0c91cc5f lfs-bootscripts-20090817.tar.bz2 +f2cdde506d446113e04153e5695adb2a message c90e6466720260c377c89f5aa0c47eca network 5478e2141b3d5504cd201b23dcc70531 nu 210fdabd07248f79617508807715167b profile diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index a3a2a623d..259800884 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -5,11 +5,11 @@ # Depends on: name=aaabasicfs -version=2009 -release=1 -scriptsversion=lfs-bootscripts-20090523 +version=2009.1 +release=beta2 +scriptsversion=lfs-bootscripts-20090817 source=( http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2\ - hosts clock console fstab inittab menu.lst inputrc network xorg.conf \ + hosts clock console fstab inittab message inputrc network xorg.conf \ profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc \ blfs-bootscripts nu readline.sh unmask.sh X.sh i18n.sh bashrc sysklogd cleanfs) @@ -45,7 +45,7 @@ build() { # Creating essential Files and Symlinks touch $PKG/etc/mtab ln -sv bash $PKG/bin/sh - echo "2009" > $PKG/etc/nutyx-version + echo "$version-$release" > $PKG/etc/nutyx-version cat > $PKG/etc/shells << "EOF" /bin/sh /bin/bash @@ -147,14 +147,8 @@ EOF cp sysklogd $PKG/etc/rc.d/init.d/ cp cleanfs $PKG/etc/rc.d/init.d/ - mkdir -v $PKG/boot/grub - cp -v menu.lst $PKG/boot/grub/ - if [ `uname -m` == "x86_64" ]; then - sed -i "s|boot/kernel|boot/kernel_64|" \ - $PKG/boot/grub/menu.lst - sed -i "s|nutyx-initrd|nutyx-initrd_64|" \ - $PKG/boot/grub/menu.lst - fi + cp -v message $PKG/boot/ + cat > $PKG/etc/skel/.dmrc << "EOF" [Desktop] Session= @@ -192,4 +186,12 @@ EOF ln -s ../etc/pkg-get.conf ln -s ../etc/pkgadd.conf ln -s ../etc/pkgmk.conf + for i in rc0.d rc6.d + do + mv $PKG/etc/rc.d/$i/S{80,70}swap + mv $PKG/etc/rc.d/$i/S{70,80}mountfs + done + 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/message b/base/aaabasicfs/message new file mode 100644 index 000000000..34d9db279 Binary files /dev/null and b/base/aaabasicfs/message differ -- cgit v1.2.3-54-g00ecf