From da2ff86cde8b93fe6b0264ee11fd638a0cd896e4 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 20 Apr 2005 21:31:15 +0000 Subject: [PATCH] Moved xinitrc to after livecdfs-update to allow for changing the xinitrc to a custom one if livecd/type is gentoo-gamecd. Added more default setup to livecdfs-update.sh for livecd/type: gentoo-gamecd, gentoo-release-livecd, and generic-livecd. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@617 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 10 ++++++- .../livecd-stage2/livecd-stage2-controller.sh | 15 +++++----- targets/support/livecdfs-update.sh | 29 +++++++++++++++++-- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e9a4f39..e9a9a7f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.229 2005/04/20 21:14:35 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.230 2005/04/20 21:31:15 wolf31o2 Exp $ + + 20 Apr 2005; Chris Gianelloni + targets/livecd-stage2/livecd-stage2-controller.sh, + targets/support/livecdfs-update.sh: + Moved xinitrc to after livecdfs-update to allow for changing the xinitrc to + a custom one if livecd/type is gentoo-gamecd. Added more default setup to + livecdfs-update.sh for livecd/type: gentoo-gamecd, gentoo-release-livecd, + and generic-livecd. 20 Apr 2005; Chris Gianelloni targets/livecd-stage2/livecd-stage2-controller.sh, diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index a9e5ea6c..fc308989 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.6 2005/04/20 21:14:35 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage2/livecd-stage2-controller.sh,v 1.7 2005/04/20 21:31:15 wolf31o2 Exp $ . ${clst_sharedir}/targets/support/functions.sh . ${clst_sharedir}/targets/support/filesystem-functions.sh @@ -34,12 +34,6 @@ case $1 in ${clst_chroot_path}/etc fi - # move over the xinitrc (if applicable) - if [ -n "${clst_livecd_xinitrc}" ] - then - cp -a ${clst_livecd_xinitrc} ${clst_chroot_path}/etc/X11/xinit/xinitrc - fi - # move over the environment cp ${clst_sharedir}/livecd/files/livecd-bashrc \ ${clst_chroot_path}/root/.bashrc @@ -65,6 +59,13 @@ case $1 in # now, finalize and tweak the livecd fs (inside of the chroot) exec_in_chroot ${clst_sharedir}/targets/support/livecdfs-update.sh + + # move over the xinitrc (if applicable) + # this is moved here, so we can override any default xinitrc + if [ -n "${clst_livecd_xinitrc}" ] + then + cp -a ${clst_livecd_xinitrc} ${clst_chroot_path}/etc/X11/xinit/xinitrc + fi ;; rc-update) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 6f237f22..2436ec4a 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.9 2005/04/20 20:29:03 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.10 2005/04/20 21:31:15 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -220,10 +220,33 @@ case ${clst_livecd_type} in echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc fi + # This is my hack to reduce tmpfs usage + mkdir -p /usr/livecd/db/pkg/x11-base + mv -f /var/db/pkg/x11-base/xorg* /usr/livecd/db/pkg/x11-base + rm -rf /var/db + touch /etc/startx - ;; + ;; + gentoo-release-livecd ) + # first we setup the livecd-kernel package + if [ -e /opt/installer/misc/mkvardb ] + then + chmod +x /opt/installer/misc/mkvardb + /opt/installer/misc/mkvardb -p livecd-kernel -c sys-kernel -v 2005.0 /boot/kernel* /boot/initrd* $(for i in $(find "/lib/modules/$(uname -r)" -type f); do grep --quiet "${i}" /var/db/pkg/*/*/CONTENTS || echo ${i}; done) + fi + + # This is my hack to reduce tmpfs usage + mkdir -p /usr/livecd + mv -f /usr/portage/profiles /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 + mv -f /var/db /usr/livecd generic-livecd ) + # This is my hack to reduce tmpfs usage + mkdir -p /usr/livecd + mv -f /etc/gconf /usr/livecd + touch /etc/startx - ;; + ;; esac -- 2.26.2