From: Chris Gianelloni Date: Mon, 12 Jan 2009 17:33:36 +0000 (-0800) Subject: Move livecd/files directory/files to files/livecd. X-Git-Tag: CATALYST-2.0.10~3^2~169 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0488d856f8e1b82efe83840bca6af53c23cba1e;p=catalyst.git Move livecd/files directory/files to files/livecd. --- diff --git a/ChangeLog b/ChangeLog index 007d287c..13cddb8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,17 @@ # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS) # Distributed under the GPL v2 + 12 Jan 2009; Chris Gianelloni -README.txt, + -README.txt, bootloader-setup.sh, -gamecd.motd.txt, -gamecd.motd.txt, + -generic.motd.txt, -generic.motd.txt, -livecd.motd.txt, -livecd.motd.txt, + -livecd-bash_profile, -livecd-bash_profile, -livecd-bashrc, + -livecd-bashrc, -livecd-local.start, -livecd-local.start, + livecd-stage2-controller.sh, -minimal.motd.txt, -minimal.motd.txt, + -universal.motd.txt, -universal.motd.txt, -x86-F2.msg, -x86-F2.msg, + -x86-F3.msg, -x86-F3.msg, -x86-F4.msg, -x86-F4.msg, -x86-F5.msg, + -x86-F5.msg, -x86-F6.msg, -x86-F6.msg, -x86-F7.msg, -x86-F7.msg: + Move livecd/files directory/files to files/livecd. + 12 Jan 2009; Chris Gianelloni -arcload-0.43-r1.tbz2, -arcload-0.43-r1.tbz2, -isolinux-elilo-memtest86+-cdtar.tar.bz2, diff --git a/livecd/files/README.txt b/files/livecd/README.txt similarity index 100% rename from livecd/files/README.txt rename to files/livecd/README.txt diff --git a/livecd/files/gamecd.motd.txt b/files/livecd/gamecd.motd.txt similarity index 100% rename from livecd/files/gamecd.motd.txt rename to files/livecd/gamecd.motd.txt diff --git a/livecd/files/generic.motd.txt b/files/livecd/generic.motd.txt similarity index 100% rename from livecd/files/generic.motd.txt rename to files/livecd/generic.motd.txt diff --git a/livecd/files/livecd-bash_profile b/files/livecd/livecd-bash_profile similarity index 100% rename from livecd/files/livecd-bash_profile rename to files/livecd/livecd-bash_profile diff --git a/livecd/files/livecd-bashrc b/files/livecd/livecd-bashrc similarity index 100% rename from livecd/files/livecd-bashrc rename to files/livecd/livecd-bashrc diff --git a/livecd/files/livecd-local.start b/files/livecd/livecd-local.start similarity index 100% rename from livecd/files/livecd-local.start rename to files/livecd/livecd-local.start diff --git a/livecd/files/livecd.motd.txt b/files/livecd/livecd.motd.txt similarity index 100% rename from livecd/files/livecd.motd.txt rename to files/livecd/livecd.motd.txt diff --git a/livecd/files/minimal.motd.txt b/files/livecd/minimal.motd.txt similarity index 100% rename from livecd/files/minimal.motd.txt rename to files/livecd/minimal.motd.txt diff --git a/livecd/files/universal.motd.txt b/files/livecd/universal.motd.txt similarity index 100% rename from livecd/files/universal.motd.txt rename to files/livecd/universal.motd.txt diff --git a/livecd/files/x86-F2.msg b/files/livecd/x86-F2.msg similarity index 100% rename from livecd/files/x86-F2.msg rename to files/livecd/x86-F2.msg diff --git a/livecd/files/x86-F3.msg b/files/livecd/x86-F3.msg similarity index 100% rename from livecd/files/x86-F3.msg rename to files/livecd/x86-F3.msg diff --git a/livecd/files/x86-F4.msg b/files/livecd/x86-F4.msg similarity index 100% rename from livecd/files/x86-F4.msg rename to files/livecd/x86-F4.msg diff --git a/livecd/files/x86-F5.msg b/files/livecd/x86-F5.msg similarity index 100% rename from livecd/files/x86-F5.msg rename to files/livecd/x86-F5.msg diff --git a/livecd/files/x86-F6.msg b/files/livecd/x86-F6.msg similarity index 100% rename from livecd/files/x86-F6.msg rename to files/livecd/x86-F6.msg diff --git a/livecd/files/x86-F7.msg b/files/livecd/x86-F7.msg similarity index 100% rename from livecd/files/x86-F7.msg rename to files/livecd/x86-F7.msg diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index 36c7cffd..b49c70a0 100644 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -39,11 +39,11 @@ case $1 in echo "${clst_livecd_type}. You should switch to using" echo "generic-livecd instead." fi - cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \ - ${clst_sharedir}/livecd/files/universal.motd.txt \ - ${clst_sharedir}/livecd/files/minimal.motd.txt \ - ${clst_sharedir}/livecd/files/livecd.motd.txt \ - ${clst_sharedir}/livecd/files/gamecd.motd.txt \ + cp -pPR ${clst_sharedir}/files/livecd/generic.motd.txt \ + ${clst_sharedir}/files/livecd/universal.motd.txt \ + ${clst_sharedir}/files/livecd/minimal.motd.txt \ + ${clst_sharedir}/files/livecd/livecd.motd.txt \ + ${clst_sharedir}/files/livecd/gamecd.motd.txt \ ${clst_chroot_path}/etc ;; *) @@ -55,11 +55,11 @@ case $1 in esac # move over the environment - cp -f ${clst_sharedir}/livecd/files/livecd-bashrc \ + cp -f ${clst_sharedir}/files/livecd/livecd-bashrc \ ${clst_chroot_path}/root/.bashrc - cp -f ${clst_sharedir}/livecd/files/livecd-bash_profile \ + cp -f ${clst_sharedir}/files/livecd/livecd-bash_profile \ ${clst_chroot_path}/root/.bash_profile - cp -f ${clst_sharedir}/livecd/files/livecd-local.start \ + cp -f ${clst_sharedir}/files/livecd/livecd-local.start \ ${clst_chroot_path}/etc/conf.d/local.start # execute copy gamecd.conf if we're a gamecd @@ -131,7 +131,7 @@ case $1 in then cp -f ${clst_livecd_readme} $1/README.txt else - cp -f ${clst_sharedir}/livecd/files/README.txt $1 + cp -f ${clst_sharedir}/files/livecd/README.txt $1 fi case ${clst_livecd_type} in diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh index d8c31950..e86e0ae4 100644 --- a/targets/support/bootloader-setup.sh +++ b/targets/support/bootloader-setup.sh @@ -258,7 +258,7 @@ case ${clst_hostarch} in echo "Available kernels:" > ${kmsg} for i in 2 3 4 5 6 7 do - cp ${clst_sharedir}/livecd/files/x86-F$i.msg \ + cp ${clst_sharedir}/files/livecd/x86-F$i.msg \ $1/isolinux/F$i.msg done @@ -401,7 +401,7 @@ case ${clst_hostarch} in # Setup help message echo >> ${icfg} echo "title help" >> ${icfg} - cp ${clst_sharedir}/livecd/files/README.txt \ + cp ${clst_sharedir}/files/livecd/README.txt \ $1/boot/help.msg echo "cat /boot/help.msg" >> ${icfg}