Author: jhuntwork
Date: 2005-05-15 13:09:44 -0600 (Sun, 15 May 2005)
New Revision: 181
Removed:
trunk/packages/firefox/firstrun
Modified:
trunk/Makefile
trunk/packages/Xorg/Makefile
Log:
Removed traces of firefox firstrun script
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-05-15 19:04:07 UTC (rev 180)
+++ trunk/Makefile 2005-05-15 19:09:44 UTC (rev 181)
@@ -160,7 +160,6 @@
@-mount -f -t ramfs ramfs $(MP)/dev
@-mount -f -t tmpfs tmpfs $(MP)/dev/shm
@-mount -f -t devpts -o gid=4,mode=620 devpts $(MP)/dev/pts
- @if [ ! -f $(MP)/etc/X11/xorg.conf ] ; then if [ -f /etc/X11/xorg.conf
] ; then cp /etc/X11/xorg.conf $(PKG)/Xorg ; fi ; fi
pre-bash: createdirs createfiles popdev ch-linux-libc-headers ch-man-pages
ch-glibc ch-re-adjust-toolchain \
ch-binutils ch-gcc ch-coreutils ch-zlib ch-mktemp ch-iana-etc
ch-findutils ch-gawk ch-sharutils ch-gpm ch-ncurses \
Modified: trunk/packages/Xorg/Makefile
===================================================================
--- trunk/packages/Xorg/Makefile 2005-05-15 19:04:07 UTC (rev 180)
+++ trunk/packages/Xorg/Makefile 2005-05-15 19:09:44 UTC (rev 181)
@@ -43,7 +43,6 @@
@echo "/tmp/.ICE-unix dir 1777 root root" >> /etc/sysconfig/createfiles
@cp $(ROOT)/etc/fonts/local.conf /etc/fonts/local.conf && \
fc-cache
- @if [ -f xorg.conf ] ; then mv xorg.conf /etc/X11/xorg.conf ; fi
@make clean
clean:
Deleted: trunk/packages/firefox/firstrun
===================================================================
--- trunk/packages/firefox/firstrun 2005-05-15 19:04:07 UTC (rev 180)
+++ trunk/packages/firefox/firstrun 2005-05-15 19:09:44 UTC (rev 181)
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-CONF="/etc/X11/xorg.conf"
-
-if [ ! -f $CONF ]
-then
- Xorg -configure &&
- sed -i 's@/dev/mouse@/dev/input/mice@' ~/xorg.conf.new &&
- mv ~/xorg.conf.new $CONF
-fi
-
-/usr/bin/firefox --display=:3 &
-echo "Sleeping for 90 seconds to allow Firefox's firstrun to complete"
-sleep 90
-PID=`pidof Xorg`
-if [ $PID -gt 0 ]
-then
- kill $PID
-fi
-if [ -f $CONF ]
-then
- rm $CONF
-fi
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
