diff options
| author |   Fernando Reyes (likewhoa) <design@missionaccomplish.com> | 2014-05-29 04:40:18 +0200 |
|---|---|---|
| committer |   Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2015-04-29 13:31:45 -0400 |
| commit | 48f1906ab8d4e8e3172511a95571018ad62e01a8 (patch) | |
| tree | b05c47d4b8128b5f8bd2bc4042e5202fcab23b85 | |
| parent | Cleaner shutdown process preventing aufs related mounts from (diff) | |
| download | genkernel-48f1906ab8d4e8e3172511a95571018ad62e01a8.tar.gz genkernel-48f1906ab8d4e8e3172511a95571018ad62e01a8.tar.bz2 genkernel-48f1906ab8d4e8e3172511a95571018ad62e01a8.zip | |
This fixes /etc/fstab from not working while in setup_aufs function and instead
includes it in the union path.
| -rw-r--r-- | defaults/initrd.scripts | 1 | ||||
| -rw-r--r-- | defaults/linuxrc | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 68c0ef7..c76abb5 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1380,7 +1380,6 @@ setup_squashfs_aufs() { [ ! -d "${NEW_ROOT}${overlay}" ] && mkdir -p "${NEW_ROOT}${overlay}" [ ! -d "${NEW_ROOT}${static}" ] && mkdir -p "${NEW_ROOT}${static}" - echo "aufs / aufs defaults 0 0" > "${NEW_ROOT}"/etc/fstab for i in "${overlay}" "${static}"; do mount --move "${i}" "${NEW_ROOT}${i}"; done # have handy /mnt/cdrom (CDROOT_PATH) as well diff --git a/defaults/linuxrc b/defaults/linuxrc index 6d942a1..d5b424c 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -820,6 +820,10 @@ memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) && "/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|"\ "/.unions/memory|/.unions/memory/xino\"">> "${UNION}"/etc/rc.conf + # Fstab change for aufs + test ! $(grep aufs "${UNION}"/etc/fstab) && + echo "aufs / aufs defaults 0 0" > "${UNION}"/etc/fstab + warn_msg "Adding all modules in $MODULESD/modules/" if [ -z "${MODULESD}" ] then |