maj aaabasicfs#2010-1, version finale de attapu

5 files changed, 8 insertions, 13 deletions

diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum
index 6dc3d755c..3201b1a2b 100644
--- a/base/aaabasicfs/.md5sum
+++ b/base/aaabasicfs/.md5sum
@@ -1,7 +1,6 @@
 f6b42961b3c2bd3b2e0bf0082d80d216  X.sh
 61ba4859757a54bf1f514de5213802e0  bash_profile
-427f04bb0e7ba3394054a1215fdca87c  bashrc
-427f04bb0e7ba3394054a1215fdca87c  bashrc
+f29eb765bd7c24471d055cc72b0edd4e  bashrc
 3974f1b4242908346f309b096a7a6ed6  bashrc.etc
 30929d5b1257b82b1a78060219244410  blfs-bootscripts-20090302.tar.bz2
 248d4faa838949085a51003b2c0c3f00  dircolors.sh
@@ -12,11 +11,11 @@ ad457024fe7ad91b8e9e0b4aad87df1f  extrapaths.sh
 2ca09cd10bcc4f6adb0c5b1521bfdb7e  inputrc
 7a45a1acf3566ca924f9a32f069bd7f2  lfs-bootscripts-02.patch
 4e2813dd1b50f16f64e6e9f8455fc6aa  lfs-bootscripts-20100627.tar.bz2
-4e77d38062489bdd53d0eb9065a37b3e  message
+ba5337b24f90372dba3d7211f8f25531  message
 f6c548de7fc44b0fbc503ba0189d5c91  network
 4f193837349d63e6c98501f221904170  nu
 210fdabd07248f79617508807715167b  profile
-8581f546f9dce86f2f04be09cc7773ad  rc
+b860cf492e983f400666fa43c00f2954  rc
 fa6ce99e0329c7854e0a83d022da6fe3  readline.sh
 3abdd4fb506d50cc5fabdc362dc61925  splashy_stop
 87a81331c2241707ab494584eb49a80b  unmask.sh
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 424f21258..fbb46d413 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -5,14 +5,14 @@
 
 name=aaabasicfs
 version=2010
-release=24082010
+release=1
 scriptsversion=lfs-bootscripts-20100627
 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 fstab inittab message inputrc network rc splashy_stop\
  profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc lfs-bootscripts-02.patch \
- nu readline.sh unmask.sh X.sh bashrc )
+ nu readline.sh unmask.sh X.sh )
 
 
 build() {
diff --git a/base/aaabasicfs/bashrc b/base/aaabasicfs/bashrc
index 362f07785..316652ac8 100644
--- a/base/aaabasicfs/bashrc
+++ b/base/aaabasicfs/bashrc
@@ -17,7 +17,7 @@ alias ll='ls -l'
 alias l='ls -alh'
 alias duh='du -h --max-depth=1'
 alias dfh='df -h'
-alias get='pkg-get depinst'
+alias get='syn;pkg-get depinst'
 alias build='pkgmk -d -i'
 alias check='syn;pkg-get diff'
 alias del='pkgrm'
diff --git a/base/aaabasicfs/message b/base/aaabasicfs/message
index 8cca65bc8..d01af1603 100644
--- a/base/aaabasicfs/message
+++ b/base/aaabasicfs/message
diff --git a/base/aaabasicfs/rc b/base/aaabasicfs/rc
index 56d61c399..81736e9f5 100755
--- a/base/aaabasicfs/rc
+++ b/base/aaabasicfs/rc
@@ -21,16 +21,12 @@ 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
+    STEPS_DIR=/etc/splashy/steps_dir
+    [ -r "/etc/default/splashy" ] && . "/etc/default/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