Moved fstab tweaks all into one location and added make.conf tweak for bug #144647.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1183 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index afa007016c950f285ad55952c8ee6bd665df0f6b..2517649733e9e535e5366f2703e4ac3d2ab044c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $
 
+  03 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/livecdfs-update.sh:
+  Moved fstab tweaks all into one location and added make.conf tweak for bug
+  #144647.
+
   03 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst:
   Changed the options to be in alphabetical order so my meatspace logical
   parser can process them better, added the compress and tarball options,

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 31cd9b838c959ac26e352a9257ada1bfe7bbedc2..0ee63b68859469ab581b9ab29be55dbfc1e0c547 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -71,8 +71,15 @@ ln -sf net.lo net.eth4
 # Add this for hwsetup/mkx86config
 mkdir -p /etc/sysconfig
 
+# Tweak the livecd fstab so that users know not to edit it
+# http://bugs.gentoo.org/show_bug.cgi?id=60887
+echo "####################################################" > /etc/fstab
+echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD    ##" >> /etc/fstab
+echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab
+echo "####################################################" >> /etc/fstab
+
 # fstab tweaks
-echo "tmpfs    /                                       tmpfs   defaults        0 0" > /etc/fstab
+echo "tmpfs    /                                       tmpfs   defaults        0 0" >> /etc/fstab
 echo "tmpfs    /lib/firmware                   tmpfs   defaults        0 0" >> /etc/fstab
 echo "tmpfs    /usr/portage                    tmpfs   defaults        0 0" >> /etc/fstab
 # If /usr/lib/X11/xkb/compiled then make it tmpfs
@@ -82,19 +89,18 @@ then
                /etc/fstab
 fi
 
+# Tweak the livecd make.conf so that users know not to edit it
+# http://bugs.gentoo.org/show_bug.cgi?id=144647
+mv /etc/make.conf /etc/make.conf.old
+echo "####################################################" >> /etc/make.conf
+echo "## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##" >> /etc/make.conf
+echo "## PLEASE EDIT /mnt/gentoo/etc/make.conf INSTEAD  ##" >> /etc/make.conf
+echo "####################################################" >> /etc/make.conf
+cat /etc/make.conf.old >> /etc/make.conf
+
 # devfs tweaks
 [ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
 
-# Tweak the livecd fstab so that users know not to edit it
-# http://bugs.gentoo.org/show_bug.cgi?id=60887
-mv /etc/fstab /etc/fstab.old
-echo "####################################################" >> /etc/fstab
-echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD     ##" >> /etc/fstab
-echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab       
-echo "####################################################" >> /etc/fstab
-cat /etc/fstab.old >> /etc/fstab
-rm /etc/fstab.old
-
 # Add some helpful aliases
 echo "alias cp='cp -i'" >> /etc/profile
 echo "alias mv='mv -i'" >> /etc/profile
@@ -280,7 +286,7 @@ case ${clst_livecd_type} in
                                        sedxtra=""
                                fi
 
-                               cp -f /etc/X11/gdm/custom.con /etc/X11/gdm/custom.conf.old
+                               cp -f /etc/X11/gdm/custom.conf /etc/X11/gdm/custom.conf.old
 
                                sed     -i \
                                        -e "s:\(\[daemon\]\)$:\1\nTimedLoginEnable=true\nTimedLoginDelay=10${sedxtra}:" \