commit: 9c70e584e246785beabdbcff5407c9f1ac388ff6
Author: Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
AuthorDate: Fri May 30 02:57:13 2014 +0000
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jun 23 23:11:15 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9c70e584
coding style changes
---
defaults/linuxrc | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 281de8e..42749d6 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -1014,26 +1014,34 @@ verbose_kmsg
if [ "${USE_AUFS_NORMAL}" -eq '1' ]
then
- mkdir -p /${CHROOT}/.unions/memory
- mount -o move /memory /${CHROOT}/.unions/memory
+ UNION_MEMORY=${CHROOT}/.unions/memory
+
+ mkdir -p "${UNION_MEMORY}"
+ mount --move "${MEMORY}" "${UNION_MEMORY}"
test_success "Failed to move aufs /memory into the system root"
- for i in mnt/gentoo mnt/livecd /mnt/overlay ${CDROOT_PATH}
+
+ for i in /mnt/gentoo /mnt/livecd /mnt/overlay ${CDROOT_PATH}
do
- mkdir -p ${CHROOT}/$i
- chmod 755 ${CHROOT}/$i
+ mkdir -p "${CHROOT}${i}"
+ chmod 755 "${CHROOT}${i}"
done
+
# This will prevent from putting junk on the CHANGESDEV
str=""
- for i in tmp var/tmp usr/portage/distfiles
+ for i in /tmp /var/tmp /usr/portage/distfiles
do
- mkdir -p ${CHROOT}/$i
- chmod 755 ${CHROOT}/$i
- mount -t tmpfs tmpfs ${CHROOT}/$i
- str="${str} ${i}"
+ mkdir -p "${CHROOT}${i}"
+ chmod 755 "${CHROOT}${i}"
+
+ mount -t tmpfs tmpfs "${CHROOT}${i}"
+ str="${i} ${str}"
done
+
warn_msg "${str}are mounted in ram"
warn_msg "consider saving important files elsewhere"
- read -t 3 UNUSEDVAL
+
+ sleep 2
+
for i in ${CDROOT_PATH} ${overlay} ${static}; do
mount --move ${NEW_ROOT}${i} ${CHROOT}${i}
done
