Skip to contentSkip to conversation

um: register with systemd-machined

PATCH New Thomas Meyer 1 participant 1 message Sep 13, 2014 User-mode Linux (UML)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 um: register with systemd-machined

Hi,

This patch registers an UML instance with systemd-machined. You may need to modify the dbus policy to allow this request in /etc/dbus-1/system.d/org.freedesktop.machine1.conf

Attached patch crashes the UML kernel, but I've know idea why! Help is appreciated and feedback is welcome!

arch/um/Makefile +3 -1
index e4b1a96..e9e3dee 100644
@@ -132,8 +132,10 @@ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
 
 LD_FLAGS_CMDLINE = $(foreach opt,$(LDFLAGS),-Wl,$(opt))
 
+LINK_DBUS = $(shell pkg-config --libs dbus-1)
+
 # Used by link-vmlinux.sh which has special support for um link
-export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE)
+export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE) $(LINK_DBUS)
 
 # When cleaning we don't include .config, so we don't include
 # TT or skas makefiles and don't clean skas_ptregs.h.
arch/um/include/shared/os.h +1 -0
index 08eec0b..13f8f10 100644
@@ -217,6 +217,7 @@ extern int helper_wait(int pid);
 extern int umid_file_name(char *name, char *buf, int len);
 extern int set_umid(char *name);
 extern char *get_umid(void);
+extern char *get_uml_dir_realpath(void);
 
 /* signal.c */
 extern void timer_init(void);
arch/um/os-Linux/Makefile +4 -2
index 08ff509..23559a3 100644
@@ -5,16 +5,18 @@
 
 obj-y = aio.o execvp.o file.o helper.o irq.o main.o mem.o process.o \
        registers.o sigio.o signal.o start_up.o time.o tty.o \
-       umid.o user_syms.o util.o drivers/ skas/
+       umid.o user_syms.o util.o drivers/ skas/ machined.o
 
 obj-$(CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA) += elf_aux.o
 
 USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \
        main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \
-       tty.o umid.o util.o
+       tty.o umid.o util.o machined.o
 
 HAVE_AIO_ABI := $(shell [ -r /usr/include/linux/aio_abi.h ] && \
        echo -DHAVE_AIO_ABI )
 CFLAGS_aio.o += $(HAVE_AIO_ABI)
 
+CFLAGS_machined.o += $(shell pkg-config --cflags dbus-1 )
+
 include arch/um/scripts/Makefile.rules
arch/um/os-Linux/machined.c new file +89 -0

89 lines not on this page · raw message

arch/um/os-Linux/umid.c +40 -29

144 lines not on this page · raw message

------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
User-mode-linux-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel