Author: jhuntwork Date: 2005-02-17 15:02:00 -0700 (Thu, 17 Feb 2005) New Revision: 69
Modified: trunk/Makefile trunk/root/.irssi/config trunk/root/.xchat2/servlist_.conf trunk/root/.xchat2/xchat.conf Log: Changed irssi and xchat nicks and the way the iso is named Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2005-02-17 17:02:06 UTC (rev 68) +++ trunk/Makefile 2005-02-17 22:02:00 UTC (rev 69) @@ -43,6 +43,7 @@ export FTP := ftp://ftp.lfs-matrix.de/pub/lfs/lfs-packages/conglomeration # Don't edit these! +export VERSION=x86-6.1-1-pre3 export HOSTNAME := lfslivecd export WD := /tools export SRC := /sources @@ -59,7 +60,6 @@ export chbash2 := SHELL=/bin/bash export WHICH= $(WD)/bin/which export WGET= wget --passive-ftp -export DATE= `date +%Y%m%d` FTPGET= $(WD)/bin/ftpget WGET_V= 1.9.1 @@ -72,7 +72,7 @@ # lfs-base, extend-lfs and iso, then it echos a handy notice that it's finished. :) all: lfs-base extend-lfs iso - @echo "The livecd, $(MKTREE)/lfs-livecd-$(DATE).iso, is ready!" + @echo "The livecd, $(MKTREE)/livecd-$(VERSION).iso, is ready!" # This target builds just a base LFS system, minus the kernel and bootscripts @@ -1302,19 +1302,20 @@ prepiso: @-rm $(MP)/etc/rc.d/rc{2,3,5}.d/{K,S}21xprint @install -m644 etc/issue $(MP)/etc/issue - @sed -i "s/Version:/Version: $(DATE)/" $(MP)/etc/issue + @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue @install -m755 scripts/{net-setup,greeting} $(MP)/usr/bin/ @-mkdir $(MP)/etc/sysconfig/network-devices/ifconfig.eth0 @-mkdir $(MP)/iso @for i in bin boot etc lib sbin sources ; do cp -ra $(MP)/$$i $(MP)/iso ; done && \ cd $(MP) && tar cjvf etc.tar.bz2 etc && cp etc.tar.bz2 iso/ && \ + if [ -f root/.bash_history ] ; then rm root/.bash_history ; fi && \ tar cjvf root.tar.bz2 root && cp root.tar.bz2 iso/ && \ $(WD)/bin/mksquashfs usr usr.sqfs && mv usr.sqfs iso/ && \ echo "LFS-LIVECD" > iso/LFS @touch prepiso iso: prepiso - cd $(MP)/iso ; $(WD)/bin/mkisofs -R -l -L -D -o $(MKTREE)/lfs-livecd-$(DATE).iso -b boot/isolinux/isolinux.bin \ + cd $(MP)/iso ; $(WD)/bin/mkisofs -R -l -L -D -o $(MKTREE)/livecd-$(VERSION).iso -b boot/isolinux/isolinux.bin \ -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -V "LFS_CD" ./ # Rules to clean your tree. @@ -1339,7 +1340,7 @@ usr var ; do rm -rf $(MP)/$$i ; done @-rm $(MP)/{etc,root}.tar.bz2 @-for i in `ls $(PKG)` ; do rm -rf $(PKG)/$$i/{*.gz,*.bz2,*.zip,*.tgz} ; done - @-rm lfs-livecd-$(DATE).iso + @-rm livecd-$(VERSION).iso unloadmodule: @-rmmod uname_i486 Modified: trunk/root/.irssi/config =================================================================== --- trunk/root/.irssi/config 2005-02-17 17:02:06 UTC (rev 68) +++ trunk/root/.irssi/config 2005-02-17 22:02:00 UTC (rev 69) @@ -122,7 +122,7 @@ SILC = { type = "SILC"; }; lfs = { type = "IRC"; - nick = "livecd-20050124"; + nick = "lfs-livecd"; username = "guest"; realname = "guest"; }; @@ -133,6 +133,7 @@ { name = "#irssi"; chatnet = "freenode"; autojoin = "No"; }, { name = "silc"; chatnet = "silc"; autojoin = "No"; }, { name = "#lfs-support"; chatnet = "lfs"; autojoin = "yes"; } + { name = "#lfs"; chatnet = "lfs"; autojoin = "yes"; } ); aliases = { @@ -296,4 +297,3 @@ core = { real_name = "guest"; user_name = "guest"; nick = "lfs-livecd"; }; "fe-text" = { term_force_colors = "yes"; }; }; -hilights = ( { text = "nick"; nick = "yes"; word = "yes"; } ); Modified: trunk/root/.xchat2/servlist_.conf =================================================================== --- trunk/root/.xchat2/servlist_.conf 2005-02-17 17:02:06 UTC (rev 68) +++ trunk/root/.xchat2/servlist_.conf 2005-02-17 22:02:00 UTC (rev 69) @@ -1,7 +1,7 @@ v=2.4.1 N=lfs -J=#lfs-support +J=#lfs-support,#lfs F=26 D=0 S=linuxfromscratch.org/6667 Modified: trunk/root/.xchat2/xchat.conf =================================================================== --- trunk/root/.xchat2/xchat.conf 2005-02-17 17:02:06 UTC (rev 68) +++ trunk/root/.xchat2/xchat.conf 2005-02-17 22:02:00 UTC (rev 69) @@ -88,9 +88,9 @@ irc_invisible = 0 irc_logging = 0 irc_logmask = %n-%c.log -irc_nick1 = livecd-0127 -irc_nick2 = livecd0127 -irc_nick3 = livecdxchat +irc_nick1 = lfs-livecd +irc_nick2 = lfs-livecd2 +irc_nick3 = lfs-livecd3 irc_part_reason = Leaving irc_quit_reason = Leaving irc_raw_modes = 0 -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
