search for: guestfs_network

...= *selinux=1* ]]; then mount -t selinuxfs none /sys/fs/selinux fi @@ -91,16 +93,16 @@ shopt -u nullglob hwclock -u -s # Parse the kernel command line. -if grep -sq guestfs_verbose=1 /proc/cmdline; then +if [[ $cmdline == *guestfs_verbose=1* ]]; then guestfs_verbose=1 fi -if grep -sq guestfs_network=1 /proc/cmdline; then +if [[ $cmdline == *guestfs_network=1* ]]; then guestfs_network=1 fi -if grep -sq guestfs_rescue=1 /proc/cmdline; then +if [[ $cmdline == *guestfs_rescue=1* ]]; then guestfs_rescue=1 fi -if grep -sq guestfs_noreboot=1 /proc/cmdline; then +if [[ $cmdline == *guestfs...

...rnel command line to be specified on the > program command line. What if, instead, we remove the direct /proc/cmdline reading from the daemon, making the init read the options from it passing them as options to the daemon? After all, the options read from it so far are: (a) guestfs_verbose (b) guestfs_network (c) guestfs_channel (a) is covered already by -v, and a direct (c) could be useful to ease this patch series (seen in patch 6). -- Pino Toscano

.../+bug/1824236 Thanks: Ioanna Alifieraki --- appliance/init | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appliance/init b/appliance/init index 4f2b55822..b1c4d09ea 100755 --- a/appliance/init +++ b/appliance/init @@ -122,7 +122,9 @@ ip link set dev lo up if test "$guestfs_network" = 1; then iface=$(ls -I all -I default -I lo /proc/sys/net/ipv4/conf) - touch /etc/fstab # Workaround for Ubuntu. + # Two workarounds for Ubuntu: + touch /etc/fstab + rm -f /etc/dhcp/dhclient-enter-hooks.d/resolved if dhclient --version >/dev/null 2>&1; then...

...liance/init | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appliance/init b/appliance/init index cca62e7..d5a428d 100755 --- a/appliance/init +++ b/appliance/init @@ -108,10 +108,11 @@ ip addr add 127.0.0.1/8 brd + dev lo scope host ip link set dev lo up if test "$guestfs_network" = 1; then + iface=$(ls -I all -I default -I lo /proc/sys/net/ipv4/conf) if dhclient --version >/dev/null 2>&1; then - dhclient + dhclient $iface else - dhcpcd + dhcpcd $iface fi fi -- 2.1.4

...other case, making at least dhclient-script in Ubuntu working. --- appliance/init | 1 + 1 file changed, 1 insertion(+) diff --git a/appliance/init b/appliance/init index 3fdf4d0..3816dfd 100755 --- a/appliance/init +++ b/appliance/init @@ -118,6 +118,7 @@ ip link set dev lo up if test "$guestfs_network" = 1; then iface=$(ls -I all -I default -I lo /proc/sys/net/ipv4/conf) + touch /etc/fstab # Workaround for Ubuntu. if dhclient --version >/dev/null 2>&1; then dhclient $iface else -- 2.7.4

On Thu, Oct 02, Richard W.M. Jones wrote: > +if grep -sq guestfs_network=1 /proc/cmdline; then > + dhclient > +fi dhclient will be missing at least in openSUSE. Not an issue now, does the script fail if the command fails to execute due to ENOENT? Olaf

...", /* append */ -#ifdef __arm__ - g->memsize, -#endif - lpj_s, - root, - g->selinux ? "selinux=1 enforcing=0" : "selinux=0", - g->verbose ? "guestfs_verbose=1" : "quiet", - g->enable_network ? " guestfs_network=1" : "", - term ? term : "linux", - STRNEQ (g->identifier, "") ? " guestfs_identifier=" : "", - g->identifier, - g->append ? " " : "", g->append ? g->append : ""); - - return ret; +...

Here are two patches: one fixes the gpg-agent causing unmount to fail after running dnf to install packages. The other ones fixes dhcpcd call in the init program to provide it an interface name. Cédric Bosdonnat (2): appliance init: find NIC name for dhcpcd Make sure gpg-agent is terminated before umount appliance/init | 3 ++- customize/customize_run.ml | 3 ++- 2 files

v2: - Make virbr0 configurable. - Fix the tests.

In v2: - Kernel command line parsing now moved to the appliance. - In the captive daemon test, the daemon cleanly shuts down on exit. - Add another btrfs test. Rich.

Hi All, I been using virt-builder to create testing VMs (most ubuntu) for a while, and it works great. But when I cloned the git repo today and found the process becoming extremely slow, please see the output below. log that produced by pre-installed vendor package: virt-builder ubuntu-14.04 --firstboot-command 'useradd -m -p "" myan; chage -d 0 myan; usermod -aG sudo myan;' [

...g.libguestfs.channel.0 \ -netdev user,id=usernet,net=169.254.0.0/16 \ -device virtio-net-pci,netdev=usernet \ -append 'panic=1 console=ttyS0 udevtimeout=6000 udev.event-timeout=6000 no_timer_check acpi=off printk.time=1 cgroup_disable=memory root=/dev/sdb selinux=0 guestfs_verbose=1 guestfs_network=1 TERM=xterm' \x1b[1;256r\x1b[256;256H\x1b[6n Google, Inc. Serial Graphics Adapter 11/03/11 SGABIOS $Id$ (pbonzini@yakj.usersys.redhat.com) Thu Nov 3 13:33:51 UTC 2011 Term: 80x24 4 0 \x1b[2J SeaBIOS (version rel-1.8.2-0-g33fbe13 by qemu-project.org) iPXE (http://ipxe.org) 00:04.0 C100 PCI...

...> program command line. > > What if, instead, we remove the direct /proc/cmdline reading from the > daemon, making the init read the options from it passing them as > options to the daemon? > > After all, the options read from it so far are: > (a) guestfs_verbose > (b) guestfs_network > (c) guestfs_channel > > (a) is covered already by -v, and a direct (c) could be useful to ease > this patch series (seen in patch 6). Hmm parsing in shell scripts is such fun :-) Yes this is possible. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com...

.... We are now getting it from /proc/sys/net/ipv4/conf/ folder children. --- appliance/init | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appliance/init b/appliance/init index cca62e7..ef18959 100755 --- a/appliance/init +++ b/appliance/init @@ -111,7 +111,8 @@ if test "$guestfs_network" = 1; then if dhclient --version >/dev/null 2>&1; then dhclient else - dhcpcd + iface=$(ls -I all -I default -I lo /proc/sys/net/ipv4/conf) + dhcpcd $iface fi fi -- 2.1.4

...*appliance_dev, lpj_s, root, g->selinux ? "selinux=1 enforcing=0" : "selinux=0", - g->verbose ? " guestfs_verbose=1" : "", + g->verbose ? "guestfs_verbose=1" : "quiet", g->enable_network ? " guestfs_network=1" : "", term ? term : "linux", STRNEQ (g->identifier, "") ? " guestfs_identifier=" : "", diff --git a/src/proto.c b/src/proto.c index 5213856..df7be89 100644 --- a/src/proto.c +++ b/src/proto.c @@ -129,6 +129,9 @@ guestfs_int_lo...

...return 1; +} + #if defined(__powerpc64__) #define SERIAL_CONSOLE "console=hvc0 console=ttyS0" #elif defined(__arm__) || defined(__aarch64__) @@ -425,7 +449,7 @@ guestfs_int_appliance_command_line (guestfs_h *g, const char *appliance_dev, guestfs_int_add_string (g, &argv, "guestfs_network=1"); /* TERM environment variable. */ - if (term) + if (term && valid_term (term)) guestfs_int_add_sprintf (g, &argv, "TERM=%s", term); else guestfs_int_add_string (g, &argv, "TERM=linux"); -- 2.10.2

...70.4ms ±0.3ms master+patch : 837.7ms ±2.4ms : 671.8ms ±0.2ms --- appliance/init | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appliance/init b/appliance/init index c04ee45..6a61a8d 100755 --- a/appliance/init +++ b/appliance/init @@ -130,14 +130,16 @@ if test "$guestfs_network" = 1; then fi fi -# Scan for MDs. -mdadm -As --auto=yes --run +# Scan for MDs but don't run arrays unless all expected drives are present +mdadm -As --auto=yes --no-degraded # Scan for LVM. modprobe dm_mod ||: - lvm vgchange -aay --sysinit +# Scan for MDs and run all found a...

...appliance/init | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/appliance/init b/appliance/init > index 4f2b55822..b1c4d09ea 100755 > --- a/appliance/init > +++ b/appliance/init > @@ -122,7 +122,9 @@ ip link set dev lo up > > if test "$guestfs_network" = 1; then > iface=$(ls -I all -I default -I lo /proc/sys/net/ipv4/conf) > - touch /etc/fstab # Workaround for Ubuntu. > + # Two workarounds for Ubuntu: > + touch /etc/fstab > + rm -f /etc/dhcp/dhclient-enter-hooks.d/resolved > if dhclient --version &g...

...init @@ -79,12 +79,9 @@ hwclock -u -s ip addr add 127.0.0.1/8 brd + dev lo scope host ip link set dev lo up -ip addr add 169.254.2.10/16 brd + dev eth0 scope global -ip link set dev eth0 up - -ip route add default via 169.254.2.2 - -echo nameserver 169.254.2.3 > /etc/resolv.conf +if grep -sq guestfs_network=1 /proc/cmdline; then + dhclient +fi # Scan for MDs. mdadm -As --auto=yes --run diff --git a/appliance/packagelist.in b/appliance/packagelist.in index 276b4c2..4e93eaf 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -210,6 +210,7 @@ binutils bzip2 coreutils cpio +d...

On Thu, Oct 02, 2014 at 01:43:46PM +0200, Olaf Hering wrote: > On Thu, Oct 02, Richard W.M. Jones wrote: > > > +if grep -sq guestfs_network=1 /proc/cmdline; then > > + dhclient > > +fi > > dhclient will be missing at least in openSUSE. Not an issue now, does > the script fail if the command fails to execute due to ENOENT? The script won't fail, but the network won't work. What's the alternative on...