aboutsummaryrefslogtreecommitdiffstats
path: root/main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-03-09 11:02:36 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-03-09 11:03:19 +0000
commit286c94706777d592232e3e2bdf56a22629525654 (patch)
tree72a4adb654ff20efcc750c8b98a2e69f3b627b61 /main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch
parent81d00b2da8ddeb425e5f7837204ef475bf6b02d0 (diff)
downloadaports-286c94706777d592232e3e2bdf56a22629525654.tar.bz2
aports-286c94706777d592232e3e2bdf56a22629525654.tar.xz
main/mkinitfs: upgrade to 2.4.4
should fix the: /init: eval: line 1: KOPT_vmlinuz-3.6.11-grsec=yes: not found
Diffstat (limited to 'main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch')
-rw-r--r--main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch b/main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch
deleted file mode 100644
index 41d1bdd1d2..0000000000
--- a/main/mkinitfs/0001-Revert-init-only-use-etc-apk-world-when-it-exists.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4c8535b759fb9f2b34d05f971bee3a4ecc86b734 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 17 May 2012 14:33:18 +0000
-Subject: [PATCH] Revert "init: only use /etc/apk/world when it exists"
-
-We can not only use /etc/apk/world since it will always
-be there due to previous apk add --initdb.
-
-Instead, clean up the /var/lib/apk/world after upgrade
-
-This reverts commit 8981ccbf5b2636c7d2e06b08ffdf87be80fe19c8.
-
-Conflicts:
- initramfs-init.in
----
- initramfs-init.in | 12 +++++-------
- 1 file changed, 5 insertions(+), 7 deletions(-)
-
-diff --git a/initramfs-init.in b/initramfs-init.in
-index b14ebf9..6e1ebc1 100755
---- a/initramfs-init.in
-+++ b/initramfs-init.in
-@@ -481,13 +481,11 @@ if [ -f "$ovl" ]; then
- # hack, incase /root/.ssh was included in apkovl
- [ -d "$sysroot/root" ] && chmod 700 "$sysroot/root"
- pkgs="$pkgs $(sed 's/\#.*//' $sysroot/etc/lbu/packages.list 2>/dev/null)"
-- rm -f "$sysroot"/etc/lbu/packages.list
-- for world in etc/apk/world var/lib/apk/world; do
-- if [ -e "$sysroot/$world" ]; then
-- pkgs="$pkgs $(cat $sysroot/$world)"
-- break;
-- fi
-- done
-+ pkgs="$pkgs $(cat $sysroot/var/lib/apk/world \
-+ $sysroot/etc/apk/world 2>/dev/null)"
-+ # clean up after upgrade
-+ rm -f $sysroot/etc/lbu/packages.list \
-+ $sysroot/var/lib/apk/world
-
- # fix up inittab from pre openrc times (alpine v1.8)
- if [ -f "$sysroot"/etc/inittab ]; then
---
-1.7.10.2
-