tools: Move bootloaders to libexec directory

PATCH In review George Dunlap 2 participants 5 messages May 15, 2012

lore

Share & tools

lore

George Dunlap

author

2012-05-15 14:22 UTC #0 lore raw

PATCH v3 1/1 tools: Move bootloaders to libexec directory

tools: Move bootloaders to libexec directory

pygrub and xenpvnetboot are meant to be run by tools, and not by the user, and thus should be in /usr/lib/xen/bin rather than /usr/bin. This patch series:
* Causes libxl to look in the libexec dir if a full path is not specified, falling back to searching PATH if it's not in the libexec dir
* Moves pygrub and xenpvnetboot into the libexec dir
* For compatibility with existing configs, puts a link to pygrub in /usr/bin
* Warns the user that /usr/bin/pygrub is deprecated

v2:
- If the bootloader is not in the libexec path, revert to using the string as passed in the config file (which will search $PATH)
- Use strcmp rather than strncmp

George Dunlap

author

2012-05-15 14:22 UTC #1 lore raw

PATCH v3 1/1 libxl: Look for bootloader in libexec path

If the full path for a bootloader (such as pygrub or xenpvnetboot) is not given, check for it first in the libexec path before falling back to the PATH variable.

v2:
- Check for the libexec path, and if the bootloader isn't there, fall back to the explicitly passed value. If the full path isn't specified, this will case execvp to search using the path given in the PATH variable.

v3:
- Port to xen-unstable tip
- Take out now-unnecessary check for malloc failure

Signed-off-by George Dunlap <[email protected]>

tools/libxl/libxl_bootloader.c +20 -0

diff -r edd7c7ad1ad2 -r 52ff381a0bba tools/libxl/libxl_bootloader.c
@@ -336,6 +336,26 @@ void libxl__bootloader_run(libxl__egc *e
         goto out;
     }
 
+    LOG(DEBUG, "Config bootloader value: %s", info->u.pv.bootloader);
+
+    /* If the full path is not specified, check in the libexec path */
+    if ( info->u.pv.bootloader[0] != '/' ) {
+        char *bootloader;
+        struct stat st;
+        
+        bootloader = libxl__abs_path(gc, info->u.pv.bootloader,
+                                     libxl__libexec_path());
+        /* Check to see if the file exists in this location; if not,
+         * fall back to checking the path */
+        LOG(DEBUG, "Checking for bootloader in libexec path: %s", bootloader);
+        
+        if ( lstat(bootloader, &st) )
+            LOG(DEBUG, "%s doesn't exist, falling back to config path",
+                bootloader);
+        else
+            info->u.pv.bootloader = bootloader;
+    }
+
     make_bootloader_args(gc, bl);
 
     bl->openpty.ao = ao;

George Dunlap

author

2012-05-15 14:22 UTC #2 lore raw

PATCH v3 1/1 tools: Install pv bootloaders in libexec rather than /usr/bin

In reply to George Dunlap

pygrub and xenpvnetboot are meant to be run by tools, and not by the user, and thus should be in /usr/lib/xen/bin rather than /usr/bin.

Because most config files will still have an absolute path pointing to /usr/bin/pygrub, make a symbolic link that we will deprecate.

Signed-off-by George Dunlap <[email protected]>

Acked-by Ian Campbell <[email protected]>

tools/misc/Makefile +6 -1

diff -r 52ff381a0bba -r 9ebf2c1292c3 tools/misc/Makefile
@@ -18,7 +18,7 @@ SUBDIRS-$(CONFIG_LOMOUNT) += lomount
 SUBDIRS-$(CONFIG_MINITERM) += miniterm
 SUBDIRS := $(SUBDIRS-y)
 
-INSTALL_BIN-y := xencons xenpvnetboot
+INSTALL_BIN-y := xencons
 INSTALL_BIN-$(CONFIG_X86) += xen-detect
 INSTALL_BIN := $(INSTALL_BIN-y)

@@ -27,6 +27,9 @@ INSTALL_SBIN-$(CONFIG_X86) += xen-hvmctx
 INSTALL_SBIN-$(CONFIG_MIGRATE) += xen-hptool
 INSTALL_SBIN := $(INSTALL_SBIN-y)
 
+INSTALL_PRIVBIN-y := xenpvnetboot
+INSTALL_PRIVBIN := $(INSTALL_PRIVBIN-y)
+
 # Include configure output (config.h) to headers search path
 CFLAGS += -I$(XEN_ROOT)/tools

@@ -41,8 +44,10 @@ build: $(TARGETS)
 install: build
 	$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
 	$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
+	$(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR)
 	$(INSTALL_PYTHON_PROG) $(INSTALL_BIN) $(DESTDIR)$(BINDIR)
 	$(INSTALL_PYTHON_PROG) $(INSTALL_SBIN) $(DESTDIR)$(SBINDIR)
+	$(INSTALL_PYTHON_PROG) $(INSTALL_PRIVBIN) $(DESTDIR)$(PRIVATE_BINDIR)
 	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d install-recurse; done
 
 .PHONY: clean

tools/pygrub/Makefile +4 -2

diff -r 52ff381a0bba -r 9ebf2c1292c3 tools/pygrub/Makefile
@@ -11,9 +11,11 @@ build:
 .PHONY: install
 install: all
 	CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
-		$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" --force
-	$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(BINDIR)/pygrub
+		$(PYTHON_PREFIX_ARG) --root="$(DESTDIR)" \
+		--install-scripts=$(DESTDIR)/$(PRIVATE_BINDIR) --force
+	$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(PRIVATE_BINDIR)/pygrub
 	$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
+	ln -sf $(PRIVATE_BINDIR)/pygrub $(DESTDIR)/$(BINDIR)
 
 .PHONY: clean
 clean:

George Dunlap

author

2012-05-15 14:22 UTC #3 lore raw

PATCH v3 1/1 libxl: Warn that /usr/bin/pygrub is deprecated

In reply to George Dunlap

v2: Use strcmp rather than strncmp.

Signed-off-by George Dunlap <[email protected]>

Acked-by Ian Campbell <[email protected]>

tools/libxl/libxl_bootloader.c +4 -0

diff -r 9ebf2c1292c3 -r 804eb2962984 tools/libxl/libxl_bootloader.c
@@ -338,6 +338,10 @@ void libxl__bootloader_run(libxl__egc *e
 
     LOG(DEBUG, "Config bootloader value: %s", info->u.pv.bootloader);
 
+    if ( !strcmp(info->u.pv.bootloader, "/usr/bin/pygrub") )
+        LOG(WARN, "bootloader='/usr/bin/pygrub' is deprecated; use " \
+            "bootloader='pygrub' instead");
+    
     /* If the full path is not specified, check in the libexec path */
     if ( info->u.pv.bootloader[0] != '/' ) {
         char *bootloader;

Ian Campbell

2012-05-15 15:29 UTC #4 lore raw

In reply to George Dunlap

Quoted 11 lines · George Dunlap

tools: Move bootloaders to libexec directory
pygrub and xenpvnetboot are meant to be run by tools, and not by the user, and thus should be in /usr/lib/xen/bin rather than /usr/bin. This patch series:
* Causes libxl to look in the libexec dir if a full path is not specified, falling back to searching PATH if it's not in the libexec dir
* Moves pygrub and xenpvnetboot into the libexec dir
* For compatibility with existing configs, puts a link to pygrub in /usr/bin
* Warns the user that /usr/bin/pygrub is deprecated

Quoted 4 lines

v2:
- If the bootloader is not in the libexec path, revert to using the string as passed in the config file (which will search $PATH)
- Use strcmp rather than strncmp

All 3 patches:

Committed-by Ian Campbell <[email protected]>