diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2005-02-28 23:21:09 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2005-02-28 23:21:09 +0000 |
| commit | 24ba6860bdb24fa4b56f8a217dcf1729f6f50547 (patch) | |
| tree | 5ce5f58753045075f586fc671182b4eea895b575 /livecd/files | |
| parent | Removed ccache from default options as it breaks catalyst when merged with US... (diff) | |
| download | catalyst-24ba6860bdb24fa4b56f8a217dcf1729f6f50547.tar.gz catalyst-24ba6860bdb24fa4b56f8a217dcf1729f6f50547.tar.bz2 catalyst-24ba6860bdb24fa4b56f8a217dcf1729f6f50547.zip | |
Removed x-setup from local.start and added in symlinks for gconf, portage profiles (for installer) and /var/db. Added a touch for root's .bashrc for baselayout and removed /etc/startx from the environmental type. Commented unmerge of sources in kmerge.sh, as they should be unmerged by the spec file. Changed livecdfs-update.sh to setup /etc/hosts properly, allow wheel users to use sudo with no password, mount /usr/lib/X11/xkb/compiled as tmpfs for X, use the latest pci.ids and usb.ids from portage, and create /lib/firmware if it doesn't exist. Commented unmerge of genkernel in post-kmerge.sh, as it should be unmerged by the spec file. Fixed typo in snapshot_target.py. Made gconfd check in livecd-stage1.sh work if more than one gconfd-2 is running. Added a gcc-config fix to stage1-chroot.sh. Changed gcc-config check in stage1-preclean2-chroot.sh to ensure gcc-config is an executable.
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@546 d1e1f19c-881f-0410-ab34-b69fee027534
Diffstat (limited to 'livecd/files')
| -rw-r--r-- | livecd/files/livecd-local.start | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/livecd/files/livecd-local.start b/livecd/files/livecd-local.start index 52dc4220..a70733d8 100644 --- a/livecd/files/livecd-local.start +++ b/livecd/files/livecd-local.start @@ -3,7 +3,18 @@ # This is a good place to load any misc. # programs on startup ( 1>&2 ) -if [ -e /etc/startx ] && [ -x /usr/sbin/x-setup ] +if [ -d /usr/livecd/profiles ] then - /usr/sbin/x-setup + mkdir -p /usr/portage/profiles + ln -sf /usr/livecd/profiles /usr/portage/profiles +fi + +if [ -d /usr/livecd/gconf ] +then + ln -sf /usr/livecd/gconf /etc/gconf +fi + +if [ -d /usr/livecd/db ] +then + ln -sf /usr/livecd/db /var/db fi |