diff options
| author |   Fernando Reyes (likewhoa) <design@missionaccomplish.com> | 2014-05-30 02:51:08 +0200 |
|---|---|---|
| committer |   Rick Farina (Zero_Chaos) <zerochaos@gentoo.org> | 2015-04-29 13:31:45 -0400 |
| commit | 5a62af115cf85e15fbac4f35d98af2a5bf34d004 (patch) | |
| tree | deaf8f74de564df15de27a81b0623d0bcbe5481f | |
| parent | Removing --bind on some directories to prevent ${NEW_ROOT} path (diff) | |
| download | genkernel-5a62af11.tar.gz genkernel-5a62af11.tar.bz2 genkernel-5a62af11.zip | |
Enhanced the shutdown process and changed from using ${UNION} to ${CHROOT} to
better understand the logic behind things as CHROOT is set to ${UNION} anyways.
RC_NO_UMOUNTS is more dynamic now and should scale up.
| -rwxr-xr-x | defaults/initrd.defaults | 1 | ||||
| -rw-r--r-- | defaults/linuxrc | 45 |
2 files changed, 32 insertions, 14 deletions
diff --git a/defaults/initrd.defaults b/defaults/initrd.defaults index aa9f85cb..9937e008 100755 --- a/defaults/initrd.defaults +++ b/defaults/initrd.defaults @@ -58,6 +58,7 @@ KSUFF='.ko' REAL_ROOT='' CONSOLE='/dev/console' NEW_ROOT='/newroot' +RC_NO_UMOUNTS="/newroot|/newroot/mnt/changesdev|/mnt/overlay|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino" CDROOT='0' CDROOT_DEV='' CDROOT_TYPE='auto' diff --git a/defaults/linuxrc b/defaults/linuxrc index 0a91c58d..5d4d2a17 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -805,24 +805,38 @@ then if [ "${USE_AUFS_NORMAL}" -eq '1' ] then - union_insert_dir ${UNION} ${NEW_ROOT}/${FS_LOCATION} + union_insert_dir ${CHROOT} ${NEW_ROOT}/${FS_LOCATION} # Make sure fstab notes livecd is mounted ro. Makes system skip remount which fails on aufs dirs. # TODO: remounting all tmpfs as RO seems weird, can we be more specific? - sed -e 's|\(.*\s/\s*tmpfs\s*\)defaults\(.*\)|\1defaults,ro\2|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new - mv /${UNION}/etc/fstab.new /${UNION}/etc/fstab + #sed -e 's|\(.*\s/\s*tmpfs\s*\)defaults\(.*\)|\1defaults,ro\2|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new + #mv /${UNION}/etc/fstab.new /${UNION}/etc/fstab # RC_NO_UMOUNTS variable for a clean shutdown/reboot - test ! $(grep 'RC_NO_UMOUNTS="/newroot|/newroot/mnt/aufs|\ -/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|/.unions/\ -memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) && - echo "RC_NO_UMOUNTS=\"/newroot|/newroot/mnt/aufs|"\ -"/newroot/mnt/changesdev|/mnt/livecd|/mnt/cdrom|"\ -"/.unions/memory|/.unions/memory/xino\"">> "${UNION}"/etc/rc.conf + RC_MOUNTS=$(grep 'RC_NO_UMOUNTS' "${CHROOT}"/etc/rc.conf) + RESULTS=false + + # Iterate through ${RC_MOUNTS} to find our duplicate(s) and or remove obsolete lines when ever + # our RC_NO_UMOUNTS variable changes. + printf '%s\n' ${RC_MOUNTS} | while read -r mount; do + if [[ "${mount}" = "RC_NO_UMOUNTS=\"${RC_NO_UMOUNTS}\"" ]]; then + RESULTS=true + else + # Escape characters in ${mounts} for use in sed + mount_re=$(echo ${mount} | sed -e 's/\//\\\//g' -e 's/\&/\\\&/g') + + # Remove non matching pattern + sed -i "/${mount_re}/d" "${CHROOT}"/etc/rc.conf + fi + done + + if ! ${RESULTS}; then + echo 'RC_NO_UMOUNTS="/newroot|/newroot/mnt/changesdev|/mnt/overlay|/mnt/livecd|/mnt/cdrom|/.unions/memory|/.unions/memory/xino"'>> "${CHROOT}"/etc/rc.conf + fi # Fstab change for aufs - test ! $(grep aufs "${UNION}"/etc/fstab) && - echo "aufs / aufs defaults 0 0" > "${UNION}"/etc/fstab + test ! $(grep -o ^aufs "${CHROOT}"/etc/fstab) && + echo "aufs / aufs defaults 0 0" > "${CHROOT}"/etc/fstab warn_msg "Adding all modules in $MODULESD/modules/" if [ -z "${MODULESD}" ] @@ -834,9 +848,12 @@ memory|/.unions/memory/xino"' "${UNION}"/etc/rc.conf) && union_insert_modules ${NEW_ROOT}/mnt/modulesd fi - mkdir -p "${UNION}"/newroot/mnt/aufs - test ${AUFS_CHANGES} && test ! -d "${UNION}"/newroot/mnt/changesdev && - mkdir "${UNION}"/newroot/mnt/changesdev + # Create the directories for our new union mounts + test ! -d "${CHROOT}${NEW_ROOT}" && mkdir -p "${CHROOT}${NEW_ROOT}" + + if ${AUFS_CHANGES} && [ ! -d "${CHROOT}${NEW_ROOT}/mnt/changesdev" ]; then + mkdir -p "${CHROOT}${NEW_ROOT}/mnt/changesdev" + fi fi # Unpacking additional packages from NFS mount |