1 |
commit: fc976d19b7e06465d755ac86559ef4bce82b4656 |
2 |
Author: Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com> |
3 |
AuthorDate: Fri May 30 02:31: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=fc976d19 |
7 |
|
8 |
Wording changes, cosmetic crap |
9 |
|
10 |
--- |
11 |
defaults/initrd.scripts | 21 +++++++++++---------- |
12 |
defaults/linuxrc | 7 ++++--- |
13 |
2 files changed, 15 insertions(+), 13 deletions(-) |
14 |
|
15 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
16 |
index 17777c9..22769bd 100644 |
17 |
--- a/defaults/initrd.scripts |
18 |
+++ b/defaults/initrd.scripts |
19 |
@@ -334,12 +334,12 @@ setup_aufs() { |
20 |
CHANGESDEV=${REAL_ROOT} |
21 |
else |
22 |
CHANGESDEV=${AUFS} |
23 |
- good_msg "mounting ${CHANGESDEV} to ${MEMORY} for aufs support" |
24 |
+ good_msg "Mounting ${CHANGESDEV} to ${MEMORY} for aufs support" |
25 |
mount -t auto ${CHANGESDEV} ${CHANGESMNT} &>/dev/null |
26 |
ret=$? |
27 |
if [ "${ret}" -ne 0 ] |
28 |
then |
29 |
- bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs" |
30 |
+ bad_msg "Mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs" |
31 |
unset AUFS |
32 |
fi |
33 |
fi |
34 |
@@ -359,15 +359,15 @@ setup_aufs() { |
35 |
then |
36 |
if [ ${nbpass} -eq 0 ] |
37 |
then |
38 |
- bad_msg "mounting of changes file failed, Running e2fsck" |
39 |
+ bad_msg "Mounting of changes file failed, Running e2fsck" |
40 |
e2fsck ${CHANGESMNT}/${AUFS_CHANGESFILE} |
41 |
nbpass=$((${nbpass} + 1)) |
42 |
else |
43 |
- bad_msg "mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs" |
44 |
+ bad_msg "Mount of ${CHANGESDEV} failed, falling back to ramdisk based aufs" |
45 |
bad_msg "your ${AUFS_CHANGESFILE} might be messed up, and I couldn't fix it" |
46 |
bad_msg "moving ${AUFS_CHANGESFILE} to ${AUFS_CHANGESFILE}.bad" |
47 |
mv ${CHANGESMNT}/${AUFS_CHANGESFILE} ${CHANGESMNT}/${AUFS_CHANGESFILE}.bad |
48 |
- bad_msg "try to fix it yourself with e2fsck later on, sorry for disturbing" |
49 |
+ bad_msg "Try to fix it yourself with e2fsck" |
50 |
break |
51 |
fi |
52 |
else |
53 |
@@ -383,19 +383,20 @@ setup_aufs() { |
54 |
# empty or we were not able to mount the storage device |
55 |
if [ "${CDROOT}" -eq '1' -a ! -f ${CHANGESMNT}/${AUFS_CHANGESFILE} ] |
56 |
then |
57 |
+ XINO=${MEMORY} |
58 |
umount ${MEMORY} &>/dev/null |
59 |
- bad_msg "failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}" |
60 |
- bad_msg "create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs" |
61 |
- bad_msg "falling back to ramdisk based aufs for safety" |
62 |
+ bad_msg "Failed to find ${AUFS_CHANGESFILE} file on ${CHANGESDEV}" |
63 |
+ bad_msg "Create an ext2 ${AUFS_CHANGESFILE} file on this device if you wish to use it for aufs" |
64 |
+ bad_msg "Falling back to ramdisk based aufs for safety" |
65 |
+ good_msg "Mounting ramdisk to $MEMORY for aufs support" |
66 |
mount -t tmpfs tmpfs ${MEMORY} |
67 |
- XINO=${MEMORY} |
68 |
else |
69 |
XINO=${MEMORY}/xino |
70 |
mkdir -p ${XINO} |
71 |
mount -t tmpfs tmpfs ${XINO} |
72 |
fi |
73 |
else |
74 |
- good_msg "Mounting ramdisk to $MEMORY for aufs support..." |
75 |
+ good_msg "Mounting ramdisk to $MEMORY for aufs support" |
76 |
mount -t tmpfs tmpfs ${MEMORY} |
77 |
XINO=${MEMORY} |
78 |
fi |
79 |
|
80 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
81 |
index 894ec45..009b4c4 100644 |
82 |
--- a/defaults/linuxrc |
83 |
+++ b/defaults/linuxrc |
84 |
@@ -758,9 +758,10 @@ then |
85 |
do_rundebugshell |
86 |
} |
87 |
else |
88 |
- good_msg 'Mounting squashfs & aufs filesystems' |
89 |
+ good_msg 'Mounting squashfs filesystem' |
90 |
+ |
91 |
setup_squashfs_aufs |
92 |
- test_success 'Mount filesystem' |
93 |
+ test_success 'Mount aufs filesystem' |
94 |
fi |
95 |
FS_LOCATION='mnt/livecd' |
96 |
elif [ "${LOOPTYPE}" = 'gcloop' ] |
97 |
@@ -1027,7 +1028,7 @@ then |
98 |
str="${str} ${i}" |
99 |
done |
100 |
warn_msg "${str}are mounted in ram" |
101 |
- warn_msg "consider saving important files elsewhere..." |
102 |
+ warn_msg "consider saving important files elsewhere" |
103 |
read -t 3 UNUSEDVAL |
104 |
for i in ${CDROOT_PATH} ${overlay} ${static}; do |
105 |
mount --move ${NEW_ROOT}${i} ${CHROOT}${i} |