webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-20 16:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pakfire3

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-06-15 08:23:18 +02:00
parent ea9cfe0784 88af830315
commit ca8e0b97d1
41 changed files with 581 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/paks/mpfire/install.sh
View File

@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
@@ -28,7 +28,9 @@ ln -svf /etc/init.d/mpd /etc/rc.d/rc0.d/K35mpd
ln -svf /etc/init.d/mpd /etc/rc.d/rc6.d/K35mpd
ln -svf /var/ipfire/mpfire/mpd.conf /etc/mpd.conf
chmod 755 /srv/web/ipfire/html/images/mpfire
touch /var/log/mpd.error.log
touch /var/log/mpd.log
restore_backup ${NAME}
# comment removed option from config
sed -i -e "s|^error_file|#error_file|g" /var/ipfire/mpfire/mpd.conf
#
/etc/init.d/mpd start

28
src/patches/qemu-0.14.1_missing_ATFCWD_hack.patch Normal file
View File

@@ -0,0 +1,28 @@
diff -Naur qemu-0.14.1.org/hw/virtio-9p-local.c qemu-0.14.1/hw/virtio-9p-local.c
--- qemu-0.14.1.org/hw/virtio-9p-local.c 2011-05-06 21:01:43.000000000 +0200
+++ qemu-0.14.1/hw/virtio-9p-local.c 2011-05-18 14:04:32.432444320 +0200
@@ -10,6 +10,7 @@
* the COPYING file in the top-level directory.
*
*/
+
#include "virtio.h"
#include "virtio-9p.h"
#include "virtio-9p-xattr.h"
@@ -20,6 +21,16 @@
#include <sys/un.h>
#include <attr/xattr.h>
+#ifndef AT_FDCWD
+/* Copied from linux/include/linux/fcntl.h * because direct include fails */
+#define AT_FDCWD -100 /* Special value used to indicate
+ openat should use the current
+ working directory. */
+#define AT_SYMLINK_NOFOLLOW 0x100 /* Do not follow symbolic links. */
+#define AT_REMOVEDIR 0x200 /* Remove directory instead of
+ unlinking file. */
+#define AT_SYMLINK_FOLLOW 0x400 /* Follow symbolic links. */
+#endif
static int local_lstat(FsContext *fs_ctx, const char *path, struct stat *stbuf)
{