| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-07 01:11:30 +0000 (Thu, 07 Feb 2008) |
| 3 |
New Revision: 1281 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/livecd-stage2/livecd-stage2-controller.sh |
| 8 |
Log: |
| 9 |
Changed the code for copying the MOTD files so it's fewer lines and makes more sense. |
| 10 |
|
| 11 |
Modified: trunk/ChangeLog |
| 12 |
=================================================================== |
| 13 |
--- trunk/ChangeLog 2008-02-06 23:36:22 UTC (rev 1280) |
| 14 |
+++ trunk/ChangeLog 2008-02-07 01:11:30 UTC (rev 1281) |
| 15 |
@@ -1,6 +1,11 @@ |
| 16 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 17 |
# $Id: $ |
| 18 |
|
| 19 |
+ 07 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 20 |
+ targets/livecd-stage2/livecd-stage2-controller.sh: |
| 21 |
+ Changed the code for copying the MOTD files so it's fewer lines and makes |
| 22 |
+ more sense. |
| 23 |
+ |
| 24 |
06 Feb 2008; Chris Gianelloni <wolf31o2@g.o> +arch/powerpc.py, |
| 25 |
-arch/ppc.py, -arch/ppc64.py, arch/sparc.py, -arch/sparc64.py: |
| 26 |
Merged ppc.py and ppc64.py into powerpc.py and merged sparc.py and |
| 27 |
|
| 28 |
Modified: trunk/targets/livecd-stage2/livecd-stage2-controller.sh |
| 29 |
=================================================================== |
| 30 |
--- trunk/targets/livecd-stage2/livecd-stage2-controller.sh 2008-02-06 23:36:22 UTC (rev 1280) |
| 31 |
+++ trunk/targets/livecd-stage2/livecd-stage2-controller.sh 2008-02-07 01:11:30 UTC (rev 1281) |
| 32 |
@@ -31,33 +31,28 @@ |
| 33 |
|
| 34 |
preclean) |
| 35 |
# Move over the motd (if applicable) |
| 36 |
- if [ -n "${clst_livecd_motd}" ] |
| 37 |
- then |
| 38 |
- case ${clst_livecd_type} in |
| 39 |
- gentoo-*) |
| 40 |
+ case ${clst_livecd_type} in |
| 41 |
+ gentoo-*) |
| 42 |
+ if [ -n "${clst_livecd_motd}" ] |
| 43 |
+ then |
| 44 |
echo "Using livecd/motd is not supported with livecd/type" |
| 45 |
echo "${clst_livecd_type}. You should switch to using" |
| 46 |
echo "generic-livecd instead." |
| 47 |
- cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \ |
| 48 |
- ${clst_sharedir}/livecd/files/universal.motd.txt \ |
| 49 |
- ${clst_sharedir}/livecd/files/minimal.motd.txt \ |
| 50 |
- ${clst_sharedir}/livecd/files/livecd.motd.txt \ |
| 51 |
- ${clst_sharedir}/livecd/files/gamecd.motd.txt \ |
| 52 |
- ${clst_chroot_path}/etc |
| 53 |
- ;; |
| 54 |
- *) |
| 55 |
+ fi |
| 56 |
+ cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \ |
| 57 |
+ ${clst_sharedir}/livecd/files/universal.motd.txt \ |
| 58 |
+ ${clst_sharedir}/livecd/files/minimal.motd.txt \ |
| 59 |
+ ${clst_sharedir}/livecd/files/livecd.motd.txt \ |
| 60 |
+ ${clst_sharedir}/livecd/files/gamecd.motd.txt \ |
| 61 |
+ ${clst_chroot_path}/etc |
| 62 |
+ ;; |
| 63 |
+ *) |
| 64 |
+ if [ -n "${clst_livecd_motd}" ] |
| 65 |
+ then |
| 66 |
cp -pPR ${clst_livecd_motd} ${clst_chroot_path}/etc/motd |
| 67 |
- ;; |
| 68 |
- esac |
| 69 |
- elif [ "${clst_livecd_type}" != "generic-livecd" ] |
| 70 |
- then |
| 71 |
- cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \ |
| 72 |
- ${clst_sharedir}/livecd/files/universal.motd.txt \ |
| 73 |
- ${clst_sharedir}/livecd/files/minimal.motd.txt \ |
| 74 |
- ${clst_sharedir}/livecd/files/livecd.motd.txt \ |
| 75 |
- ${clst_sharedir}/livecd/files/gamecd.motd.txt \ |
| 76 |
- ${clst_chroot_path}/etc |
| 77 |
- fi |
| 78 |
+ fi |
| 79 |
+ ;; |
| 80 |
+ esac |
| 81 |
|
| 82 |
# move over the environment |
| 83 |
cp -f ${clst_sharedir}/livecd/files/livecd-bashrc \ |
| 84 |
|
| 85 |
-- |
| 86 |
gentoo-commits@l.g.o mailing list |
Archives