Author: justin
Date: 2005-12-12 23:26:54 -0700 (Mon, 12 Dec 2005)
New Revision: 1275
Modified:
branches/6.1.1-newmake/doc/README
branches/6.1.1-newmake/etc/bashrc
branches/6.1.1-newmake/packages/shadow/Makefile
branches/6.1.1-newmake/vars/vars.x86
Log:
[6.1.1-newmake] Increment VERSION, reverted PS1 changes in bachrc, merged
README change from Alexander from trunk, fixed shadow install which copied
wrong file.
Modified: branches/6.1.1-newmake/doc/README
===================================================================
--- branches/6.1.1-newmake/doc/README 2005-12-13 06:24:01 UTC (rev 1274)
+++ branches/6.1.1-newmake/doc/README 2005-12-13 06:26:54 UTC (rev 1275)
@@ -108,7 +108,7 @@
cd ..
* Make an image contatining those files:
- mkisofs -M lfslivecd-x86-6.1.1-1-[version].iso \
+ mkisofs -M lfslivecd-x86-[version].iso \
-C `cdrecord -msinfo dev=/dev/cdrom` \
-R -o second-session.iso second-session
Modified: branches/6.1.1-newmake/etc/bashrc
===================================================================
--- branches/6.1.1-newmake/etc/bashrc 2005-12-13 06:24:01 UTC (rev 1274)
+++ branches/6.1.1-newmake/etc/bashrc 2005-12-13 06:26:54 UTC (rev 1275)
@@ -10,9 +10,9 @@
# Prompt
if [ `whoami` = "root" ] ; then
- PS1="$BRWHITE\h:$RED\u | $BRWHITE\`date +%c\` $RED|
$GREEN\w$BRWHITE\n$WHITE\\$ "
+ PS1="$BRWHITE\h:$RED\u | $BRWHITE\D{%c} $RED|
$GREEN\w$BRWHITE\n$WHITE\\$ "
else
- PS1="$BRWHITE\h:$GREEN\u | $BRWHITE\`date +%c\` $GREEN| \w\n$BRWHITE\\$
$WHITE"
+ PS1="$BRWHITE\h:$GREEN\u | $BRWHITE\D{%c} $GREEN| \w\n$BRWHITE\\$
$WHITE"
fi
export PS1
Modified: branches/6.1.1-newmake/packages/shadow/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/shadow/Makefile 2005-12-13 06:24:01 UTC
(rev 1274)
+++ branches/6.1.1-newmake/packages/shadow/Makefile 2005-12-13 06:26:54 UTC
(rev 1275)
@@ -30,8 +30,7 @@
sed -e '[EMAIL PROTECTED]@MD5_CRYPT_ENAB yes@' \
-e 's@/var/spool/mail@/var/mail@' \
-e '[EMAIL PROTECTED]@MAIL_CHECK_ENAB no@' \
- -e '[EMAIL PROTECTED]@# &@' \
- etc/login.defs > /etc/login.defs
+ etc/login.defs.linux > /etc/login.defs
mv /usr/bin/passwd /bin
mv /lib/libshadow.*a /usr/lib
rm /lib/libshadow.so
Modified: branches/6.1.1-newmake/vars/vars.x86
===================================================================
--- branches/6.1.1-newmake/vars/vars.x86 2005-12-13 06:24:01 UTC (rev
1274)
+++ branches/6.1.1-newmake/vars/vars.x86 2005-12-13 06:26:54 UTC (rev
1275)
@@ -1,4 +1,4 @@
-export VERSION := x86-6.1.1-2
+export VERSION := x86-6.1.1-3
export CFLAGS := -Os -s -march=i486
export LIB_MAYBE64 := lib
export KERNEL_ARCH := i386
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
