From 4dd060f6e8f5ea28d43d561287073d53e8da3dc7 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 24 Jan 2005 23:03:05 +0000 Subject: [PATCH] Removed gpm changes, as it has been moved to livecd-tools and autoconfig, added net.ethX symlinks, and added copying of files from /usr/lib/hotplug/firmware into firmware tarball. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@525 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 ++++++- livecd/runscript-support/livecdfs-update.sh | 25 ++++++++++++--------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ce5b5dd..1a0a5985 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.151 2005/01/23 19:21:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.152 2005/01/24 23:03:05 wolf31o2 Exp $ + + 24 Jan 2005; Chris Gianelloni + livecd/runscript-support/livecdfs-update.sh: + Removed gpm changes, as it has been moved to livecd-tools and autoconfig, + added net.ethX symlinks, and added copying of files from + /usr/lib/hotplug/firmware into firmware tarball. 23 Jan 2005; Chris Gianelloni livecd/runscript-support/livecdfs-update.sh: diff --git a/livecd/runscript-support/livecdfs-update.sh b/livecd/runscript-support/livecdfs-update.sh index 5cfdd5ed..20e7ffb1 100755 --- a/livecd/runscript-support/livecdfs-update.sh +++ b/livecd/runscript-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/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.28 2005/01/23 19:21:40 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.29 2005/01/24 23:03:05 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -81,14 +81,15 @@ echo "iface_eth1=\"dhcp\"" >> /etc/conf.d/net echo "iface_eth2=\"dhcp\"" >> /etc/conf.d/net echo "iface_eth3=\"dhcp\"" >> /etc/conf.d/net +# setup links for ethernet devices +cd /etc/init.d +ln -sf net.eth0 net.eth1 +ln -sf net.eth0 net.eth2 +ln -sf net.eth0 net.eth3 + # add this for hwsetup/mkx86config mkdir -p /etc/sysconfig -# gpm fixes -[ -e /etc/conf.d/gpm ] && sed -i -e 's:#MOUSE=imps2:MOUSE=imps2:' \ - -e 's:#MOUSEDEV=/dev/input/mice:MOUSEDEV=/dev/input/mice:' \ - /etc/conf.d/gpm - # fstab tweaks echo "tmpfs / tmpfs defaults 0 0" > /etc/fstab echo "tmpfs /lib/firmware tmpfs defaults 0 0" >> /etc/fstab @@ -131,20 +132,20 @@ if [ "${clst_livecd_type}" = "gentoo-release-universal" ] then cat /etc/generic.motd.txt /etc/universal.motd.txt \ /etc/minimal.motd.txt > /etc/motd - sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation LiveCD!:' /etc/motd + sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd fi if [ "${clst_livecd_type}" = "gentoo-release-minimal" ] then cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd - sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation LiveCD!:' /etc/motd + sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd fi if [ "${clst_livecd_type}" = "gentoo-release-environmental" ] then cat /etc/generic.motd.txt /etc/universal.motd.txt \ /etc/minimal.motd.txt /etc/environmental.motd.txt > /etc/motd - sed -i 's:^##GREETING:Welcome to the Gentoo Linux Live Environment!:' /etc/motd + sed -i 's:^##GREETING:Welcome to the Gentoo Linux LiveCD Environment!:' /etc/motd fi if [ "${clst_livecd_type}" = "gentoo-gamecd" ] @@ -182,9 +183,13 @@ then fi # tar up the firmware so that it does not get clobbered by the livecd mounts -if [ -n "$(ls /lib/firmware)"] +if [ -n "$(ls /lib/firmware)" ] then cd /lib/firmware + if [ -n "$(ls /usr/lib/hotplug/firmware)" ] + then + cp /usr/lib/hotplug/firmware/* /lib/firmware + fi tar cvjpf /lib/firmware.tar.bz2 . rm -f /lib/firmware/* mkdir -p /usr/lib/hotplug -- 2.26.2