[patch] context diff against halt.sh

halt.sh.patch (text/plain), 1.09 KB, created by Mark McKenna on 2006-04-17 00:10:17 UTC

*** halt.sh	Sun Apr 16 12:07:24 2006
--- /etc/init.d/halt.sh	Sun Apr 16 12:00:07 2006
***************
*** 75,80 ****
--- 75,83 ----
  # Try to unmount all filesystems (no /proc,tmpfs,devfs,etc).
  # This is needed to make sure we dont have a mounted filesystem 
  # on a LVM volume when shutting LVM down ...
+ # Mark (14/04/2006): Added '-k2' to the sort options, so sorting happens 
+ # by mount target instead of mount source.  Fixes problems with nested
+ # mounts.
  ebegin "Unmounting filesystems"
  unmounts=$( \
  	awk '{ \
***************
*** 82,88 ****
  	        ($1 != "none") && \
  	        ($1 !~ /^(rootfs|\/dev\/root)$/) && \
  	        ($2 != "/")) \
! 	      print $2 }' /proc/mounts | sort -ur)
  for x in ${unmounts}; do
  	# Do not umount these if we are booting off a livecd
  	if [[ -n ${CDBOOT} ]] && \
--- 85,91 ----
  	        ($1 != "none") && \
  	        ($1 !~ /^(rootfs|\/dev\/root)$/) && \
  	        ($2 != "/")) \
! 	      print $2 }' /proc/mounts | sort -k2 -ur)
  for x in ${unmounts}; do
  	# Do not umount these if we are booting off a livecd
  	if [[ -n ${CDBOOT} ]] && \