diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-05 21:32:54 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-05 21:33:34 +0000 |
| commit | f5cb59b3beb9454345e0c5dfb74e99d4c1bf190e (patch) | |
| tree | 3d4b8952e128562d57becb7d063a9353e77e2358 /main/alpine-conf/0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch | |
| parent | 905da4096263abd2765d0239eba80e67cca4b556 (diff) | |
| download | aports-f5cb59b3beb9454345e0c5dfb74e99d4c1bf190e.tar.bz2 aports-f5cb59b3beb9454345e0c5dfb74e99d4c1bf190e.tar.xz | |
main/alpine-conf: add fakeroot fixes for update-kernel
Diffstat (limited to 'main/alpine-conf/0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch')
| -rw-r--r-- | main/alpine-conf/0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/main/alpine-conf/0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch b/main/alpine-conf/0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch new file mode 100644 index 0000000000..a7fe05a360 --- /dev/null +++ b/main/alpine-conf/0002-update-kernel-don-t-install-deps-if-script-runs-in-f.patch @@ -0,0 +1,36 @@ +From 439c020e268830965fd5ee90147e93e753855caf Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Mon, 5 Dec 2016 21:05:51 +0000 +Subject: [PATCH 2/3] update-kernel: don't install deps if script runs in + fakeroot + +--- + update-kernel.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/update-kernel.in b/update-kernel.in +index 6d24649..918055a 100644 +--- a/update-kernel.in ++++ b/update-kernel.in +@@ -154,14 +154,16 @@ clean_up() { + set +e + ignore_sigs + +- [ "$SUPERUSER" ] && apk del $QUIET_OPT $VIRTUAL ++ if [ "$SUPERUSER" ] && [ -z "$FAKEROOTKEY" ]; then ++ apk del $QUIET_OPT $VIRTUAL ++ fi + rm -fr $TMPDIR + } + + trap clean_up EXIT $SIGNALS + + +-if [ "$SUPERUSER" ]; then ++if [ "$SUPERUSER" ] && [ -z "$FAKEROOTKEY" ]; then + apk add $QUIET_OPT --update-cache -t $VIRTUAL mkinitfs squashfs-tools kmod + fi + +-- +2.11.0 + |