Commit 7e49fb6d authored by Natanael Copa's avatar Natanael Copa

main/openrc: fix fsck with vfat partitions

busybox fsck does not support -C option so strip it if fsck is busybox.
parent 38e0ed32
From eb1d69ae84f6d2cb7f081dfca3251b2446a039f0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 28 Nov 2017 13:35:10 +0100
Subject: [PATCH] fsck: don't add -C0 to busybox fsck
---
init.d/fsck.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/init.d/fsck.in b/init.d/fsck.in
index 7052d808..99a9ae4f 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -82,7 +82,7 @@ start()
local skiptypes
skiptypes=$(printf 'no%s,' ${net_fs_list} ${extra_net_fs_list})
[ "${skiptypes}" = "no," ] && skiptypes=""
- fsck_opts="$fsck_opts -C0 -T -t ${skiptypes}noopts=_netdev"
+ fsck_opts="$fsck_opts -T -t ${skiptypes}noopts=_netdev"
if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
fsck_args=${fsck_args:--A -p}
if echo 2>/dev/null >/.test.$$; then
@@ -90,6 +90,9 @@ start()
fsck_opts="$fsck_opts -R"
fi
fi
+ if [ "$(readlink -f $(which fsck))" != "/bin/busybox" ]; then
+ fsck_opts="$fsck_opts -C0"
+ fi
fi
trap : INT QUIT
--
2.15.0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
pkgname=openrc pkgname=openrc
pkgver=0.24.1 pkgver=0.24.1
_ver=${pkgver/_git*/} _ver=${pkgver/_git*/}
pkgrel=3 pkgrel=4
pkgdesc="OpenRC manages the services, startup and shutdown of a host" pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
arch="all" arch="all"
...@@ -20,6 +20,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve ...@@ -20,6 +20,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch 0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
0006-mount-efivars-read-only.patch 0006-mount-efivars-read-only.patch
0007-make-consolefont-service-compatible-with-busyboxs-se.patch 0007-make-consolefont-service-compatible-with-busyboxs-se.patch
0001-fsck-don-t-add-C0-to-busybox-fsck.patch
openrc.logrotate openrc.logrotate
hostname.initd hostname.initd
...@@ -78,6 +79,7 @@ d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc ...@@ -78,6 +79,7 @@ d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc
39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c 0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch 39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c 0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
7221dd2daccd8844f6f9481b7b5921abc2711c8abd1a4bb72f04db8fd8e734b817f5d0d571daea0e2e05d3bc687f75ee1d8025249996bdee0b3328e18d9da7d3 0006-mount-efivars-read-only.patch 7221dd2daccd8844f6f9481b7b5921abc2711c8abd1a4bb72f04db8fd8e734b817f5d0d571daea0e2e05d3bc687f75ee1d8025249996bdee0b3328e18d9da7d3 0006-mount-efivars-read-only.patch
234c4f3cf39df3350dbea25c00b8d584794b28194f44c726767a6a16d91a26fee1b5d2dd16635f19803fc015b4e9d99c52b23128e6b815938b88365feba8cf59 0007-make-consolefont-service-compatible-with-busyboxs-se.patch 234c4f3cf39df3350dbea25c00b8d584794b28194f44c726767a6a16d91a26fee1b5d2dd16635f19803fc015b4e9d99c52b23128e6b815938b88365feba8cf59 0007-make-consolefont-service-compatible-with-busyboxs-se.patch
dbe3f170440f0f357f31ac4d49c56a9a7ec22172df2701bf4a0afdee22aedda1f88b9fa5ffdbe19a5eea3c764ad0e4c802e19b95b7082a72d423d46d30c18edd 0001-fsck-don-t-add-C0-to-busybox-fsck.patch
12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate
99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd hostname.initd 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd hostname.initd
c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55 hwdrivers.initd c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55 hwdrivers.initd
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment