| 1 |
commit: 9385ede320e2b9cb6f6c86fa934516a03cf2ac37 |
| 2 |
Author: Fernando Reyes (likewhoa) <design <AT> missionaccomplish <DOT> com> |
| 3 |
AuthorDate: Thu May 29 02:40:18 2014 +0000 |
| 4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 23 23:11:14 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9385ede3 |
| 7 |
|
| 8 |
This fixes /etc/fstab from not working while in setup_aufs function and instead |
| 9 |
includes it in the union path. |
| 10 |
|
| 11 |
--- |
| 12 |
defaults/initrd.scripts | 1 - |
| 13 |
defaults/linuxrc | 4 ++++ |
| 14 |
2 files changed, 4 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 17 |
index dd3af37..bf4124f 100644 |
| 18 |
--- a/defaults/initrd.scripts |
| 19 |
+++ b/defaults/initrd.scripts |
| 20 |
@@ -1380,7 +1380,6 @@ setup_squashfs_aufs() { |
| 21 |
|
| 22 |
[ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}" |
| 23 |
[ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}" |
| 24 |
- echo "aufs / aufs defaults 0 0" > "${NEW_ROOT}"/etc/fstab |
| 25 |
for i in "${overlay}" "${static}"; do mount --move "${i}" "${NEW_ROOT}${i}"; done |
| 26 |
|
| 27 |
# have handy /mnt/cdrom (CDROOT_PATH) as well |
| 28 |
|
| 29 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
| 30 |
index 6d942a1..d5b424c 100644 |
| 31 |
--- a/defaults/linuxrc |
| 32 |
+++ b/defaults/linuxrc |
| 33 |
@@ -820,6 +820,10 @@ memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) && |
| 34 |
"/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|"\ |
| 35 |
"/.unions/memory|/.unions/memory/xino\"">> "${UNION}"/etc/rc.conf |
| 36 |
|
| 37 |
+ # Fstab change for aufs |
| 38 |
+ test ! $(grep aufs "${UNION}"/etc/fstab) && |
| 39 |
+ echo "aufs / aufs defaults 0 0" > "${UNION}"/etc/fstab |
| 40 |
+ |
| 41 |
warn_msg "Adding all modules in $MODULESD/modules/" |
| 42 |
if [ -z "${MODULESD}" ] |
| 43 |
then |
Archives