search for: xdg_config_dirs

...--- builder/paths.ml | 2 +- mllib/guestfs_config.ml.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/paths.ml b/builder/paths.ml index cbd9d4bd0..d7c4820bf 100644 --- a/builder/paths.ml +++ b/builder/paths.ml @@ -35,7 +35,7 @@ let xdg_config_home () = let xdg_config_dirs () = let dirs = try Sys.getenv "XDG_CONFIG_DIRS" - with Not_found -> "/etc/xdg" in + with Not_found -> Guestfs_config.sysconfdir // "xdg" in let dirs = String.nsplit ":" dirs in let dirs = List.filter (fun x -> x <> "&q...

On Tue, Feb 25, 2014 at 05:29:08PM +0100, Pino Toscano wrote: > +let xdg_config_dirs ~prog = > + let dirs = > + try Sys.getenv "XDG_CONFIG_DIRS" > + with Not_found -> "/etc/xdg" in This seems to put the virt-builder config files into /etc/xdg/virt-builder which is kind of annoying. Can we move them to a regular default location (/etc/virt-bu...

.... This also removes the hardcoded default location, replaced now with a configuration file (which may be not used at all). Thanks, Pino Toscano (8): builder: allow "no key" as key in Sigchecker builder: use Sigchecker.gpgkey_type for the fingerprint builder: add functions to read XDG_CONFIG_DIRS and XDG_CONFIG_PATH builder: extract the default key to file builder: switch sources to .conf files builder: remove VIRT_BUILDER_SOURCE and VIRT_BUILDER_FINGERPRINT builder: remove the default fingerprint/pubkey builder: update documentation .gitignore...

...mllib/guestfs_config.ml.in | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/builder/paths.ml b/builder/paths.ml > index cbd9d4bd0..d7c4820bf 100644 > --- a/builder/paths.ml > +++ b/builder/paths.ml > @@ -35,7 +35,7 @@ let xdg_config_home () = > let xdg_config_dirs () = > let dirs = > try Sys.getenv "XDG_CONFIG_DIRS" > - with Not_found -> "/etc/xdg" in > + with Not_found -> Guestfs_config.sysconfdir // "xdg" in Hmm... the XDG basedir spec says [1]: "If $XDG_CONFIG_DIRS is either not set or e...

...ATH "$b/gobject/.libs" +prepend DYLD_LIBRARY_PATH "$b/java/.libs" +prepend DYLD_LIBRARY_PATH "$b/src/.libs" +export LD_LIBRARY_PATH +export DYLD_LIBRARY_PATH # Make virt-builder use the local website copy to avoid hitting # the network all the time. if [ -z "$XDG_CONFIG_DIRS" ]; then - XDG_CONFIG_DIRS="$b/builder/test-website" + prepend XDG_CONFIG_DIRS "$b/builder/test-website" export XDG_CONFIG_DIRS fi # virt-p2v-make-* data directory. if [ -z "$VIRT_P2V_DATA_DIR" ]; then - VIRT_P2V_DATA_DIR="$b/p2v" +...

...--- builder/paths.ml | 2 +- mllib/guestfs_config.ml.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/builder/paths.ml b/builder/paths.ml index cbd9d4bd0..9ce8504a1 100644 --- a/builder/paths.ml +++ b/builder/paths.ml @@ -35,7 +35,7 @@ let xdg_config_home () = let xdg_config_dirs () = let dirs = try Sys.getenv "XDG_CONFIG_DIRS" - with Not_found -> "/etc/xdg" in + with Not_found -> Guestfs_config.sysconfdir ^ "/xdg" in let dirs = String.nsplit ":" dirs in let dirs = List.filter (fun x -> x <> "&q...

On Tue, Feb 25, 2014 at 05:29:10PM +0100, Pino Toscano wrote: > Introduce and use simple .conf files to configure the sources of indexes > for virt-builder. The location of these files is in XDG_CONFIG_DIRS / > XDG_CONFIG_HOME, so it can be easily overridden. > > There are three .conf(.in) files shipped with this commit: > - "test-index.conf.in" (in "test-config"), which points to the > "test-index" index (used in tests only); the tests are adapted to &g...

...35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01 ;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00; 32:*.ogg=00;32:*.voc=00;32:*.wav=00;32: LD_LIBRARY_PATH=/opt/openmpi/lib:/opt/sge/lib/lx24-amd64 XNLSPATH=/usr/X11R6/lib/X11/nls HOSTTYPE=x86_64 PAGER=less XDG_CONFIG_DIRS=/usr/local/etc/xdg/:/etc/xdg/:/etc/opt/gnome/xdg/ C3_PATH=/opt/c3-4 MINICOM=-c on MAIL=/var/mail/pearman PATH=/opt/openmpi/bin:/opt/sge/bin/lx24-amd64:/opt/mpich/1.2.6..14b/x86_64/gcc//bin:/opt/gm/2.1 .21/2.6.11-21smp/bin:/opt/c3-4:/home/pearman/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/u sr...

..."TAR" "TERM" < [83] "TEXINPUTS" "UPSTART_EVENTS" < [85] "UPSTART_INSTANCE" "UPSTART_JOB" < [87] "UPSTART_SESSION" "USER" < [89] "WINDOWID" "XAUTHORITY" < [91] "XDG_CONFIG_DIRS" "XDG_CURRENT_DESKTOP" < [93] "XDG_DATA_DIRS" "XDG_GREETER_DATA_DIR" < [95] "XDG_MENU_PREFIX" "XDG_RUNTIME_DIR" < [97] "XDG_SEAT" "XDG_SEAT_PATH" < [99] "XDG_SESSION_DESKTOP" "XDG_S...

..."TERM" > < [83] "TEXINPUTS" "UPSTART_EVENTS" > < [85] "UPSTART_INSTANCE" "UPSTART_JOB" > < [87] "UPSTART_SESSION" "USER" > < [89] "WINDOWID" "XAUTHORITY" > < [91] "XDG_CONFIG_DIRS" "XDG_CURRENT_DESKTOP" > < [93] "XDG_DATA_DIRS" "XDG_GREETER_DATA_DIR" > < [95] "XDG_MENU_PREFIX" "XDG_RUNTIME_DIR" > < [97] "XDG_SEAT" "XDG_SEAT_PATH" > < [99] "XDG_SESSION_DESKTOP"...

...-SESSION_MANAGER=local/charlie-A660:@/tmp/.ICE-unix/2868,unix/charlie-A660:/tmp/.ICE-unix/2868 +SSH_AUTH_SOCK=/tmp/keyring-fm8dqK/ssh +SESSION_MANAGER=local/charlie-A660:@/tmp/.ICE-unix/2293,unix/charlie-A660:/tmp/.ICE-unix/2293 USERNAME=charlie DEFAULTS_PATH=/usr/share/gconf/gnome.default.path XDG_CONFIG_DIRS=/etc/xdg/xdg-gnome:/etc/xdg @@ -18,7 +18,7 @@ DESKTOP_SESSION=gnome PWD=/home/charlie GDM_KEYBOARD_LAYOUT=gb -GNOME_KEYRING_PID=2849 +GNOME_KEYRING_PID=2274 LANG=en_GB.UTF-8 GDM_LANG=en_GB.utf8 MANDATORY_PATH=/usr/share/gconf/gnome.mandatory.path @@ -32,12 +32,12 @@ GNOME_DESKTOP_SESSION_ID=...

...+revision=1 + +[img2] +name=img2 +file=$(basename "$img2_path") +arch=aarch64 +size=$img2_size +checksum[sha512]=$img2_csum +revision=3 +EOF + +# Create the repository. +cat > "$reposdir/repo1.conf" <<EOF +[repo1] +uri=$indexfile +EOF + +export XDG_CONFIG_HOME= +export XDG_CONFIG_DIRS="$tmpdir" +export XDG_CACHE_HOME="$cachedir" + +short_list=$($VG virt-builder --no-check-signature --no-cache --list) + +if [ "$short_list" != "img1 x86_64 img1 +img2 aarch64 img2" ]; then + echo "$0: une...

...e/buildr/share" export SAFEMODE="no" export SED="/bin/sed" export SHLVL="7" export TERM="xterm" export TTY="/dev/tt/p1" export TTYPE="UTF-8" export USER="user" export XDG_CACHE_HOME="/boot/home/config/cache" export XDG_CONFIG_DIRS="/boot/system/settings" export XDG_CONFIG_HOME="/boot/home/config/settings" export XDG_DATA_DIRS="/boot/system/non-packaged/data:/boot/system/data" export XDG_DATA_HOME="/boot/home/config/non-packaged/data" Error in .Call(PS_sigs, 1L) : first argument must...

...; then exit $r fi diff --git a/builder/test-virt-builder-planner.sh b/builder/test-virt-builder-planner.sh index f974c27..adf461e 100755 --- a/builder/test-virt-builder-planner.sh +++ b/builder/test-virt-builder-planner.sh @@ -24,7 +24,7 @@ abs_builddir=$(pwd) export XDG_CONFIG_HOME= export XDG_CONFIG_DIRS="$abs_builddir/test-config" -if [ ! -f fedora.xz -o ! -f fedora.qcow2 -o ! -f fedora.qcow2.xz ]; then +if [ ! -f fedora.xz || ! -f fedora.qcow2 || ! -f fedora.qcow2.xz ]; then echo "$0: test skipped because there is no fedora.xz, fedora.qcow2 or fedora.qcow2.xz in the build di...

...aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32: DESKTOP_LAUNCH=kde-open OPENWINHOME=/usr/openwin XNLSPATH=/usr/X11R6/lib/X11/nls SSH_AUTH_SOCK=/tmp/ssh-IWHyx6676/agent.6676 HOSTTYPE=x86_64 SESSION_MANAGER=local/ScottSuSE:/tmp/.ICE-unix/6784 FROM_HEADER= PAGER=less XDG_CONFIG_DIRS=/usr/local/etc/xdg/:/etc/xdg/:/etc/opt/gnome/xdg/ LD_HWCAP_MASK=0x20000000 KONSOLE_DCOP=DCOPRef(konsole-6808,konsole) MINICOM=-c on GNOMEDIR=/opt/gnome DESKTOP_SESSION=default PATH=/sbin:/usr/sbin:/usr/local/sbin:/opt/kde3/sbin:/opt/gnome/sbin:/root/bin:/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/...

...ot;no" > export SED="/bin/sed" > export SHLVL="7" > export TERM="xterm" > export TTY="/dev/tt/p1" > export TTYPE="UTF-8" > export USER="user" > export XDG_CACHE_HOME="/boot/home/config/cache" > export XDG_CONFIG_DIRS="/boot/system/settings" > export XDG_CONFIG_HOME="/boot/home/config/settings" > export XDG_DATA_DIRS="/boot/system/non-packaged/data:/boot/system/data" > export XDG_DATA_HOME="/boot/home/config/non-packaged/data" > Error in .Call(PS_sigs, 1L) : &g...

...XDG_MENU_PREFIX debug3: Ignored env WINDOWID debug3: Ignored env USER debug3: Ignored env LS_COLORS debug3: Ignored env XDG_SESSION_PATH debug3: Ignored env GLADE_MODULE_PATH debug3: Ignored env XDG_SEAT_PATH debug3: Ignored env SSH_AUTH_SOCK debug3: Ignored env SESSION_MANAGER debug3: Ignored env XDG_CONFIG_DIRS debug3: Ignored env PATH debug3: Ignored env DESKTOP_SESSION debug3: Ignored env PWD debug3: Ignored env EDITOR debug1: Sending env LANG = en_US.utf8 debug2: channel 0: request env confirm 0 debug3: Ignored env GDMSESSION debug3: Ignored env SHLVL debug3: Ignored env XDG_SEAT debug3: Ignored env HO...

On Tuesday 11 March 2014 10:09:45 Richard W.M. Jones wrote: > On Mon, Mar 10, 2014 at 02:28:20PM +0100, Pino Toscano wrote: > > Add the possibility to choose which architecture use to build the > > wanted image (--arch). Since this implies that running commands on > > the guest is usually not possible when the architecture is > > different than the host one, another new

...) disk_item in diff --git a/builder/test-virt-builder-list-simplestreams.sh b/builder/test-virt-builder-list-simplestreams.sh index 29fbfacce..3158066b1 100755 --- a/builder/test-virt-builder-list-simplestreams.sh +++ b/builder/test-virt-builder-list-simplestreams.sh @@ -26,9 +26,9 @@ export XDG_CONFIG_DIRS="$abs_builddir/test-simplestreams" short_list=$($VG virt-builder --no-check-signature --no-cache --list) -if [ "$short_list" != "net.cirros-cloud:standard:0.3:i386 i386 cirros-0.3.4-i386 +if [ "$short_list" != "net.cirros-cloud:standard:0.3:powerpc...

v2: - Added back the null value. - Reran the tests. Rich.