From 2beb63a9ff7cc1043d09792eb3d2068fa17a8485 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 17 Nov 2007 02:04:11 +0000 Subject: [PATCH] create symlink for /etc/gconf and /var/db when moving to /usr/livecd remove preservation of eclasses/profiles remove copying of livecd-local.start since it's not needed anymore git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1258 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 +++++++ .../livecd-stage2/livecd-stage2-controller.sh | 4 ++-- targets/support/livecdfs-update.sh | 16 +++++++++++----- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7784111..829e0bc7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,13 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 17 Nov 2007; Andrew Gaffney + targets/livecd-stage2/livecd-stage2-controller.sh, + targets/support/livecdfs-update.sh: + create symlink for /etc/gconf and /var/db when moving to /usr/livecd + remove preservation of eclasses/profiles + remove copying of livecd-local.start since it's not needed anymore + 16 Nov 2007; Andrew Gaffney targets/support/livecdfs-update.sh, targets/support/unmerge.sh: move moving of /var/db back to livecdfs-update.sh but keep the symlink so we diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index b1649f57..f8fdf217 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -64,8 +64,8 @@ case $1 in ${clst_chroot_path}/root/.bashrc cp -f ${clst_sharedir}/livecd/files/livecd-bash_profile \ ${clst_chroot_path}/root/.bash_profile - cp -f ${clst_sharedir}/livecd/files/livecd-local.start \ - ${clst_chroot_path}/etc/conf.d/local.start +# cp -f ${clst_sharedir}/livecd/files/livecd-local.start \ +# ${clst_chroot_path}/etc/conf.d/local.start # execute copy gamecd.conf if we're a gamecd if [ "${clst_livecd_type}" = "gentoo-gamecd" ] diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 0c502562..741be347 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -325,12 +325,12 @@ case ${clst_livecd_type} in USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt # This is my hack to reduce tmpfs usage - cp -r /usr/portage/profiles /usr/livecd - cp -r /usr/portage/eclass /usr/livecd - rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} +# cp -r /usr/portage/profiles /usr/livecd +# cp -r /usr/portage/eclass /usr/livecd +# rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} mv -f /etc/gconf /usr/livecd + ln -sf /usr/livecd/gconf /etc/gconf mv -f /var/db /usr/livecd - # We keep the symlink so that you can still unmerge stuff ln -sf /usr/livecd/db /var/db # This gives us a proper cache for portage/installer @@ -371,7 +371,13 @@ case ${clst_livecd_type} in generic-livecd ) # This is my hack to reduce tmpfs usage mkdir -p /usr/livecd - [ -d /etc/gconf ] && mv -f /etc/gconf /usr/livecd + + if [ -d /etc/gconf ] + then + mv -f /etc/gconf /usr/livecd + ln -sf /usr/livecd/gconf /etc/gconf + fi + if [ -e /usr/livecd/kernelpkgs.txt ] then rm -f /usr/livecd/kernelpkgs.txt -- 2.26.2