summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <tnut at nutyx dot com>2011-05-16 19:31:28 +0200
committertnut <tnut at nutyx dot com>2011-05-16 19:31:28 +0200
commit32fcf0fe87880a5992a902714e99c147d1574893 (patch)
tree54e0e70365657676c2811e6b8968e63946aeb2e1
parentad7a3983ceaaf8a3c4e6cd7c0278724908fd971d (diff)
parentd71c91db2c4577d8fe6fac4a6385ca81dbc8190d (diff)
downloadnutyx-pakxe-32fcf0fe87880a5992a902714e99c147d1574893.tar.gz
nutyx-pakxe-32fcf0fe87880a5992a902714e99c147d1574893.tar.bz2
nutyx-pakxe-32fcf0fe87880a5992a902714e99c147d1574893.tar.xz
nutyx-pakxe-32fcf0fe87880a5992a902714e99c147d1574893.zip
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
-rw-r--r--base/aaabasicfs/.footprint.i6868
-rw-r--r--base/aaabasicfs/.footprint.x86_6414
-rw-r--r--base/aaabasicfs/.md5sum.i6866
-rw-r--r--base/aaabasicfs/.md5sum.x86_648
-rw-r--r--base/aaabasicfs/Pkgfile7
-rw-r--r--base/aaabasicfs/fstab2
-rw-r--r--base/aaabasicfs/inittab6
7 files changed, 26 insertions, 25 deletions
diff --git a/base/aaabasicfs/.footprint.i686 b/base/aaabasicfs/.footprint.i686
index ffc6b3ac8..5797b10f9 100644
--- a/base/aaabasicfs/.footprint.i686
+++ b/base/aaabasicfs/.footprint.i686
@@ -13,6 +13,7 @@ drwxr-xr-x root/root etc/default/
-rw-r--r-- root/root etc/group
-rw-r--r-- root/root etc/inittab
-rw-r--r-- root/root etc/inputrc
+drwxr-xr-x root/root etc/modprobe.d/
-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/
@@ -168,6 +169,8 @@ lrwxrwxrwx root/root root/resolv.conf -> ../etc/resolv.conf
lrwxrwxrwx root/root root/shells -> ../etc/shells
lrwxrwxrwx root/root root/unmask.sh -> ../etc/profile.d/unmask.sh
lrwxrwxrwx root/root root/useradd -> ../etc/default/useradd
+drwxr-xr-x root/root run/
+-rw-rw-r-- root/utmp run/utmp (EMPTY)
drwxr-xr-x root/root sbin/
drwxr-xr-x root/root srv/
drwxrwxrwt root/root srv/sources/
@@ -236,7 +239,7 @@ 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/
+lrwxrwxrwx root/root var/lock -> ../run/lock
drwxr-xr-x root/root var/log/
-rw-r----- root/root var/log/auth.log (EMPTY)
-rw------- root/root var/log/btmp (EMPTY)
@@ -249,7 +252,6 @@ drwxr-xr-x root/root var/log/
-rw-r--r-- root/root var/log/wtmp (EMPTY)
drwxr-xr-x root/root var/mail/
drwxr-xr-x root/root var/opt/
-drwxr-xr-x root/root var/run/
--rw-rw-r-- root/utmp var/run/utmp (EMPTY)
+lrwxrwxrwx root/root var/run -> ../run
drwxr-xr-x root/root var/spool/
drwxrwxrwt root/root var/tmp/
diff --git a/base/aaabasicfs/.footprint.x86_64 b/base/aaabasicfs/.footprint.x86_64
index c222fad87..b8a7879f0 100644
--- a/base/aaabasicfs/.footprint.x86_64
+++ b/base/aaabasicfs/.footprint.x86_64
@@ -1,7 +1,6 @@
drwxr-xr-x root/root bin/
lrwxrwxrwx root/root bin/sh -> bash
drwxr-xr-x root/root boot/
--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)
@@ -14,6 +13,7 @@ drwxr-xr-x root/root etc/default/
-rw-r--r-- root/root etc/group
-rw-r--r-- root/root etc/inittab
-rw-r--r-- root/root etc/inputrc
+drwxr-xr-x root/root etc/modprobe.d/
-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/
@@ -37,7 +37,7 @@ drwxr-xr-x root/root etc/rc.d/init.d/
-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
--rwxr-xr-- root/root etc/rc.d/init.d/mountkernfs
+-rwxr-xr-- root/root etc/rc.d/init.d/mountvirtfs
-rwxr-xr-x root/root etc/rc.d/init.d/network
-rwxr-xr-- root/root etc/rc.d/init.d/random
-rwxr-xr-- root/root etc/rc.d/init.d/rc
@@ -89,7 +89,7 @@ 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/
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S01mountkernfs -> ../init.d/mountkernfs
+lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S01mountvirtfs -> ../init.d/mountvirtfs
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
@@ -144,7 +144,6 @@ lrwxrwxrwx root/root root/X.sh -> ../etc/profile.d/X.sh
lrwxrwxrwx root/root root/bashrc -> ../etc/bashrc
drwxr-xr-x root/root root/bin/
-rwxr-xr-x root/root root/bin/nu
--rwxr-xr-x root/root root/bin/splashy_stop
lrwxrwxrwx root/root root/clock -> ../etc/sysconfig/clock
lrwxrwxrwx root/root root/console -> ../etc/sysconfig/console
lrwxrwxrwx root/root root/dircolors.sh -> ../etc/profile.d/dircolors.sh
@@ -171,6 +170,8 @@ lrwxrwxrwx root/root root/resolv.conf -> ../etc/resolv.conf
lrwxrwxrwx root/root root/shells -> ../etc/shells
lrwxrwxrwx root/root root/unmask.sh -> ../etc/profile.d/unmask.sh
lrwxrwxrwx root/root root/useradd -> ../etc/default/useradd
+drwxr-xr-x root/root run/
+-rw-rw-r-- root/utmp run/utmp (EMPTY)
drwxr-xr-x root/root sbin/
drwxr-xr-x root/root srv/
drwxrwxrwt root/root srv/sources/
@@ -240,7 +241,7 @@ 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/
+lrwxrwxrwx root/root var/lock -> ../run/lock
drwxr-xr-x root/root var/log/
-rw-r----- root/root var/log/auth.log (EMPTY)
-rw------- root/root var/log/btmp (EMPTY)
@@ -253,7 +254,6 @@ drwxr-xr-x root/root var/log/
-rw-r--r-- root/root var/log/wtmp (EMPTY)
drwxr-xr-x root/root var/mail/
drwxr-xr-x root/root var/opt/
-drwxr-xr-x root/root var/run/
--rw-rw-r-- root/utmp var/run/utmp (EMPTY)
+lrwxrwxrwx root/root var/run -> ../run
drwxr-xr-x root/root var/spool/
drwxrwxrwt root/root var/tmp/
diff --git a/base/aaabasicfs/.md5sum.i686 b/base/aaabasicfs/.md5sum.i686
index 0c2625d57..4b409fb74 100644
--- a/base/aaabasicfs/.md5sum.i686
+++ b/base/aaabasicfs/.md5sum.i686
@@ -2,11 +2,11 @@ b9bdd0860e6e4810f5b5e094e4d50aa4 X.sh
61ba4859757a54bf1f514de5213802e0 bash_profile
f29eb765bd7c24471d055cc72b0edd4e bashrc
3974f1b4242908346f309b096a7a6ed6 bashrc.etc
-b7f67cb6cdc94937e9a13fc22b387305 blfs-bootscripts-20100825.tar.bz2
+deb0289f1ce9bac5cfd09c869648a6d3 blfs-bootscripts-20100825.tar.bz2
248d4faa838949085a51003b2c0c3f00 dircolors.sh
ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh
-0286a09ca5d7515c29ad5ff8f88fb9f3 fstab
-1878700f891b205d12dd93bf86ab1739 inittab
+64514eb39b4878f060065cab28191ee5 fstab
+4e641aa7a51f285c0a832b8a7dd8ed29 inittab
2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc
7a45a1acf3566ca924f9a32f069bd7f2 lfs-bootscripts-02.patch
5041ee97992e3f10d3be44f46a6aeb76 lfs-bootscripts-20110424.tar.bz2
diff --git a/base/aaabasicfs/.md5sum.x86_64 b/base/aaabasicfs/.md5sum.x86_64
index 2ca3d4683..4b409fb74 100644
--- a/base/aaabasicfs/.md5sum.x86_64
+++ b/base/aaabasicfs/.md5sum.x86_64
@@ -5,16 +5,14 @@ f29eb765bd7c24471d055cc72b0edd4e bashrc
deb0289f1ce9bac5cfd09c869648a6d3 blfs-bootscripts-20100825.tar.bz2
248d4faa838949085a51003b2c0c3f00 dircolors.sh
ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh
-0286a09ca5d7515c29ad5ff8f88fb9f3 fstab
-1878700f891b205d12dd93bf86ab1739 inittab
+64514eb39b4878f060065cab28191ee5 fstab
+4e641aa7a51f285c0a832b8a7dd8ed29 inittab
2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc
7a45a1acf3566ca924f9a32f069bd7f2 lfs-bootscripts-02.patch
-fce16832185920c8bea816cb2ebb2b28 lfs-bootscripts-20100627.tar.bz2
-ba5337b24f90372dba3d7211f8f25531 message
+5041ee97992e3f10d3be44f46a6aeb76 lfs-bootscripts-20110424.tar.bz2
f6c548de7fc44b0fbc503ba0189d5c91 network
4f193837349d63e6c98501f221904170 nu
210fdabd07248f79617508807715167b profile
b860cf492e983f400666fa43c00f2954 rc
fa6ce99e0329c7854e0a83d022da6fe3 readline.sh
-3abdd4fb506d50cc5fabdc362dc61925 splashy_stop
87a81331c2241707ab494584eb49a80b unmask.sh
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile
index 2bf92a15c..80ac2ac94 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,6 @@ 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/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: