main/busybox-initscripts: use openrc's devfs for mdev-mount

3 files changed, 7 insertions, 79 deletions

diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 66d0943863..d7969e6239 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox-initscripts
-pkgver=2.2
-pkgrel=27
+pkgver=2.3
+pkgrel=0
 pkgdesc="Init scripts for busybox daemons"
 url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 arch="noarch"
@@ -13,7 +13,7 @@ install=$pkgname.post-install
 subpackages=
 replaces="alpine-baselayout openntpd"
 source="acpid.initd cron.initd dnsd.initd httpd.initd inetd.initd klogd.initd 
-	mdev-mount.initd mdev.initd ntpd.initd rdate.initd syslog.initd
+	mdev.initd ntpd.initd rdate.initd syslog.initd
 	watchdog.initd cron.confd klogd.confd ntpd.confd rdate.confd syslog.confd
 	watchdog.confd mdev.conf dvbdev ide_links usbdev usbdisk_link xvd_links
 	default.script
@@ -57,8 +57,7 @@ md5sums="f3a3ccbd527e8c359ec285a39a805d47  acpid.initd
 bdb6830041b77db4a3de3b35ed326d5e  httpd.initd
 12fffa82b698267240acd4bdaa4861da  inetd.initd
 96d5eb83477a8adc007a0ac4aedc0e61  klogd.initd
-756172d742b5d3e0877cf6396a9aaf20  mdev-mount.initd
-3998e1d4d0a55b64af058d66861010f7  mdev.initd
+b86749a0a4167e0a6178a217b264d0f6  mdev.initd
 88ac156aa6cc3999805d526498765d07  ntpd.initd
 e70b6427fb7b52f49801bcdfb99db3a2  rdate.initd
 763ef3ade65e24d89fe980651abfc915  syslog.initd
@@ -82,8 +81,7 @@ d80bc50815de5cb58df53d969ccf682f3c34b62f1815830dc16e8813d7f0423c  cron.initd
 010542f0718fcbc42273068dfc88d3518c919a73576b9ffab4795a6d36ce3f40  httpd.initd
 53ddd392736957d6a36157c190e0428fbb0c3a27925c63df8188f3461e74410d  inetd.initd
 9b90176cb12a1b3a7a558ac3c03ba445409979c04e142c6f5aba8a5f10ea0c83  klogd.initd
-59168724e5ec89d5492b9abc77e8aa28f7816af35cdef1fbae78589d1cc1db0c  mdev-mount.initd
-33b34ad1df2605ca2e0d4a91dfcafbb725ad7f0443df34d30d09f70e5b928337  mdev.initd
+e08f595cb22ad4aef4d48deabb933067407a4b94be131d078ebd715fd7e380d3  mdev.initd
 4a32eea4da1e9eaf6c5ecfce20a297b55de3a1d479bc0578286d769be0114a7b  ntpd.initd
 0c6eb4dc269386472f475cf9c549ba53b73aa33f044fbfb3b6bc6dd2574bb341  rdate.initd
 36ec4261992bc72ee8b037ee1446b74f8a488e89bd23a112bc3b5b34a2c27377  syslog.initd
@@ -107,8 +105,7 @@ sha512sums="8663ffab45498f9626c6a023a28be6533a74be2ecaf746e8c1fb7b8092e77d8734da
 66bfd7d2a03f4e8a50f08b7057091bfef8e36001eb7c07574ec45da6d75db05a88ae37dbd51e3e3fc7b00a784bf69f8416682ce0454ca16cc072358abdf4d2ce  httpd.initd
 82fb2ed926e7fbd87f3df7aba556ccb27ddd1fbd79e823acf00aea4ac41c5c5bf58dbf9488dd10b268371b40994a3cca9e305c1177a1628f72b9a1d3ebce0702  inetd.initd
 664c4ccfb0c10f450c9acda97a442590d06fc36bf1c7b208e0cb6f3f9c57e47935dfa9151aced8aaab2946d9658f2f9f57b5d3cca5296ce4a0e0c1268af74cea  klogd.initd
-911f03015ac88697b23d245c65afeaafadb34f79635810706b5dba727d5f7eb2c1d793cdd423a53d935f4b2e42e450c9f6b73e46ba3a937125c73af0be2c510d  mdev-mount.initd
-7ddb962910238c24439848da345e5449525815fe6b911d589821dac9167f8e1c05a1f6a6e27f439c887e45594735d1ba91f7935047cc8feec62537a3804442f2  mdev.initd
+1aed59fb048f0636ee8a095a089a20554a20eda84c70485a894ae60b0f97b792b7ce8e832557457258f59a2750735c4a25e247364ccf1180e9652b292a5f9e8d  mdev.initd
 c30d3936e045c01fdc9d1e9d1c0d2cd79b6dabb453400f067bc4eefa239a41c98bbe3fcd3ae53792e0e6d8fcf4aebc727e4524ec3ccd5741d5659a0a351c1c7e  ntpd.initd
 a95d03564712803fc58c48534f2fbbf23dd8418ffd3a6a06f840e969627892eea518b4fe17f059850665fc056cedf972c26aee52c309805987fb5c59a710bd30  rdate.initd
 683fe4180dbbca2fbcf56680b0434f0783db000fda9298f48b9ec268ad20b0cf21813cfb19eaad2c52f7a7f7246e9f88e0f06dbd8d14360f5406c87bd8665b04  syslog.initd
diff --git a/main/busybox-initscripts/mdev-mount.initd b/main/busybox-initscripts/mdev-mount.initd
deleted file mode 100644
index b5c43715e3..0000000000
--- a/main/busybox-initscripts/mdev-mount.initd
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/sbin/openrc-run
-# Largely based on Gentoo's udev-mount
-#
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-
-description="Mount tmpfs on /dev"
-
-depend() {
-	keyword -vserver -lxc
-}
-
-mount_dev_directory()
-{
-	if [ "$(mountinfo -t /dev)" = "mdev" ]; then
-		# already mounted
-        	if fstabinfo --quiet /dev; then
-	                mount -o remount -n /dev
-		fi
-		return 0
-	fi
-
-        # No options are processed here as they should all be in /etc/fstab
-        ebegin "Mounting /dev"
-	mkdir -p /dev
-        if fstabinfo --quiet /dev; then
-                mount -n /dev
-        else
-                # Some devices require exec, Bug #92921
-                mount -n -t tmpfs -o "exec,nosuid,mode=0755,size=1M" mdev /dev
-        fi
-        eend $?
-}
-
-seed_dev()
-{
-        # Seed /dev with some things that we know we need
-
-        # creating /dev/console, /dev/tty and /dev/tty1 to be able to write
-        # to $CONSOLE with/without bootsplash before udevd creates it
-        [ -c /dev/console ] || mknod -m 600 /dev/console c 5 1
-        [ -c /dev/tty1 ] || mknod -m 620 /dev/tty1 c 4 1
-        [ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0
-
-        # udevd will dup its stdin/stdout/stderr to /dev/null
-        # and we do not want a file which gets buffered in ram
-        [ -c /dev/null ] || mknod -m 666 /dev/null c 1 3
-
-        # so udev can add its start-message to dmesg
-        [ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11
-
-        # Not provided by sysfs but needed
-	rm -rf /dev/fd
-        ln -snf /proc/self/fd /dev/fd
-        ln -snf fd/0 /dev/stdin
-        ln -snf fd/1 /dev/stdout
-        ln -snf fd/2 /dev/stderr
-        [ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core
-
-        # Create problematic directories
-        mkdir -p /dev/pts /dev/shm
-        return 0
-}
-
-start() {
-	mount_dev_directory || return 1
-	seed_dev
-}
diff --git a/main/busybox-initscripts/mdev.initd b/main/busybox-initscripts/mdev.initd
index b10df2eccd..9dbb994896 100644
--- a/main/busybox-initscripts/mdev.initd
+++ b/main/busybox-initscripts/mdev.initd
@@ -2,7 +2,7 @@
 
 depend() {
 	provide dev
-	need sysfs mdev-mount
+	need sysfs dev-mount
 	before checkfs fsck
 	keyword -vserver -lxc
 }