diff options
| -rw-r--r-- | base/aaabasicfs/Pkgfile | 14 | ||||
| -rw-r--r-- | base/aaabasicfs/X.sh | 20 | ||||
| -rw-r--r-- | base/aaabasicfs/hosts | 6 |
3 files changed, 14 insertions, 26 deletions
diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index 09f20bd0f..e5a7df4c5 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -4,13 +4,13 @@ # Packager: thierryn1 at hispeed dot ch name=aaabasicfs -version=20110101 +version=20110214 release=1 scriptsversion=lfs-bootscripts-20100627 BLFSscriptsversion=20100825 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\ + fstab inittab message inputrc network rc splashy_stop\ profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc \ http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-02.patch \ nu readline.sh unmask.sh X.sh ) @@ -65,9 +65,10 @@ lp:x:9:9:Print Service User:/dev/null:/bin/false messagebus:x:18:18:D-BUS Message Daemon User:/dev/null:/bin/false haldaemon:x:19:19:HAL Daemon User:/dev/null:/bin/false named:x:20:20:BIND Owner:/home/named:/bin/false -gdm:x:21:21:GDM Daemon User:/dev/null:/bin/bash +gdm:x:21:21:GDM Daemon User:/dev/null:/sbin/nologin fcron:x:22:22:Fcron User:/dev/null:/bin/false -kdm:x:23:23:KDM Daemon User:/dev/null:/bin/bash +kdm:x:23:23:KDM Daemon User:/dev/null:/bin/false +lxdm:24:24:LXDM Daemon User:/dev/null:/sbin/nologin apache:x:25:25:Apache Server:/dev/null:/bin/false smmsp:x:26:26:Sendmail Daemon:/dev/null:/bin/false polkituser:x:27:27:Policy Kit Daemon User:/dev/null:/bin/false @@ -104,9 +105,10 @@ network:x:17: messagebus:x:18: haldaemon:x:19: named:x:20: -gdm:x:21: +gdm:x:21:gdm fcron:x:22: kdm:x:23:kdm +lxdm:x:24:lxdm apache:x:25: smmsp:x:26: polkituser:x:27: @@ -165,7 +167,7 @@ EOF rm $PKG/etc/sysconfig/createfiles # Configuration files - cp -v {hosts,fstab,inittab,profile,inputrc,bashrc.etc} $PKG/etc/ + cp -v {fstab,inittab,profile,inputrc,bashrc.etc} $PKG/etc/ mv $PKG/etc/bashrc.etc $PKG/etc/bashrc cp -v {dircolors.sh,extrapaths.sh,readline.sh,unmask.sh,X.sh}\ $PKG/etc/profile.d/ diff --git a/base/aaabasicfs/X.sh b/base/aaabasicfs/X.sh index 68f92540d..2f9923c87 100644 --- a/base/aaabasicfs/X.sh +++ b/base/aaabasicfs/X.sh @@ -1,20 +1,12 @@ -export GNOME_PREFIX=/usr -export GNOME_LIBCONFIG_PATH=/usr/lib:$GNOME_PREFIX/lib -export LIBGLADE_MODULE_PATH=$GNOME_PREFIX/lib/libglade/2.0 +export GNOME_LIBCONFIG_PATH=/usr/lib +export LIBGLADE_MODULE_PATH=/usr/lib/libglade/2.0 export QTDIR=/opt/qt -export KDE_PREFIX=/opt/kde -export KDEDIR=$KDE_PREFIX -export MANPATH=$MANPATH:$GNOME_PREFIX/man:$KDEDIR/man -export PATH=$PATH:$GNOME_PREFIX/bin:$KDE_PREFIX/bin -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$GNOME_PREFIX/lib/pkgconfig:\ -$GNOME_PREFIX/share/pkgconfig:/opt/qt/lib/pkgconfig -export INFOPATH=/usr/share/info:$GNOME_PREFIX/share/info:$KDE_PREFIX/share/info -export PYTHONPATH=/usr/lib/python2.7/site-packages:\ -$GNOME_PREFIX/lib/python2.7/site-packages:\ -$GNOME_PREFIX/lib/python2.7/site-packages/GMenuSimpleEditor +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig +export INFOPATH=/usr/share/info +export PYTHONPATH=/usr/lib/python2.7/site-packages:/usr/lib/python2.7/site-packages/GMenuSimpleEditor if [ -x /usr/X11R6/bin/X ]; then pathappend /usr/X11R6/bin - XDG_DATA_DIRS=/usr/share:$GNOME_PREFIX/share:/usr/share/akonadi/agents:/usr/local/share + XDG_DATA_DIRS=/usr/share:/usr/share/akonadi/agents:/usr/local/share XDG_CONFIG_DIRS=/etc/gnome/xdg:/etc/kde/xdg:/etc/xdg export XDG_DATA_DIRS XDG_CONFIG_DIRS diff --git a/base/aaabasicfs/hosts b/base/aaabasicfs/hosts deleted file mode 100644 index 1ba5cb9da..000000000 --- a/base/aaabasicfs/hosts +++ /dev/null @@ -1,6 +0,0 @@ -# Begin /etc/hosts - -127.0.0.1 localhost.localdomain localhost -127.0.0.1 nutyx - -# End /etc/hosts |