diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-16 07:29:20 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-07-16 07:29:20 +0000 |
| commit | 0c206a6e3e6362196c1dbad9eb23a77fb6d8a863 (patch) | |
| tree | 400f763e04c9d7adbec64725427f52b1c8248e0b /main/openrc | |
| parent | 0e622202d6854686828af15a7eb85b871052bf5f (diff) | |
| download | aports-0c206a6e3e6362196c1dbad9eb23a77fb6d8a863.tar.bz2 aports-0c206a6e3e6362196c1dbad9eb23a77fb6d8a863.tar.xz | |
main/openrc: hide error when migrating /var/run to /run
The script tries to copy non-existing files. We simply hide the error
ref #3160
Diffstat (limited to 'main/openrc')
| -rw-r--r-- | main/openrc/APKBUILD | 6 | ||||
| -rw-r--r-- | main/openrc/hide-migrate-to-run-error.patch | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 75b068719..d4134e46e 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.12.4 _ver=${pkgver/_git*/} -pkgrel=1 +pkgrel=2 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" arch="all" @@ -18,6 +18,7 @@ source="http://distfiles.gentoo.org/distfiles/$pkgname-$_ver.tar.bz2 swap-umount-tmpfs.patch swap-ifexists.patch begin-end-decls.patch + hide-migrate-to-run-error.patch hostname.initd hwdrivers.initd @@ -71,6 +72,7 @@ dc910534c79ebcb0dd76c634b2ff57c5 0001-sysctl.Linux.in-remove-lxc-from-exclusion c2af5e52da614a6cef02d1e4d537e360 swap-umount-tmpfs.patch 1c426b84d13a725ad493647b5253f239 swap-ifexists.patch 00c0d99a19915fac57a20e5995f57bdb begin-end-decls.patch +679c559aa54f9e855cd735866eeaaad6 hide-migrate-to-run-error.patch c32e15b0858eef708497e7ee6355a055 hostname.initd ce3832d8ed5906367ef0f4776b38f3bd hwdrivers.initd 33ca3e558c42cdd17adccbc7807298f7 keymaps.initd @@ -85,6 +87,7 @@ e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066 0001-Force-roo 84d67ed2cf050e20f52d4ea048e7452e78356ba02b396d8c064a4458c0811ea4 swap-umount-tmpfs.patch 8978b00492d90b573f5254cc394582e8f1a5cd8b4d6c928fa0a9a022dd17fe9c swap-ifexists.patch d3b20f5cb053ed24d7b76b75aeef98b9f2bc77401930fa934c9452fa634db18c begin-end-decls.patch +786580df90a5a75087e5adfd395d160dee2df4b994e0938e8524198aeaf2d774 hide-migrate-to-run-error.patch e91790d23135c43102ea73e5768d4b0d25e9a7d28fca90f1b902aac9c41e1d5c hostname.initd a71a38309beb6f4718a2ece863659735a5e157a7c927518265e562cd90fc71ff hwdrivers.initd a6f013c02ca3efb4e29b4844e4d27710cfd319e66157c4fd88a8169e06e7151f keymaps.initd @@ -99,6 +102,7 @@ eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5c 8fd442d372401740b1c523367c928f49efa8179604aac2b517cdc4264daf303056d5a5e0a2c996db5e6ef9b7cdd0619a16cfabc15c3399e322384844e2a36542 swap-umount-tmpfs.patch c5b8806c693b0ea48ff87e0e3669304f5c2f95954ad54814889047a933f367081a8c8d3bb771dd1ed6c3bc845df894232bd6b662066d09eba3abf3964187d1d1 swap-ifexists.patch 92788e88c0da278f6673df90cd34f8204b8226305f7ee3e43e33566f1c7b8ff819bba954d82c14305f4174a76398abe7e029ee99e816cc94963a65d42ec89c92 begin-end-decls.patch +750e3305913d3f6fa6baa0b34b851fe17aacb922e864b95ec9b4b451e8e3c16d0c10686a12f4c7cb9b5d05894e1d89b0dac3beed19b1223d3fbc672f25769145 hide-migrate-to-run-error.patch 6de80fd9ff9692bb15aa0a90255beea939a4f79b4fdff9fdf443d85bf168c162183efa44d7769af855f9c2460c77f29df19037eca09156ac42dd01fba7be9934 hostname.initd 932669915d0e4c8b7d23823c6d057d5d3bbc7f2f67532547201fea986c7e3208607d69cfdd41b0b0b1828f33c4e87efb8d65f7a715c33a8c9cdc846b7ec7439b hwdrivers.initd ee58de9b8608d3f3aa6111b9b43977b91bd2c39bcc3471711812fe740dbc49eee8a7ddd6f2878b90c8eb9bcc5a2f543cb2d82c04f16c263ffad58de7955d8db5 keymaps.initd diff --git a/main/openrc/hide-migrate-to-run-error.patch b/main/openrc/hide-migrate-to-run-error.patch new file mode 100644 index 000000000..00e529930 --- /dev/null +++ b/main/openrc/hide-migrate-to-run-error.patch @@ -0,0 +1,13 @@ +See http://bugs.alpinelinux.org/issues/3160 + +--- openrc-0.12.4.orig/init.d/bootmisc.in ++++ openrc-0.12.4/init.d/bootmisc.in +@@ -105,7 +105,7 @@ + rm $src + elif [ ! -L $src -a -d $src ]; then + ebegin "Migrating $src to $dst" +- cp -a $src/* $dst/ ++ cp -a $src/* $dst/ 2>/dev/null + rm -rf $src + eend $? + fi |