---
targets/livecd-stage2/livecd-stage2-controller.sh | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh
b/targets/livecd-stage2/livecd-stage2-controller.sh
index 10ee98e..16a9071 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -42,12 +42,9 @@ 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 \
- ${clst_chroot_path}/etc
+ cp -pPR
${clst_sharedir}/livecd/files/{generic.motd.txt,universal.motd.txt,minimal.motd.txt}
${clst_chroot_path}/etc
+ cp -pPR
${clst_sharedir}/livecd/files/{livecd.motd.txt,gamecd.motd.txt}
${clst_chroot_path}/etc
+
;;
*)
if [ -n "${clst_livecd_motd}" ]
@@ -147,8 +144,7 @@ case $1 in
exit 1
fi
fi
- cp -f ${clst_snapshot_path} $1/snapshots
- cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots
+ cp -f ${clst_snapshot_path}{,.DIGESTS}
$1/snapshots
;;
gentoo-release-livedvd)
targets="distfiles snapshots stages"
@@ -171,8 +167,7 @@ case $1 in
continue
;;
snapshots)
- cp -f
${clst_snapshot_path} $1/snapshots
- cp -f
${clst_snapshot_path}.DIGESTS $1/snapshots
+ cp -f
${clst_snapshot_path}{,.DIGESTS} $1/snapshots
;;
stages)
### TODO: make this
copy stages
--
2.10.2
