summaryrefslogtreecommitdiffstats
path: root/testing/util-vserver/alpine.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-10-21 09:46:40 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-10-21 09:46:40 +0000
commit1269ce209902722dc212d0129a5751a915f5d038 (patch)
tree0356644b19b88bb9bdc9ee397db4086ba1e408be /testing/util-vserver/alpine.patch
parentd0c4ad933961b1ec6f235f1a8b38b3c130a62e17 (diff)
testing/util-vserver: upgrade to 0.30.216-pre2849
added setup-vs-template script updated alpine patch to support 1.8 guests
Diffstat (limited to 'testing/util-vserver/alpine.patch')
-rw-r--r--testing/util-vserver/alpine.patch31
1 files changed, 18 insertions, 13 deletions
diff --git a/testing/util-vserver/alpine.patch b/testing/util-vserver/alpine.patch
index a9914a4b840..eacc2cb6247 100644
--- a/testing/util-vserver/alpine.patch
+++ b/testing/util-vserver/alpine.patch
@@ -1,21 +1,26 @@
-diff -ru a/distrib/alpine/initpost b/distrib/alpine/initpost
---- a/distrib/alpine/initpost 2009-10-02 18:36:00.000000000 +0000
-+++ b/distrib/alpine/initpost 2009-10-02 18:42:35.000000000 +0000
-@@ -24,7 +24,7 @@
- cd "$vdir"
+Index: distrib/alpine/initpost
+===================================================================
+--- a/distrib/alpine/initpost (revision 2855)
++++ b/distrib/alpine/initpost (working copy)
+@@ -1,6 +1,6 @@
+ #!/bin/bash
- echo ">>> Creating missing dirs..."
--$_CHROOT_SH mkdir proc sys dev home etc etc/rcL.d etc/rcK.d 2>/dev/null
-+$_CHROOT_SH mkdir -p proc sys dev home etc 2>/dev/null
-
- # remove mtab which is a link
- if test -e "$vdir/etc/mtab"; then
-@@ -37,7 +37,7 @@
+-# Copyright (C) 2007 Natanael Copa <ncopa@alpinelinux.org>
++# Copyright (C) 2007, 2009 Natanael Copa <ncopa@alpinelinux.org>
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -37,7 +37,12 @@
$_VSERVER "$vserver" stop &>/dev/null || true
$_VSERVER "$vserver" start --rescue --rescue-init /bin/busybox sh -c '
/bin/busybox --install -s
- /sbin/rc_add -s 20 -k syslog
-+ /sbin/rc-update add syslog boot
++ if [ -x /sbin/rc-update ]; then
++ /sbin/rc-update add syslog boot
++ /bin/rmdir /etc/rcL.d /etc/rcK.d
++ else
++ /sbin/rc_add -s 20 -k syslog
++ fi
'
# set up hostname