diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-12-14 19:39:39 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-12-14 19:39:39 +0000 |
| commit | 80d605882d4bd6c6d4ed424be4c5e5fa72b1548a (patch) | |
| tree | 10bacdf82e591d21191dcbb1148768d112a62f9f /sys-apps/baselayout/files | |
| parent | Add hacked up djvu fix for -gpl for bug 158079 (diff) | |
| download | gentoo-2-80d605882d4bd6c6d4ed424be4c5e5fa72b1548a.tar.gz gentoo-2-80d605882d4bd6c6d4ed424be4c5e5fa72b1548a.tar.bz2 gentoo-2-80d605882d4bd6c6d4ed424be4c5e5fa72b1548a.zip | |
Fix #156766
(Portage version: 2.1.2_rc3-r5)
Diffstat (limited to 'sys-apps/baselayout/files')
| -rw-r--r-- | sys-apps/baselayout/files/baselayout-1.12.7-halt.patch | 29 | ||||
| -rw-r--r-- | sys-apps/baselayout/files/digest-baselayout-1.12.7-r4 | 3 |
2 files changed, 32 insertions, 0 deletions
diff --git a/sys-apps/baselayout/files/baselayout-1.12.7-halt.patch b/sys-apps/baselayout/files/baselayout-1.12.7-halt.patch new file mode 100644 index 000000000000..398a050a8fff --- /dev/null +++ b/sys-apps/baselayout/files/baselayout-1.12.7-halt.patch @@ -0,0 +1,29 @@ +--- init.d/halt.sh (revision 2421) ++++ init.d/halt.sh (working copy) +@@ -106,6 +106,11 @@ + continue + fi + ++ # If we're using the mount (probably /usr) then don't unmount us ++ if [[ " $(fuser -m "${x}" 2>/dev/null) " == *" $$ "* ]] ; then ++ continue ++ fi ++ + if ! umount "${x}" &>/dev/null; then + # Kill processes still using this mount + /bin/fuser -s -k -9 -m "${x}" +@@ -156,9 +161,13 @@ + + for x in $(awk '{print $2}' /proc/mounts | sort -ur) ; do + x=${x//\\040/ } +- if [[ -n $(echo "${x}" | egrep "${RC_NO_UMOUNTS}") ]] ; then ++ ++ # Do not umount these ... will be different depending on value of CDBOOT ++ if [[ ${x} != "/" \ ++ && -n $(echo "${x}" | egrep "${RC_NO_UMOUNTS}") ]] ; then + continue + fi ++ + if [[ ${cmd} == "u" ]]; then + umount -n -r "${x}" + else diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.7-r4 b/sys-apps/baselayout/files/digest-baselayout-1.12.7-r4 new file mode 100644 index 000000000000..091d0563a091 --- /dev/null +++ b/sys-apps/baselayout/files/digest-baselayout-1.12.7-r4 @@ -0,0 +1,3 @@ +MD5 c068b7a3ec199be5c96b049609d4ed82 baselayout-1.12.7.tar.bz2 221590 +RMD160 885c424cf34d2a9b2d814bad91f7902ea8182079 baselayout-1.12.7.tar.bz2 221590 +SHA256 52fddebeb156a49712e35a98de4a30fe23ee0e541b2b12d4195ed45193b735ca baselayout-1.12.7.tar.bz2 221590 |