From 5ce9976289ddc94084042925baad05b38af0f57f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 8 Feb 2008 19:10:52 +0000 Subject: [PATCH] Changed some of the rc-update code so it should work with baselayout-2, also. This is 2.0.6_pre2 for testing. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1290 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ catalyst | 3 +-- targets/support/kmerge.sh | 2 +- targets/support/rc-update.sh | 11 +++++++++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a769daf2..145a08db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 08 Feb 2008; Chris Gianelloni catalyst, + targets/support/kmerge.sh, targets/support/rc-update.sh: + Changed some of the rc-update code so it should work with baselayout-2, + also. This is 2.0.6_pre2 for testing. + 08 Feb 2008; Chris Gianelloni AUTHORS, catalyst, files/catalyst.conf, modules/catalyst_support.py, modules/generic_stage_target.py, modules/grp_target.py, diff --git a/catalyst b/catalyst index 522713e0..cea85ccb 100755 --- a/catalyst +++ b/catalyst @@ -1,7 +1,6 @@ #!/usr/bin/python -OO # Maintained in full by: -# Eric Edgar # Andrew Gaffney # Chris Gianelloni @@ -9,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0.6_pre1" +__version__="2.0.6_pre2" conf_values={} diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index 254fe7a3..128a85a2 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -21,7 +21,7 @@ setup_gk_args() { # extra genkernel options that we have to test for if [ -n "${clst_KERNCACHE}" ] then - GK_ARGS="${GK_ARGS} --kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2" + GK_ARGS="${GK_ARGS} --kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2" fi if [ "${clst_splash_type}" == "bootsplash" -a -n "${clst_splash_theme}" ] diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh index 2c837882..fdac323c 100644 --- a/targets/support/rc-update.sh +++ b/targets/support/rc-update.sh @@ -1,5 +1,13 @@ #!/bin/bash +if portageq has_version / >=sys-apps/baselayout-2* +then + # We need to add a few here for baselayout-2 + [[ -e /etc/init.d/device-mapper ]] && rc-update add device-mapper boot + [[ -e /etc/init.d/lvm ]] && rc-update add lvm boot + [[ -e /etc/init.d/dmcrypt ]] && rc-update add dmcrypt boot +fi + if [ "${clst_spec_prefix}" == "livecd" ] then # default programs that we always want to start @@ -8,9 +16,8 @@ then rc-update del keymaps rc-update del serial rc-update del consolefont + # We need to add this one, unconditionally rc-update add autoconfig default - rc-update add modules boot - rc-update add pwgen default [[ -e /etc/init.d/bootsplash ]] && rc-update add bootsplash default [[ -e /etc/init.d/splash ]] && rc-update add splash default [[ -e /etc/init.d/fbcondecor ]] && rc-update add fbcondecor default -- 2.26.2