summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-06-20 15:43:51 +0200
committertnut <thierryn1 at hispeed dot ch>2010-06-20 15:43:51 +0200
commit335fe3e7e27ac68852f5b4e6f3ad7518695058bd (patch)
treeccba944a35807b0701f138f3ecde7bba0222cd67
parenta10707e2849ef332c87b1e3afa0552a999bcc8db (diff)
downloadnutyx-extra-335fe3e7e27ac68852f5b4e6f3ad7518695058bd.tar.gz
nutyx-extra-335fe3e7e27ac68852f5b4e6f3ad7518695058bd.tar.bz2
nutyx-extra-335fe3e7e27ac68852f5b4e6f3ad7518695058bd.tar.xz
nutyx-extra-335fe3e7e27ac68852f5b4e6f3ad7518695058bd.zip
aaabasicfs, ptis ajustement pour rc2
-rw-r--r--base/aaabasicfs/.footprint10
-rw-r--r--base/aaabasicfs/.md5sum3
-rw-r--r--base/aaabasicfs/Pkgfile7
-rw-r--r--base/aaabasicfs/console7
-rwxr-xr-xbase/aaabasicfs/nu2
5 files changed, 13 insertions, 16 deletions
diff --git a/base/aaabasicfs/.footprint b/base/aaabasicfs/.footprint
index 1ba3e2ac7..74c2fa46e 100644
--- a/base/aaabasicfs/.footprint
+++ b/base/aaabasicfs/.footprint
@@ -33,6 +33,7 @@ drwxr-xr-x root/root etc/rc.d/init.d/
-rwxr-xr-- root/root etc/rc.d/init.d/console
-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/gpm
-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
@@ -52,6 +53,7 @@ drwxr-xr-x root/root etc/rc.d/init.d/
-rwxr-xr-- root/root etc/rc.d/init.d/udev
-rwxr-xr-- root/root etc/rc.d/init.d/udev_retry
drwxr-xr-x root/root etc/rc.d/rc0.d/
+lrwxrwxrwx root/root etc/rc.d/rc0.d/K10gpm -> ../init.d/gpm
lrwxrwxrwx root/root etc/rc.d/rc0.d/K45random -> ../init.d/random
lrwxrwxrwx root/root etc/rc.d/rc0.d/K80network -> ../init.d/network
lrwxrwxrwx root/root etc/rc.d/rc0.d/K90sysklogd -> ../init.d/sysklogd
@@ -61,6 +63,7 @@ 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/
+lrwxrwxrwx root/root etc/rc.d/rc1.d/K10gpm -> ../init.d/gpm
lrwxrwxrwx root/root etc/rc.d/rc1.d/K80network -> ../init.d/network
lrwxrwxrwx root/root etc/rc.d/rc1.d/K90sysklogd -> ../init.d/sysklogd
lrwxrwxrwx root/root etc/rc.d/rc1.d/S25random -> ../init.d/random
@@ -68,19 +71,24 @@ drwxr-xr-x root/root etc/rc.d/rc2.d/
lrwxrwxrwx root/root etc/rc.d/rc2.d/K90sysklogd -> ../init.d/sysklogd
lrwxrwxrwx root/root etc/rc.d/rc2.d/S20network -> ../init.d/network
lrwxrwxrwx root/root etc/rc.d/rc2.d/S25random -> ../init.d/random
+lrwxrwxrwx root/root etc/rc.d/rc2.d/S70gpm -> ../init.d/gpm
drwxr-xr-x root/root etc/rc.d/rc3.d/
lrwxrwxrwx root/root etc/rc.d/rc3.d/S10sysklogd -> ../init.d/sysklogd
lrwxrwxrwx root/root etc/rc.d/rc3.d/S20network -> ../init.d/network
lrwxrwxrwx root/root etc/rc.d/rc3.d/S25random -> ../init.d/random
+lrwxrwxrwx root/root etc/rc.d/rc3.d/S70gpm -> ../init.d/gpm
drwxr-xr-x root/root etc/rc.d/rc4.d/
lrwxrwxrwx root/root etc/rc.d/rc4.d/S10sysklogd -> ../init.d/sysklogd
lrwxrwxrwx root/root etc/rc.d/rc4.d/S20network -> ../init.d/network
lrwxrwxrwx root/root etc/rc.d/rc4.d/S25random -> ../init.d/random
+lrwxrwxrwx root/root etc/rc.d/rc4.d/S70gpm -> ../init.d/gpm
drwxr-xr-x root/root etc/rc.d/rc5.d/
lrwxrwxrwx root/root etc/rc.d/rc5.d/S10sysklogd -> ../init.d/sysklogd
lrwxrwxrwx root/root etc/rc.d/rc5.d/S20network -> ../init.d/network
lrwxrwxrwx root/root etc/rc.d/rc5.d/S25random -> ../init.d/random
+lrwxrwxrwx root/root etc/rc.d/rc5.d/S70gpm -> ../init.d/gpm
drwxr-xr-x root/root etc/rc.d/rc6.d/
+lrwxrwxrwx root/root etc/rc.d/rc6.d/K10gpm -> ../init.d/gpm
lrwxrwxrwx root/root etc/rc.d/rc6.d/K45random -> ../init.d/random
lrwxrwxrwx root/root etc/rc.d/rc6.d/K80network -> ../init.d/network
lrwxrwxrwx root/root etc/rc.d/rc6.d/K90sysklogd -> ../init.d/sysklogd
@@ -110,9 +118,7 @@ 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/console
-rw-r--r-- root/root etc/sysconfig/modules
--rw-r--r-- root/root etc/sysconfig/network
drwxr-xr-x root/root etc/sysconfig/network-devices/
-rwxr-xr-- root/root etc/sysconfig/network-devices/ifdown
-rwxr-xr-- root/root etc/sysconfig/network-devices/ifup
diff --git a/base/aaabasicfs/.md5sum b/base/aaabasicfs/.md5sum
index 4307fb1ec..76781fea9 100644
--- a/base/aaabasicfs/.md5sum
+++ b/base/aaabasicfs/.md5sum
@@ -4,7 +4,6 @@ f6b42961b3c2bd3b2e0bf0082d80d216 X.sh
427f04bb0e7ba3394054a1215fdca87c bashrc
3974f1b4242908346f309b096a7a6ed6 bashrc.etc
30929d5b1257b82b1a78060219244410 blfs-bootscripts-20090302.tar.bz2
-94e5b6c4017e28684a683d39cbe4c72a console
248d4faa838949085a51003b2c0c3f00 dircolors.sh
ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh
0286a09ca5d7515c29ad5ff8f88fb9f3 fstab
@@ -15,7 +14,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh
472830fe082dc77a1d30c8b2bd6b5079 lfs-bootscripts-20100529.tar.bz2
4e77d38062489bdd53d0eb9065a37b3e message
f6c548de7fc44b0fbc503ba0189d5c91 network
-5478e2141b3d5504cd201b23dcc70531 nu
+4f193837349d63e6c98501f221904170 nu
210fdabd07248f79617508807715167b profile
8581f546f9dce86f2f04be09cc7773ad rc
fa6ce99e0329c7854e0a83d022da6fe3 readline.sh
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 6805e39f6..1b65ea798 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -10,7 +10,7 @@ scriptsversion=lfs-bootscripts-20100529
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 rc \
+ hosts 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 )
@@ -163,8 +163,6 @@ EOF
mv $PKG/etc/bashrc.etc $PKG/etc/bashrc
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
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
@@ -179,9 +177,10 @@ EOF
echo "scriptsversion=$BLFSscriptsversion" >> $PKG/var/lib/pkg/blfs-bootscripts
ln -s /var/lib/pkg/blfs-bootscripts $PKG/etc/blfs-bootscripts
cp -v message $PKG/boot/
- # Install Random Number Generation
+ # Install Random Number Generation and Mouse
cd $SRC/blfs-bootscripts-$BLFSscriptsversion
make DESTDIR=$PKG install-random
+ make DESTDIR=$PKG install-gpm
cat > $PKG/etc/skel/.dmrc << "EOF"
[Desktop]
diff --git a/base/aaabasicfs/console b/base/aaabasicfs/console
deleted file mode 100644
index 7963f5c30..000000000
--- a/base/aaabasicfs/console
+++ /dev/null
@@ -1,7 +0,0 @@
-# Begin /etc/sysconfig/console
-
-KEYMAP="fr-latin9.map"
-FONT="lat0-16 -m 8859-15"
-UNICODE="1"
-
-# End /etc/sysconfig/console
diff --git a/base/aaabasicfs/nu b/base/aaabasicfs/nu
index 214a019b1..3ba4434e6 100755
--- a/base/aaabasicfs/nu
+++ b/base/aaabasicfs/nu
@@ -6,7 +6,7 @@
######################################
user_groups=""
-default_groups=(users disk network floppy fuse video lp audio cdrom halusers scanner)
+default_groups=(users disk network floppy fuse video lp tty audio cdrom halusers scanner)
# Avoid spaces troubles :)
OLD_IFS=$IFS