From f4c002f6603c520a27203ec3d07772d9e74c8b57 Mon Sep 17 00:00:00 2001
From: tnut <tnut at nutyx dot com>
Date: Sun, 15 May 2011 19:52:39 +0200
Subject: aaabasicfs, correction du port

---
 base/aaabasicfs/Pkgfile | 15 ++++++++++++---
 base/aaabasicfs/fstab   |  2 +-
 base/aaabasicfs/inittab |  6 +++---
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'base')

diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 2bf92a15c..e5acd43d6 100644
--- a/base/aaabasicfs/Pkgfile
+++ b/base/aaabasicfs/Pkgfile
@@ -20,7 +20,7 @@ source=(  http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsvers
 build() {
        # Creating Directories
        
-	mkdir -pv $PKG/{dev,proc,sys,bin,boot,etc/{profile.d,opt,skel,default},home,lib,mnt,opt,srv/sources}
+	mkdir -pv $PKG/{dev,proc,sys,bin,boot,etc/{modprobe.d,profile.d,opt,skel,default},home,lib,mnt,opt,srv/sources,run}
 	chmod 1777 $PKG/srv/sources
 	mkdir -pv $PKG/{media/{floppy,cdrom,key,dvd},sbin,var}
 	install -dv -m 0750 $PKG/root	
@@ -46,7 +46,9 @@ build() {
  		x86_64) ln -sv lib $PKG/lib64 && ln -sv lib $PKG/usr/lib64 ;;
 	esac
 
-	mkdir -v $PKG/var/{lock,log,mail,run,spool}
+	mkdir -v $PKG/var/{log,mail,spool}
+	ln -sv /run $PKG/var/run
+	ln -sv /run/lock $PKG/var/lock
 	mkdir -pv $PKG/var/{opt,cache,lib/{misc,locate},local}
 	touch $PKG/var/log/{kern.log,auth.log,mail.log,user.log,sys.log,daemon.log,wtmp,btmp}
 	chmod 640 $PKG/var/log/{kern.log,auth.log,mail.log,user.log,sys.log,daemon.log}
@@ -58,7 +60,14 @@ build() {
 	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/modprobe.d/usb.conf << "EOF"
+# Begin /etc/modprobe.d/usb.conf
+
+install ohci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i ohci_hcd ; true
+install uhci_hcd /sbin/modprobe ehci_hcd ; /sbin/modprobe -i uhci_hcd ; true
+
+# End /etc/modprobe.d/usb.conf
+EOF
 	cat > $PKG/etc/shells << "EOF"
 /bin/sh
 /bin/bash
diff --git a/base/aaabasicfs/fstab b/base/aaabasicfs/fstab
index 191b293be..8e4009951 100644
--- a/base/aaabasicfs/fstab
+++ b/base/aaabasicfs/fstab
@@ -7,4 +7,4 @@
 proc           /proc        proc   defaults        0     0
 sysfs          /sys         sysfs  defaults        0     0
 devpts         /dev/pts     devpts gid=4,mode=620  0     0
-shm            /dev/shm     tmpfs  defaults        0     0
+tmpfs		/run	tmpfs	defaults	0	0
diff --git a/base/aaabasicfs/inittab b/base/aaabasicfs/inittab
index ab8b26d8a..d8dac783a 100644
--- a/base/aaabasicfs/inittab
+++ b/base/aaabasicfs/inittab
@@ -1,7 +1,7 @@
 # Begin /etc/inittab
-# Pour le lancement de la console: id:2
-# Pour le lancement de lxdm:  id:4
-# Pour le lancement de kdm:  id:5
+# Pour le lancement de la console: id:3 (defaut si installation de base)
+# Pour le lancement de lxdm:  id:4 (defaut si installation de xfce)
+# Pour le lancement de kdm:  id:5 (defaut si installation de kde)
 
 id:3:initdefault:
 
-- 
cgit v1.2.3-54-g00ecf