diff options
| author | Michael Mason <ms13sp@gmail.com> | 2009-10-21 18:38:40 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2009-10-21 18:38:40 +0000 |
| commit | 2eadad10af7f815439136e1aaf1a5d62dbdecf9e (patch) | |
| tree | 3e8bd7b0ddd6c6ef31d2955ce1af47c403311c6e /testing/util-vserver/alpine.patch | |
| parent | 25e560739dfeb0a40744b5204a223a6c41fa7bf9 (diff) | |
| parent | 4da6bc73c580cc198a9b37c79e63c6e9e6640a67 (diff) | |
| download | aports-2eadad10af7f815439136e1aaf1a5d62dbdecf9e.tar.bz2 aports-2eadad10af7f815439136e1aaf1a5d62dbdecf9e.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'testing/util-vserver/alpine.patch')
| -rw-r--r-- | testing/util-vserver/alpine.patch | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/testing/util-vserver/alpine.patch b/testing/util-vserver/alpine.patch index a9914a4b84..eacc2cb624 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 |