Gentoo Archives: gentoo-commits

From: Richard Farina <zerochaos@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:aufs commit in: defaults/
Date: Wed, 29 Apr 2015 19:04:35
Message-Id: 1430328705.064e285bbe80b527b6a53256382fd40beea0de5b.zerochaos@gentoo
1 commit: 064e285bbe80b527b6a53256382fd40beea0de5b
2 Author: Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com>
3 AuthorDate: Fri May 30 02:57:13 2014 +0000
4 Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 29 17:31:45 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=064e285b
7
8 coding style changes
9
10 defaults/linuxrc | 30 +++++++++++++++++++-----------
11 1 file changed, 19 insertions(+), 11 deletions(-)
12
13 diff --git a/defaults/linuxrc b/defaults/linuxrc
14 index 281de8e..42749d6 100644
15 --- a/defaults/linuxrc
16 +++ b/defaults/linuxrc
17 @@ -1014,26 +1014,34 @@ verbose_kmsg
18
19 if [ "${USE_AUFS_NORMAL}" -eq '1' ]
20 then
21 - mkdir -p /${CHROOT}/.unions/memory
22 - mount -o move /memory /${CHROOT}/.unions/memory
23 + UNION_MEMORY=${CHROOT}/.unions/memory
24 +
25 + mkdir -p "${UNION_MEMORY}"
26 + mount --move "${MEMORY}" "${UNION_MEMORY}"
27 test_success "Failed to move aufs /memory into the system root"
28 - for i in mnt/gentoo mnt/livecd /mnt/overlay ${CDROOT_PATH}
29 +
30 + for i in /mnt/gentoo /mnt/livecd /mnt/overlay ${CDROOT_PATH}
31 do
32 - mkdir -p ${CHROOT}/$i
33 - chmod 755 ${CHROOT}/$i
34 + mkdir -p "${CHROOT}${i}"
35 + chmod 755 "${CHROOT}${i}"
36 done
37 +
38 # This will prevent from putting junk on the CHANGESDEV
39 str=""
40 - for i in tmp var/tmp usr/portage/distfiles
41 + for i in /tmp /var/tmp /usr/portage/distfiles
42 do
43 - mkdir -p ${CHROOT}/$i
44 - chmod 755 ${CHROOT}/$i
45 - mount -t tmpfs tmpfs ${CHROOT}/$i
46 - str="${str} ${i}"
47 + mkdir -p "${CHROOT}${i}"
48 + chmod 755 "${CHROOT}${i}"
49 +
50 + mount -t tmpfs tmpfs "${CHROOT}${i}"
51 + str="${i} ${str}"
52 done
53 +
54 warn_msg "${str}are mounted in ram"
55 warn_msg "consider saving important files elsewhere"
56 - read -t 3 UNUSEDVAL
57 +
58 + sleep 2
59 +
60 for i in ${CDROOT_PATH} ${overlay} ${static}; do
61 mount --move ${NEW_ROOT}${i} ${CHROOT}${i}
62 done