Merge branch '2.8' into 3.0

ed/.md5sum

@@ -1 +1 @@
-9a78593decccaa889523aa4bb555ed4b  ed-1.6.tar.gz
+0aa4e2428e325203d0d7c3e86c961b1c  ed-1.7.tar.gz

ed/Pkgfile

@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=ed
-version=1.6
+version=1.7
 release=1
 source=(ftp://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
 

iputils/.md5sum

@@ -1,2 +1,2 @@
-6cc7f73f3a057d0a3b484422ab0e31ae  iputils-man-s20121114.tar.xz
-3966df066d598183f459011139e8987f  iputils-s20121114.tar.bz2
+60941cef3b9f17b2c7245ac640ed211c  iputils-man-s20121126.tar.xz
+520f0ce93fbe0cfada6ed65cd06c227c  iputils-s20121126.tar.bz2

iputils/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on: libcap openssl sysfsutils
 
 name=iputils
-version=s20121114
+version=s20121126
 release=1
 source=(http://www.skbuff.net/iputils/$name-$version.tar.bz2
         http://crux.nu/files/distfiles/$name-man-$version.tar.xz)

rc/.md5sum

@@ -5,5 +5,5 @@ afe5cd67920474246ae74e54a9845339  rc.fix
 d1be35927946756c68242f29c16ee983  rc.local
 394d5cff98ab59fd1a0ec64fe79292cb  rc.modules
 a2d24525ca3ff1daf5753edcdf89466b  rc.multi
-d3a1e6e3edad489020fd56305bed8d6f  rc.shutdown
+a46c238c63564a289318b771f81e602d  rc.shutdown
 d8d9bd102b0177a7bb30db9fd088a6e8  rc.single

rc/Pkgfile

@@ -3,8 +3,8 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=rc
-version=2.26
-release=3
+version=2.27
+release=1
 source=(inittab rc rc.modules rc.single rc.multi rc.local rc.fix rc.shutdown rc.conf)
 
 build() {

rc/rc.shutdown

@@ -43,14 +43,14 @@ fi
 /sbin/swapoff -a
 
 # Unmount file systems
-/bin/umount -a -r -t nosysfs,noproc
+/bin/umount -a -d -r -t nosysfs,noproc,nodevtmpfs
 if [ -x /sbin/lvm ]; then
 	/sbin/vgchange --ignorelockingfailure -a n
 fi
 /bin/umount -a -r
 
 # Remount root filesystem read-only
-/bin/mount -n -o remount,ro /
+/bin/mount -o remount,ro /
 
 # Power off or reboot
 if [ "$RUNLEVEL" = "0" ]; then