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: Fri, 05 Sep 2014 16:09:59
Message-Id: 1403565075.9c70e584e246785beabdbcff5407c9f1ac388ff6.zerochaos@gentoo
1 commit: 9c70e584e246785beabdbcff5407c9f1ac388ff6
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: Mon Jun 23 23:11:15 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9c70e584
7
8 coding style changes
9
10 ---
11 defaults/linuxrc | 30 +++++++++++++++++++-----------
12 1 file changed, 19 insertions(+), 11 deletions(-)
13
14 diff --git a/defaults/linuxrc b/defaults/linuxrc
15 index 281de8e..42749d6 100644
16 --- a/defaults/linuxrc
17 +++ b/defaults/linuxrc
18 @@ -1014,26 +1014,34 @@ verbose_kmsg
19
20 if [ "${USE_AUFS_NORMAL}" -eq '1' ]
21 then
22 - mkdir -p /${CHROOT}/.unions/memory
23 - mount -o move /memory /${CHROOT}/.unions/memory
24 + UNION_MEMORY=${CHROOT}/.unions/memory
25 +
26 + mkdir -p "${UNION_MEMORY}"
27 + mount --move "${MEMORY}" "${UNION_MEMORY}"
28 test_success "Failed to move aufs /memory into the system root"
29 - for i in mnt/gentoo mnt/livecd /mnt/overlay ${CDROOT_PATH}
30 +
31 + for i in /mnt/gentoo /mnt/livecd /mnt/overlay ${CDROOT_PATH}
32 do
33 - mkdir -p ${CHROOT}/$i
34 - chmod 755 ${CHROOT}/$i
35 + mkdir -p "${CHROOT}${i}"
36 + chmod 755 "${CHROOT}${i}"
37 done
38 +
39 # This will prevent from putting junk on the CHANGESDEV
40 str=""
41 - for i in tmp var/tmp usr/portage/distfiles
42 + for i in /tmp /var/tmp /usr/portage/distfiles
43 do
44 - mkdir -p ${CHROOT}/$i
45 - chmod 755 ${CHROOT}/$i
46 - mount -t tmpfs tmpfs ${CHROOT}/$i
47 - str="${str} ${i}"
48 + mkdir -p "${CHROOT}${i}"
49 + chmod 755 "${CHROOT}${i}"
50 +
51 + mount -t tmpfs tmpfs "${CHROOT}${i}"
52 + str="${i} ${str}"
53 done
54 +
55 warn_msg "${str}are mounted in ram"
56 warn_msg "consider saving important files elsewhere"
57 - read -t 3 UNUSEDVAL
58 +
59 + sleep 2
60 +
61 for i in ${CDROOT_PATH} ${overlay} ${static}; do
62 mount --move ${NEW_ROOT}${i} ${CHROOT}${i}
63 done