Fix install.sh for systemd
PATCH 1/1 Fix install.sh for systemd
On a fedora system, if you run sudo sh install.sh you break your system. The installation clobbers /var/run, a symlink to /run. A subsequent boot fails when /var/run and /run are different since accesses through /var/run can't find items that now only exist in /run and vice-versa.
Skip populating /var/run/xen when systemd is being used. systemd expects an empty /run on boot and works properly without one.
--- tools/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
tools/Makefile +3 -1
@@ -58,9 +58,11 @@ build all: subdirs-all install: $(INSTALL_DIR) -m 700 $(DESTDIR)$(XEN_DUMP_DIR) $(INSTALL_DIR) $(DESTDIR)$(XEN_LOG_DIR) - $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR) $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_DIR) +ifneq ($(CONFIG_SYSTEMD),y) + $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR) $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_STORED) +endif $(INSTALL_DIR) $(DESTDIR)$(PKG_INSTALLDIR) $(MAKE) subdirs-install
Signature · 1 line
2.40.0
PATCH 1/1 libxl: device_backend_callback() print rc on error
Print the rc when an error is found in device_backend_callback() so the user can have some idea of why things went wrong.
--- tools/libs/light/libxl_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
tools/libs/light/libxl_device.c +3 -2
@@ -1160,9 +1160,10 @@ static void device_backend_callback(libxl__egc *egc, libxl__ev_devstate *ds, }if (rc) { -LOGD (ERROR , aodev->dev->domid,"unable to %s device with path %s" , +LOGD (ERROR , aodev->dev->domid, +"unable to %s device with path %s - rc %d" ,libxl__device_action_to_string (aodev->action), -libxl__device_backend_path (gc, aodev->dev)); +libxl__device_backend_path (gc, aodev->dev), rc); goto out; }
Signature · 1 line
2.40.0
Re: [PATCH] libxl: device_backend_callback() print rc on error
Quoted 4 lines · Jason Andryuk
Print the rc when an error is found in
device_backend_callback()so the user can have some idea of why things went wrong.Signed-off-by Jason Andryuk <[email protected]>
Juergen
Re: [PATCH] libxl: device_backend_callback() print rc on error
In reply to Jason AndryukQuoted 7 lines · Jason Andryuk
Print the rc when an error is found in
device_backend_callback()so the user can have some idea of why things went wrong.Signed-off-by Jason Andryuk <[email protected]>--- tools/libs/light/libxl_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
While patches which are part of a series should be sent as replies to the cover letter, may I ask that you do not send individual patches as replies to other (unrelated) patches (or, in general, really as replies to anything, i.e. also not as replies to e.g. an earlier discussion)?
Thanks, Jan
Re: [PATCH] libxl: device_backend_callback() print rc on error
Quoted 10 lines · Jan Beulich
Quoted 7 lines · Jason Andryuk
Print the rc when an error is found in
device_backend_callback()so the user can have some idea of why things went wrong.Signed-off-by Jason Andryuk <[email protected]>--- tools/libs/light/libxl_device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Quoted 4 lines
While patches which are part of a series should be sent as replies to the cover letter, may I ask that you do not send individual patches as replies to other (unrelated) patches (or, in general, really as replies to anything, i.e. also not as replies to e.g. an earlier discussion)?
Certainly. Sorry about that. I formatted the patches individually, but sent them with a single git send-email command. Looks like I should have added --no-thread to have them sent individually.
Regards,
Jason
PATCH 1/1 libxl: Print device_kind as a string
In reply to Jason AndryukPrinting the integer isn't particularly informative. Switch to a human-readable string when printing the device_kind in libxl__get_hotplug_script_info().
--- tools/libs/light/libxl_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/libs/light/libxl_linux.c +2 -2
@@ -231,8 +231,8 @@ int libxl__get_hotplug_script_info(libxl__gc *gc, libxl__device *dev,break ;default :/* No need to execute any hotplug scripts */ -LOGD (DEBUG , dev->domid, -"backend_kind %d, no need to execute scripts" , dev->backend_kind); +LOGD (DEBUG , dev->domid,"backend_kind %s, no need to execute scripts" , +libxl__device_kind_to_string (dev->backend_kind)); rc =0 ;break ; }
Signature · 1 line
2.40.0
Re: [PATCH] libxl: Print device_kind as a string
Quoted 5 lines · Jason Andryuk
Printing the integer isn't particularly informative. Switch to a human-readable string when printing the
device_kindinlibxl__get_hotplug_script_info().Signed-off-by Jason Andryuk <[email protected]>
Juergen
Tue, 25 Apr 2023 15:46:20 -0400 Jason Andryuk <[email protected]>:
Quoted 1 line
Skip populating
/var/run/xenwhen systemd is being used.
It was wrong to do it like that from day one. Such directory has to be populated on demand at runtime.
Olaf
Quoted 6 lines · Olaf Hering
Tue, 25 Apr 2023 15:46:20 -0400 Jason Andryuk <[email protected]>:
Quoted 1 line
Skip populating
/var/run/xenwhen systemd is being used.It was wrong to do it like that from day one. Such directory has to be populated on demand at runtime.
Is this to be translated to Reviewed-by: <you>?
Jan
Wed, 26 Apr 2023 10:28:38 +0200 Jan Beulich <[email protected]>:
Quoted 1 line
Is this to be translated to Reviewed-by: <you>?
It was a Nack, in case such thing exists, and if it has any meaning if sent by me.
There are a few places already which do a mkdir -p XEN_RUN_DIR prior usage. But a few are missing.XEN_RUN_DIR and most likely also XEN_RUN_STORED have to be removed from make install.
Olaf
Quoted 5 lines · Olaf Hering
Wed, 26 Apr 2023 10:28:38 +0200 Jan Beulich <[email protected]>:
Quoted 1 line
Is this to be translated to Reviewed-by: <you>?
It was a Nack, in case such thing exists, and if it has any meaning if sent by me.
Now I'm confused: Your reply didn't read like a nack at all, at least to me. Furthermore ...
Quoted 3 lines
There are a few places already which do a mkdir -p
XEN_RUN_DIRprior usage. But a few are missing.XEN_RUN_DIRand most likely alsoXEN_RUN_STOREDhave to be removed from make install.
... this suggests to me that you really mean the change doesn't go far enough, but that's then different from nack-ing a change. Can you please clarify this for me (and maybe also for Jason, depending on how he has read your replies)?
Jan
Wed, 26 Apr 2023 11:07:17 +0200 Jan Beulich <[email protected]>:
Quoted 6 lines · Olaf Hering
Quoted 1 line
XEN_RUN_DIRand most likely alsoXEN_RUN_STOREDhave to be removed from make install.... this suggests to me that you really mean the change doesn't go far enough, but that's then different from nack-ing a change. Can you please clarify this for me (and maybe also for Jason, depending on how he has read your replies)?
I think the change should look like this, the runtime directories have to be created at runtime.
tools/Makefile | 2 -- tools/hotplug/FreeBSD/rc.d/xencommons.in | 1 + tools/hotplug/FreeBSD/rc.d/xendriverdomain.in | 1 + tools/hotplug/Linux/init.d/xendriverdomain.in | 1 + tools/hotplug/Linux/systemd/xenconsoled.service.in | 2 +- tools/hotplug/NetBSD/rc.d/xendriverdomain.in | 2 +-
tools/Makefile +0 -2
@@ -58,9 +58,7 @@ build all: subdirs-all install: $(INSTALL_DIR) -m 700 $(DESTDIR)$(XEN_DUMP_DIR) $(INSTALL_DIR) $(DESTDIR)$(XEN_LOG_DIR) - $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_DIR) $(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_DIR) - $(INSTALL_DIR) $(DESTDIR)$(XEN_RUN_STORED) $(INSTALL_DIR) $(DESTDIR)$(PKG_INSTALLDIR) $(MAKE) subdirs-install
tools/hotplug/FreeBSD/rc.d/xencommons.in +1 -0
@@ -34,6 +34,7 @@ xen_startcmd() local time=0 local timeout=30 + mkdir -p "@XEN_RUN_DIR@" xenstored_pid=$(check_pidfile ${XENSTORED_PIDFILE} ${XENSTORED}) if test -z "$xenstored_pid"; then printf "Starting xenservices: xenstored, xenconsoled."
tools/hotplug/FreeBSD/rc.d/xendriverdomain.in +1 -0
@@ -27,6 +27,7 @@ xendriverdomain_start() { printf "Starting xenservices: xl devd." + mkdir -p "@XEN_RUN_DIR@" PATH="${bindir}:${sbindir}:$PATH" ${sbindir}/xl devd --pidfile ${XLDEVD_PIDFILE} ${XLDEVD_ARGS} printf "\n"
tools/hotplug/Linux/init.d/xendriverdomain.in +1 -0
@@ -49,6 +49,7 @@ fi do_start () { echo Starting xl devd... + mkdir -m700 -p ${XEN_RUN_DIR} ${sbindir}/xl devd --pidfile=$XLDEVD_PIDFILE $XLDEVD_ARGS } do_stop () {
tools/hotplug/Linux/systemd/xenconsoled.service.in +1 -1
@@ -11,7 +11,7 @@ Environment=XENCONSOLED_TRACE=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities -ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} +ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} @XEN_RUN_DIR@ ExecStart=@sbindir@/xenconsoled -i --log=${XENCONSOLED_TRACE} --log-dir=${XENCONSOLED_LOG_DIR} $XENCONSOLED_ARGS [Install]
tools/hotplug/NetBSD/rc.d/xendriverdomain.in +1 -1
@@ -23,7 +23,7 @@ XLDEVD_PIDFILE="@XEN_RUN_DIR@/xldevd.pid" xendriverdomain_precmd() { - : + mkdir -p "@XEN_RUN_DIR@" } xendriverdomain_startcmd()
Olaf
Quoted 11 lines · Olaf Hering
Wed, 26 Apr 2023 11:07:17 +0200 Jan Beulich <[email protected]>:
Quoted 6 lines · Olaf Hering
Quoted 1 line
XEN_RUN_DIRand most likely alsoXEN_RUN_STOREDhave to be removed from make install.... this suggests to me that you really mean the change doesn't go far enough, but that's then different from nack-ing a change. Can you please clarify this for me (and maybe also for Jason, depending on how he has read your replies)?
I think the change should look like this, the runtime directories have to be created at runtime.
Thanks, Olaf. Yes, I think your approach is better. Will you submit it as a formal patch? I'm happy to test it.
tools/hotplug/Linux/init.d/xendriverdomain.in fi · line 52
Quoted 7 lines
tools/hotplug/Linux/init.d/xendriverdomain.in +1
-0@@ -49,6 +49,7 @@ fi do_start () { echo Starting xl devd... + mkdir -m700 -p ${XEN_RUN_DIR}
This one should be "@XEN_RUN_DIR@"?
Thanks,
Jason
Wed, 26 Apr 2023 09:31:44 -0400 Jason Andryuk <[email protected]>:
Quoted 8 lines · Olaf Hering
tools/hotplug/Linux/init.d/xendriverdomain.in fi · line 52
Quoted 6 lines
+++ b/tools/hotplug/Linux/init.d/xendriverdomain.in
tools/hotplug/Linux/init.d/xendriverdomain.in +1
-0@@ -49,6 +49,7 @@ fi do_start () { echo Starting xl devd... + mkdir -m700 -p ${XEN_RUN_DIR}This one should be "@XEN_RUN_DIR@"?
I changed it, it was a result of copy&paste from another file.
Since hotplug.sh is included in many scripts, all such users could be converted to a shell variable. But this would be a separate change.
Olaf